2001-06-11 14:15:45 +02:00
|
|
|
$NetBSD: patch-ab,v 1.4 2001/06/11 12:15:46 ad Exp $
|
1999-09-07 15:21:02 +02:00
|
|
|
|
2001-06-11 14:15:45 +02:00
|
|
|
--- Local/Makefile.netbsd.orig Mon Jun 11 13:11:04 2001
|
|
|
|
+++ Local/Makefile.netbsd Mon Jun 11 13:11:40 2001
|
2000-11-26 22:59:46 +01:00
|
|
|
@@ -78,7 +78,7 @@
|
1999-09-07 15:21:02 +02:00
|
|
|
# CHGRP_COMMAND=/usr/bin/chgrp
|
|
|
|
# MV_COMMAND=/bin/mv
|
|
|
|
# RM_COMMAND=/bin/rm
|
|
|
|
-# PERL_COMMAND=/usr/bin/perl
|
|
|
|
+PERL_COMMAND=@PREFIX@/bin/perl
|
|
|
|
|
|
|
|
|
|
|
|
# The following macro can be used to change the command for building a library
|
2000-11-26 22:59:46 +01:00
|
|
|
@@ -92,8 +92,8 @@
|
|
|
|
# appropriate code is included in the binary. You then need to set up the
|
|
|
|
# runtime configuration to make use of the mechanism(s) selected.
|
|
|
|
|
|
|
|
-# AUTH_CRAM_MD5=yes
|
|
|
|
-# AUTH_PLAINTEXT=yes
|
|
|
|
+AUTH_CRAM_MD5=yes
|
|
|
|
+AUTH_PLAINTEXT=yes
|
|
|
|
|
|
|
|
|
|
|
|
# The binary directory: This variable defines where the exim binary will be
|
|
|
|
@@ -103,7 +103,7 @@
|
1999-09-07 15:21:02 +02:00
|
|
|
# installed in this directory. There is no default for this variable built into
|
|
|
|
# the source files; it must be set in one of the local configuration files.
|
|
|
|
|
|
|
|
-BIN_DIRECTORY=/usr/exim/bin
|
|
|
|
+BIN_DIRECTORY=@PREFIX@/sbin
|
|
|
|
|
|
|
|
|
|
|
|
# The default distribution of Exim contains only the plain text form of the
|
2000-11-26 22:59:46 +01:00
|
|
|
@@ -121,7 +121,7 @@
|
1999-09-07 15:21:02 +02:00
|
|
|
# files. Both the name of the command and the suffix that it adds to files
|
|
|
|
# need to be defined here. See also the EXICYCLOG_MAX configuration.
|
|
|
|
|
|
|
|
-COMPRESS_COMMAND=/opt/gnu/bin/gzip
|
|
|
|
+COMPRESS_COMMAND=/usr/bin/gzip
|
|
|
|
COMPRESS_SUFFIX=gz
|
|
|
|
|
|
|
|
|
2000-11-26 22:59:46 +01:00
|
|
|
@@ -137,7 +137,7 @@
|
1999-09-07 15:21:02 +02:00
|
|
|
# location of all other runtime files and directories can be changed in the
|
|
|
|
# runtime configuration file.
|
|
|
|
|
|
|
|
-CONFIGURE_FILE=/usr/exim/configure
|
|
|
|
+CONFIGURE_FILE=@PREFIX@/etc/exim/configure
|
|
|
|
|
|
|
|
|
|
|
|
# In some installations there may be multiple machines sharing file systems,
|
2000-11-26 22:59:46 +01:00
|
|
|
@@ -241,7 +241,7 @@
|
1999-09-07 15:21:02 +02:00
|
|
|
# are defaulted in the OS/Makefile-Default file, and can be overridden
|
|
|
|
# in local OS-specific make files.
|
|
|
|
|
|
|
|
-EXIM_MONITOR=eximon.bin
|
|
|
|
+# EXIM_MONITOR=eximon.bin
|
|
|
|
|
|
|
|
|
|
|
|
# Compiling in support for embedded Perl: If you want to be able to
|
2000-11-26 22:59:46 +01:00
|
|
|
@@ -284,7 +284,7 @@
|
1999-12-07 21:21:48 +01:00
|
|
|
# "panic", or "reject" to form the final file name. For example, some
|
|
|
|
# installations may want something like this:
|
1999-09-07 15:21:02 +02:00
|
|
|
|
|
|
|
-# LOG_FILE_PATH=/var/log/exim_%slog
|
|
|
|
+LOG_FILE_PATH=/var/log/exim/%slog
|
|
|
|
|
|
|
|
# which results in files with names /var/log/exim_mainlog, etc. The directory
|
|
|
|
# in which the log files are placed must exist; Exim does not try to create
|
2001-06-11 14:15:45 +02:00
|
|
|
@@ -409,7 +409,7 @@
|
1999-09-07 15:21:02 +02:00
|
|
|
# the file name, allowing sites that run two separate daemons to distinguish
|
|
|
|
# them. Some installations may want something like this
|
|
|
|
|
|
|
|
-# PID_FILE_PATH=/var/lock/exim%s.pid
|
|
|
|
+PID_FILE_PATH=/var/run/exim%s.pid
|
|
|
|
|
|
|
|
# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
|
|
|
|
# (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard
|
2001-06-11 14:15:45 +02:00
|
|
|
@@ -458,7 +458,7 @@
|
1999-09-07 15:21:02 +02:00
|
|
|
# uid and gid.
|
|
|
|
|
|
|
|
# Many installations will want something like this:
|
|
|
|
-# SPOOL_DIRECTORY=/var/spool/exim
|
|
|
|
+SPOOL_DIRECTORY=/var/spool/exim
|
|
|
|
|
|
|
|
# Others may prefer to keep all Exim things under one directory:
|
|
|
|
# SPOOL_DIRECTORY=/usr/exim/spool
|
2001-06-11 14:15:45 +02:00
|
|
|
@@ -565,7 +565,7 @@
|
|
|
|
# This one is special-purpose, and commonly not required, so do not include
|
|
|
|
# it by default.
|
|
|
|
|
|
|
|
-# TRANSPORT_LMTP=yes
|
|
|
|
+TRANSPORT_LMTP=yes
|
|
|
|
|
|
|
|
|
|
|
|
# TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
|