Update exim to 4.52nb2

- Fix NetBSD statvfs check for NetBSD 2.1
- Move options into options.mk,
- breakout lookup_dsearch (default on)
- add saslauthd (Requested by Peter Avalos)

5 files changed, 73 insertions, 44 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index b9efd3071f1..c632bf83509 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2005/08/29 18:31:48 reed Exp $
+# $NetBSD: Makefile,v 1.65 2005/09/10 23:11:40 abs Exp $
 
 DISTNAME=	exim-4.52
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	FULLECHO=''
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS=	EXIM_USER EXIM_GROUP EXIM_DB EXIM_USE_LOOKUP_WHOSON
+BUILD_DEFS=	EXIM_USER EXIM_GROUP EXIM_DB
 
 PKG_GROUPS=	${EXIM_GROUP}
 PKG_USERS=	${EXIM_USER}:${EXIM_GROUP}::Exim\ mail\ server\ user:${VARBASE}/mail:${NOLOGIN}
@@ -43,34 +43,12 @@ 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}
 
+.include "options.mk"
+
 # BDB_TYPE gets set to "db1" if USE_DB185=="yes"
 USE_DB185?=		no
 BDB_ACCEPTED?=		db1 db2 db3 db4
 
-.if defined(EXIM_DB) && ${EXIM_DB} == "gdbm"
-.  include "../../databases/gdbm/buildlink3.mk"
-EXIM_USE_DB_CONFIG=	USE_GDBM=yes
-EXIM_DBMLIB=		DBMLIB=${LDFLAGS} -lgdbm
-EXIM_INCLUDE=		-I${PREFIX}/include
-.else # use native or Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED
-.  include "../../mk/bdb.buildlink3.mk"
-EXIM_USE_DB_CONFIG=	USE_DB=yes	# the default
-.  if ${BDB_TYPE} == "db4"
-EXIM_DBMLIB=		DBMLIB=${LDFLAGS} ${BDB_LIBS}
-EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db4}
-.  elif ${BDB_TYPE} == "db3"
-EXIM_DBMLIB=		DBMLIB=${LDFLAGS} ${BDB_LIBS}
-EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db3}
-.  elif ${BDB_TYPE} == "db2"
-EXIM_DBMLIB=		DBMLIB=${LDFLAGS} ${BDB_LIBS}
-EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db2}
-.  else # using native
-EXIM_DBMLIB=		# empty so use defaults
-EXIM_USE_DB_CONFIG=	# empty so use defaults
-EXIM_INCLUDE=		-I/usr/${BUILDLINK_INCDIRS.db-native}
-.  endif
-.endif
-
 post-extract:
 	${MKDIR} ${WRKSRC}/Local
 	${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc
@@ -79,7 +57,6 @@ post-extract:
 		${WRKSRC}/OS/
 
 pre-configure:
-	@${ECHO} LOOKUP_DSEARCH=yes >> ${WRKSRC}/Local/Makefile.pkgsrc
 	@${SED} -e 's:@PREFIX@:${PREFIX}:' \
 		-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
 		-e 's:@EXIM_USER@:${EXIM_USER}:' \
@@ -87,6 +64,7 @@ pre-configure:
 		-e 's:@EXIM_USE_DB_CONFIG@:${EXIM_USE_DB_CONFIG}:' \
 		-e 's:@EXIM_DBMLIB@:${EXIM_DBMLIB}:' \
 		-e 's:@EXIM_INCLUDE@:${EXIM_INCLUDE}:' \
+		-e 's:@LOOKUP_LIBS@:${LOOKUP_LIBS}:' \
 		-e 's:@CHOWN@:${CHOWN}:' \
 		-e 's:@CHGRP@:${CHGRP}:' \
 		-e 's:@MV@:${MV}:' \
@@ -95,12 +73,9 @@ pre-configure:
 		-e 's:@VARBASE@:${VARBASE}:' \
 	    < ${WRKSRC}/Local/Makefile.pkgsrc \
 	    > ${WRKSRC}/Local/Makefile
-	@${ECHO} WITH_CONTENT_SCAN=yes >> ${WRKSRC}/Local/Makefile
-	@${ECHO} WITH_OLD_DEMIME=yes >> ${WRKSRC}/Local/Makefile
-.if defined(EXIM_USE_LOOKUP_WHOSON) && ${EXIM_USE_LOOKUP_WHOSON} == "YES"
-	@${ECHO} LOOKUP_WHOSON=yes >> ${WRKSRC}/Local/Makefile
-	@${ECHO} LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.whoson} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.whoson} -lwhoson >> ${WRKSRC}/Local/Makefile
-.endif
+.for opt in ${LOCAL_MAKEFILE_OPTIONS}
+	@${ECHO} ${opt} >> ${WRKSRC}/Local/Makefile
+.endfor
 	@${SED} -e 's:@PREFIX@:${PREFIX}:' \
 		-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
 	    < ${WRKSRC}/Local/eximon.conf.pkgsrc \
@@ -116,10 +91,6 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/exim.8 ${PREFIX}/man/man8/exim.8
 
