diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/exim/Makefile | 11 | ||||
| -rw-r--r-- | mail/exim/distinfo | 4 | ||||
| -rw-r--r-- | mail/exim/patches/patch-aa | 43 |
3 files changed, 34 insertions, 24 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 6c75bf1de41..348a0b1ccf6 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.62 2005/08/23 11:48:48 rillig Exp $ +# $NetBSD: Makefile,v 1.63 2005/08/29 18:29:05 reed Exp $ DISTNAME= exim-4.52 +PKGREVISION= 1 CATEGORIES= mail net MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \ ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \ @@ -17,6 +18,7 @@ USE_TOOLS+= perl:run USE_PKGINSTALL= yes MAKE_ENV+= SSLBASE=${SSLBASE:Q} +MAKE_ENV+= INST_CHOWN=${CHOWN} MAKE_FLAGS+= FULLECHO='' .include "../../mk/bsd.prefs.mk" @@ -24,7 +26,7 @@ MAKE_FLAGS+= FULLECHO='' BUILD_DEFS= EXIM_USER EXIM_GROUP EXIM_DB EXIM_USE_LOOKUP_WHOSON PKG_GROUPS= ${EXIM_GROUP} -PKG_USERS= ${EXIM_USER}:${EXIM_GROUP}::Exim\ mail\ server\ user:/var/mail:${NOLOGIN} +PKG_USERS= ${EXIM_USER}:${EXIM_GROUP}::Exim\ mail\ server\ user:${VARBASE}/mail:${NOLOGIN} PKG_SYSCONFSUBDIR?= exim EXAMPLESDIR= ${PREFIX}/share/examples/exim @@ -35,8 +37,8 @@ PLIST_SUBST+= DISTNAME="${DISTNAME}" RCD_SCRIPTS= exim -OWN_DIRS_PERMS= /var/log/exim ${EXIM_USER} ${EXIM_GROUP} 0750 -OWN_DIRS_PERMS+= /var/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750 +OWN_DIRS_PERMS= ${VARBASE}/log/exim ${EXIM_USER} ${EXIM_GROUP} 0750 +OWN_DIRS_PERMS+= ${VARBASE}/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750 # XXX: The following will be handled by buildlink3 at some point. CFLAGS+= ${_STRIPFLAG_CC} @@ -88,6 +90,7 @@ pre-configure: -e 's:@MV@:${MV}:' \ -e 's:@RM@:${RM}:' \ -e 's:@PERL5@:${PERL5}:' \ + -e 's:@VARBASE@:${VARBASE}:' \ < ${WRKSRC}/Local/Makefile.pkgsrc \ > ${WRKSRC}/Local/Makefile @${ECHO} WITH_CONTENT_SCAN=yes >> ${WRKSRC}/Local/Makefile diff --git a/mail/exim/distinfo b/mail/exim/distinfo index cc0522b35ef..cbb44af02b4 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.27 2005/07/20 06:32:29 grant Exp $ +$NetBSD: distinfo,v 1.28 2005/08/29 18:29:05 reed Exp $ SHA1 (exim-4.52.tar.bz2) = 8cf1e91a668b0f0220b4f40a793ce087d596f16e RMD160 (exim-4.52.tar.bz2) = d88d8cdb553af45466514e03e7759366b73212c0 Size (exim-4.52.tar.bz2) = 1535866 bytes -SHA1 (patch-aa) = a2b10bc2d8938c6973c353cb68394267c2e79ee5 +SHA1 (patch-aa) = 5fa5d91eb036b7404829995a37b796ff879f5f3c SHA1 (patch-ab) = 32452f2fed6f0300f460aa9de8528b5ab2fe15c1 SHA1 (patch-ac) = ed2b1b02cfa8338e82cf6bb74e9f9e5959dd8775 SHA1 (patch-ad) = 2f43716b398ce650a20750285ba19d7ba5c690bb diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa index bb34d609ac5..f9db5c178e2 100644 --- a/mail/exim/patches/patch-aa +++ b/mail/exim/patches/patch-aa @@ -1,7 +1,5 @@ -$NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $ - ---- Local/Makefile.pkgsrc.orig 2005-05-17 17:34:46.000000000 +0100 -+++ Local/Makefile.pkgsrc +--- Local/Makefile.pkgsrc.orig 2005-08-29 08:16:24.000000000 -0700 ++++ Local/Makefile.pkgsrc 2005-08-29 08:21:51.000000000 -0700 @@ -100,7 +100,7 @@ # /usr/local/sbin. The installation script will try to create this directory, # and any superior directories, if they do not exist. @@ -11,7 +9,7 @@ $NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $ #------------------------------------------------------------------------------ -@@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin +@@ -116,7 +116,7 @@ # don't exist. It will also install a default runtime configuration if this # file does not exist. @@ -20,7 +18,7 @@ $NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $ # 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. -@@ -134,7 +134,7 @@ CONFIGURE_FILE=/usr/exim/configure +@@ -134,7 +134,7 @@ # owner of a local mailbox.) Specifying these values as root is very strongly # discouraged. @@ -29,7 +27,7 @@ $NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $ # 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 -@@ -155,7 +155,7 @@ EXIM_USER= +@@ -155,7 +155,7 @@ # 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. @@ -38,7 +36,16 @@ $NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $ # Many sites define a user called "exim", with an appropriate default group, # and use -@@ -229,7 +229,7 @@ TRANSPORT_SMTP=yes +@@ -176,7 +176,7 @@ + + # Almost all installations choose this: + +-SPOOL_DIRECTORY=/var/spool/exim ++SPOOL_DIRECTORY=@VARBASE@/spool/exim + + + +@@ -229,7 +229,7 @@ # This one is special-purpose, and commonly not required, so it is not # included by default. @@ -47,7 +54,7 @@ $NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $ #------------------------------------------------------------------------------ -@@ -238,9 +238,9 @@ TRANSPORT_SMTP=yes +@@ -238,9 +238,9 @@ # MBX, is included only when requested. If you do not know what this is about, # leave these settings commented out. @@ -60,7 +67,7 @@ $NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $ #------------------------------------------------------------------------------ -@@ -312,7 +312,7 @@ LOOKUP_LSEARCH=yes +@@ -312,7 +312,7 @@ # files are defaulted in the OS/Makefile-Default file, but can be overridden in # local OS-specific make files. @@ -69,7 +76,7 @@ $NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $ #------------------------------------------------------------------------------ # Compiling Exim with content scanning support: If you want to compile Exim -@@ -464,10 +464,10 @@ FIXED_NEVER_USERS=root +@@ -464,10 +464,10 @@ # included in the Exim binary. You will then need to set up the run time # configuration to make use of the mechanism(s) selected. @@ -83,7 +90,7 @@ $NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $ #------------------------------------------------------------------------------ -@@ -553,10 +553,11 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -553,10 +553,11 @@ # leave these settings commented out. # This setting is required for any TLS support (either OpenSSL or GnuTLS) @@ -97,16 +104,16 @@ $NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $ # Uncomment these settings if you are using GnuTLS # USE_GNUTLS=yes -@@ -620,7 +621,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -620,7 +621,7 @@ # %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=/var/log/exim/%s ++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 -@@ -781,7 +782,8 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -782,7 +783,8 @@ # this setting. See the manual section entitled "Use of tcpwrappers" in the # chapter on building and installing Exim. # @@ -116,7 +123,7 @@ $NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $ # # You may well also have to specify a local "include" file and an additional # library for TCP wrappers, so you probably need something like this: -@@ -860,11 +862,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -861,11 +863,11 @@ # haven't got Perl, Exim will still build and run; you just won't be able to # use those utilities. @@ -133,7 +140,7 @@ $NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $ #------------------------------------------------------------------------------ -@@ -1058,7 +1060,7 @@ TMPDIR="/tmp" +@@ -1059,7 +1061,7 @@ # (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: @@ -142,7 +149,7 @@ $NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $ # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # using the name "exim-daemon.pid". -@@ -1094,3 +1096,7 @@ TMPDIR="/tmp" +@@ -1095,3 +1097,7 @@ # SUPPORT_MOVE_FROZEN_MESSAGES=yes # End of EDITME for Exim 4. |