128 lines
4.1 KiB
Plaintext
128 lines
4.1 KiB
Plaintext
$NetBSD: patch-aa,v 1.23 2012/06/11 11:41:25 adam Exp $
|
|
|
|
--- Local/Makefile.pkgsrc.orig 2012-06-11 11:27:45.000000000 +0000
|
|
+++ Local/Makefile.pkgsrc
|
|
@@ -98,7 +98,7 @@
|
|
# /usr/local/sbin. The installation script will try to create this directory,
|
|
# and any superior directories, if they do not exist.
|
|
|
|
-BIN_DIRECTORY=/usr/exim/bin
|
|
+BIN_DIRECTORY=@PREFIX@/sbin
|
|
|
|
|
|
#------------------------------------------------------------------------------
|
|
@@ -114,7 +114,7 @@ BIN_DIRECTORY=/usr/exim/bin
|
|
# don't exist. It will also install a default runtime configuration if this
|
|
# file does not exist.
|
|
|
|
-CONFIGURE_FILE=/usr/exim/configure
|
|
+CONFIGURE_FILE=@PKG_SYSCONFDIR@/configure
|
|
|
|
# It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
|
|
# In this case, Exim will use the first of them that exists when it is run.
|
|
@@ -131,7 +131,7 @@ CONFIGURE_FILE=/usr/exim/configure
|
|
# deliveries. (Local deliveries run as various non-root users, typically as the
|
|
# owner of a local mailbox.) Specifying these values as root is not supported.
|
|
|
|
-EXIM_USER=
|
|
+EXIM_USER=ref:@EXIM_USER@
|
|
|
|
# If you specify EXIM_USER as a name, this is looked up at build time, and the
|
|
# uid number is built into the binary. However, you can specify that this
|
|
@@ -152,7 +152,7 @@ EXIM_USER=
|
|
# for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
|
|
# you want to use a group other than the default group for the given user.
|
|
|
|
-# EXIM_GROUP=
|
|
+EXIM_GROUP=ref:@EXIM_GROUP@
|
|
|
|
# Many sites define a user called "exim", with an appropriate default group,
|
|
# and use
|
|
@@ -173,7 +173,7 @@ EXIM_USER=
|
|
|
|
# Almost all installations choose this:
|
|
|
|
-SPOOL_DIRECTORY=/var/spool/exim
|
|
+SPOOL_DIRECTORY=@VARBASE@/spool/exim
|
|
|
|
|
|
|
|
@@ -373,7 +373,7 @@ PCRE_CONFIG=yes
|
|
# files are defaulted in the OS/Makefile-Default file, but can be overridden in
|
|
# local OS-specific make files.
|
|
|
|
-EXIM_MONITOR=eximon.bin
|
|
+# EXIM_MONITOR=eximon.bin
|
|
|
|
|
|
#------------------------------------------------------------------------------
|
|
@@ -578,15 +578,15 @@ FIXED_NEVER_USERS=root
|
|
# included in the Exim binary. You will then need to set up the run time
|
|
# configuration to make use of the mechanism(s) selected.
|
|
|
|
-# AUTH_CRAM_MD5=yes
|
|
+AUTH_CRAM_MD5=yes
|
|
# AUTH_CYRUS_SASL=yes
|
|
# AUTH_DOVECOT=yes
|
|
# AUTH_GSASL=yes
|
|
# AUTH_GSASL_PC=libgsasl
|
|
# AUTH_HEIMDAL_GSSAPI=yes
|
|
# AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
|
|
-# AUTH_PLAINTEXT=yes
|
|
-# AUTH_SPA=yes
|
|
+AUTH_PLAINTEXT=yes
|
|
+AUTH_SPA=yes
|
|
|
|
|
|
#------------------------------------------------------------------------------
|
|
@@ -764,7 +764,7 @@ HEADERS_CHARSET="ISO-8859-1"
|
|
# %s. This will be replaced by one of the strings "main", "panic", or "reject"
|
|
# to form the final file names. Some installations may want something like this:
|
|
|
|
-# LOG_FILE_PATH=/var/log/exim_%slog
|
|
+LOG_FILE_PATH=@VARBASE@/log/exim/%s
|
|
|
|
# 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
|
|
@@ -1016,13 +1016,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
|
|
# haven't got Perl, Exim will still build and run; you just won't be able to
|
|
# use those utilities.
|
|
|
|
-# CHOWN_COMMAND=/usr/bin/chown
|
|
-# CHGRP_COMMAND=/usr/bin/chgrp
|
|
-# CHMOD_COMMAND=/usr/bin/chmod
|
|
-# MV_COMMAND=/bin/mv
|
|
-# RM_COMMAND=/bin/rm
|
|
-# TOUCH_COMMAND=/usr/bin/touch
|
|
-# PERL_COMMAND=/usr/bin/perl
|
|
+CHOWN_COMMAND=@CHOWN@
|
|
+CHGRP_COMMAND=@CHGRP@
|
|
+CHMOD_COMMAND=@CHMOD@
|
|
+MV_COMMAND=@MV@
|
|
+RM_COMMAND=@RM@
|
|
+TOUCH_COMMAND=@TOUCH@
|
|
+PERL_COMMAND=@PERL5@
|
|
|
|
|
|
#------------------------------------------------------------------------------
|
|
@@ -1222,7 +1222,7 @@ TMPDIR="/tmp"
|
|
# (process id) to a file so that it can easily be identified. The path of the
|
|
# file can be specified here. Some installations may want something like this:
|
|
|
|
-# PID_FILE_PATH=/var/lock/exim.pid
|
|
+PID_FILE_PATH=/var/run/exim.pid
|
|
|
|
# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
|
|
# using the name "exim-daemon.pid".
|
|
@@ -1294,3 +1294,10 @@ TMPDIR="/tmp"
|
|
# ENABLE_DISABLE_FSYNC=yes
|
|
|
|
# End of EDITME for Exim 4.
|
|
+
|
|
+EXTRALIBS_EXIM=-liconv
|
|
+
|
|
+@EXIM_USE_DB_CONFIG@
|
|
+@EXIM_DBMLIB@
|
|
+INCLUDE=@EXIM_INCLUDE@
|
|
+LOOKUP_LIBS=@LOOKUP_LIBS@
|