-.if defined(EXIM_USE_LOOKUP_WHOSON) && ${EXIM_USE_LOOKUP_WHOSON} == "YES"
-.  include "../../net/whoson/buildlink3.mk"
-.endif
-
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index cbb44af02b4..bbbe52384a9 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.28 2005/08/29 18:29:05 reed Exp $
+$NetBSD: distinfo,v 1.29 2005/09/10 23:11:40 abs 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) = 5fa5d91eb036b7404829995a37b796ff879f5f3c
+SHA1 (patch-aa) = 82b0ff0fe5d3265efef6cf5511925e63469c2516
 SHA1 (patch-ab) = 32452f2fed6f0300f460aa9de8528b5ab2fe15c1
 SHA1 (patch-ac) = ed2b1b02cfa8338e82cf6bb74e9f9e5959dd8775
 SHA1 (patch-ad) = 2f43716b398ce650a20750285ba19d7ba5c690bb
 SHA1 (patch-ae) = acc7897d417e137de73a2cac1dd46834f719e202
-SHA1 (patch-af) = 34c4ed129da092396f6f43ba17458c7b753343e4
+SHA1 (patch-af) = cfaa64d0979ebfb6486cb280fb1d17aeea39f2d0
diff --git a/mail/exim/options.mk b/mail/exim/options.mk
new file mode 100644
index 00000000000..7ca9e1a85f8
--- /dev/null
+++ b/mail/exim/options.mk
@@ -0,0 +1,57 @@
+# $NetBSD: options.mk,v 1.1 2005/09/10 23:11:40 abs Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.exim
+PKG_SUPPORTED_OPTIONS=	content_scan gdmb lookup_dsearch lookup_whoson
+PKG_SUPPORTED_OPTIONS+=	old_demime saslauthd
+PKG_SUGGESTED_OPTIONS=	content_scan lookup_dsearch old_demime
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mlookup_dsearch)
+LOCAL_MAKEFILE_OPTIONS+=LOOKUP_DSEARCH=YES
+.endif
+
+.if !empty(PKG_OPTIONS:Mlookup_whoson)
+LOCAL_MAKEFILE_OPTIONS+=WITH_LOOKUP_WHOSON=YES
+LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.whoson} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.whoson} -lwhoson
+.  include "../../net/whoson/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mcontent_scan)
+LOCAL_MAKEFILE_OPTIONS+=WITH_CONTENT_SCAN=YES
+.endif
+
+.if !empty(PKG_OPTIONS:Mold_demime)
+LOCAL_MAKEFILE_OPTIONS+=WITH_OLD_DEMIME=YES
+.endif
+
+.if !empty(PKG_OPTIONS:Msaslauthd)
+LOCAL_MAKEFILE_OPTIONS+=AUTH_CYRUS_SASL=YES
+LOCAL_MAKEFILE_OPTIONS+=CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
+LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl2} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl2} -lsasl2
+.  include "../../security/cyrus-sasl2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgdbm)
+.  include "../../databases/gdbm/buildlink3.mk"
+EXIM_USE_DB_CONFIG=	USE_GDBM=yes
+EXIM_DBMLIB=		DBMLIB=${LDFLAGS} -lgdbm
+EXIM_INCLUDE=		-I${PREFIX}/include
+.else # use native or Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED
+.  include "../../mk/bdb.buildlink3.mk"
+EXIM_USE_DB_CONFIG=	USE_DB=yes	# the default
+.  if ${BDB_TYPE} == "db4"
+EXIM_DBMLIB=		DBMLIB=${LDFLAGS} ${BDB_LIBS}
+EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db4}
+.  elif ${BDB_TYPE} == "db3"
+EXIM_DBMLIB=		DBMLIB=${LDFLAGS} ${BDB_LIBS}
+EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db3}
+.  elif ${BDB_TYPE} == "db2"
+EXIM_DBMLIB=		DBMLIB=${LDFLAGS} ${BDB_LIBS}
+EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db2}
+.  else # using native
+EXIM_DBMLIB=		# empty so use defaults
+EXIM_USE_DB_CONFIG=	# empty so use defaults
+EXIM_INCLUDE=		-I/usr/${BUILDLINK_INCDIRS.db-native}
+.  endif
+.endif
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
index f9db5c178e2..1c280c65ddb 100644
--- a/mail/exim/patches/patch-aa
+++ b/mail/exim/patches/patch-aa
@@ -149,7 +149,7 @@
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-@@ -1095,3 +1097,7 @@
+@@ -1095,3 +1097,8 @@
  # SUPPORT_MOVE_FROZEN_MESSAGES=yes
  
  # End of EDITME for Exim 4.
@@ -157,3 +157,4 @@
 +@EXIM_USE_DB_CONFIG@
 +@EXIM_DBMLIB@
 +INCLUDE=@EXIM_INCLUDE@
++LOOKUP_LIBS=@LOOKUP_LIBS@
diff --git a/mail/exim/patches/patch-af b/mail/exim/patches/patch-af
index 3bce7dd94c1..03226a4fb94 100644
--- a/mail/exim/patches/patch-af
+++ b/mail/exim/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2005/05/17 17:06:12 abs Exp $
+$NetBSD: patch-af,v 1.6 2005/09/10 23:11:40 abs Exp $
 
 --- OS/os.h-NetBSD.orig	2005-05-04 12:35:39.000000000 +0100
 +++ OS/os.h-NetBSD
@@ -8,7 +8,7 @@ $NetBSD: patch-af,v 1.5 2005/05/17 17:06:12 abs Exp $
  
 +#include <sys/param.h>
 +
-+#if __NetBSD_Version__ >= 200040000
++#if __NetBSD_Version__ >= 299000900
 +#define HAVE_SYS_STATVFS_H
 +#endif
 +