[pkgsrc/trunk]: pkgsrc/mail/exim Update exim to exim-4.52nb3:

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ef334ff8e01
branches:  trunk
changeset: 500187:8ef334ff8e01
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon Oct 03 18:45:50 2005 +0000

description:
Update exim to exim-4.52nb3:
- Add rmail, rsmtp, & runq as exim mailer.conf aliases (from Sergey Svishchev)
- Add lookup options for openldap, mysql, eximon and dnsdb (from Sven Hartge
  in PR pkg/27242)
- Change 'exim' specific options to be prefixed with exim- (suggsted by
  Dieter Baron)

diffstat:

 mail/exim/Makefile               |   4 +-
 mail/exim/files/mailer.conf.exim |   9 +++-
 mail/exim/options.mk             |  61 +++++++++++++++++++++++++++------------
 3 files changed, 50 insertions(+), 24 deletions(-)

diffs (118 lines):

diff -r 40cb99c2e2ff -r 8ef334ff8e01 mail/exim/Makefile
--- a/mail/exim/Makefile        Mon Oct 03 18:42:32 2005 +0000
+++ b/mail/exim/Makefile        Mon Oct 03 18:45:50 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2005/09/10 23:11:40 abs Exp $
+# $NetBSD: Makefile,v 1.66 2005/10/03 18:45:50 abs Exp $
 
 DISTNAME=      exim-4.52
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    mail net
 MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/ \
                ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
diff -r 40cb99c2e2ff -r 8ef334ff8e01 mail/exim/files/mailer.conf.exim
--- a/mail/exim/files/mailer.conf.exim  Mon Oct 03 18:42:32 2005 +0000
+++ b/mail/exim/files/mailer.conf.exim  Mon Oct 03 18:45:50 2005 +0000
@@ -1,8 +1,11 @@
-#      $NetBSD: mailer.conf.exim,v 1.2 2003/09/02 10:33:41 abs Exp $
+#      $NetBSD: mailer.conf.exim,v 1.3 2005/10/03 18:45:50 abs Exp $
 #
 # Use "exim" as replacement for "sendmail".
 #
-sendmail       @PREFIX@/sbin/exim
-send-mail      @PREFIX@/sbin/exim
 mailq          @PREFIX@/sbin/exim
 newaliases     @PREFIX@/sbin/exim
+rmail          @PREFIX@/sbin/exim
+rsmtp          @PREFIX@/sbin/exim
+runq           @PREFIX@/sbin/exim
+send-mail      @PREFIX@/sbin/exim
+sendmail       @PREFIX@/sbin/exim
diff -r 40cb99c2e2ff -r 8ef334ff8e01 mail/exim/options.mk
--- a/mail/exim/options.mk      Mon Oct 03 18:42:32 2005 +0000
+++ b/mail/exim/options.mk      Mon Oct 03 18:45:50 2005 +0000
@@ -1,37 +1,53 @@
-# $NetBSD: options.mk,v 1.1 2005/09/10 23:11:40 abs Exp $
+# $NetBSD: options.mk,v 1.2 2005/10/03 18:45:50 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
+PKG_SUPPORTED_OPTIONS= exim-build-eximon exim-content-scan exim-lookup-dnsdb
+PKG_SUPPORTED_OPTIONS+=        exim-lookup-dsearch exim-lookup-ldap exim-lookup-mysql
+PKG_SUPPORTED_OPTIONS+= exim-lookup-whoson exim-old-demime gdbm saslauthd
+PKG_SUGGESTED_OPTIONS= exim-content-scan exim-lookup-dsearch exim-old-demime
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mlookup_dsearch)
+.if !empty(PKG_OPTIONS:Mexim-build-eximon)
+LOCAL_MAKEFILE_OPTIONS+=EXIM_MONITOR=eximon.bin
+USE_X11BASE=yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-content-scan)
+LOCAL_MAKEFILE_OPTIONS+=WITH_CONTENT_SCAN=YES
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-lookup-dnsdb)
+LOCAL_MAKEFILE_OPTIONS+=LOOKUP_DNSDB=YES
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-lookup-dsearch)
 LOCAL_MAKEFILE_OPTIONS+=LOOKUP_DSEARCH=YES
 .endif
 
-.if !empty(PKG_OPTIONS:Mlookup_whoson)
-LOCAL_MAKEFILE_OPTIONS+=WITH_LOOKUP_WHOSON=YES
+.if !empty(PKG_OPTIONS:Mexim-lookup-ldap)
+LOCAL_MAKEFILE_OPTIONS+=LOOKUP_LDAP=YES
+LOCAL_MAKEFILE_OPTIONS+=LDAP_LIB_TYPE=OPENLDAP2
+LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.openldap}  -L${LOCALBASE}/${BUILDLINK_LIBDIRS.openldap} -lldap -llber 
+.  include "../../databases/openldap/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-lookup-mysql)
+LOCAL_MAKEFILE_OPTIONS+=LOOKUP_MYSQL=YES
+LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.mysql}  -L${LOCALBASE}/${BUILDLINK_LIBDIRS.mysql} -lmysqlclient
+.  include "../../mk/mysql.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-lookup-whoson)
+LOCAL_MAKEFILE_OPTIONS+=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)
+.if !empty(PKG_OPTIONS:Mexim-old-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
@@ -55,3 +71,10 @@
 EXIM_INCLUDE=          -I/usr/${BUILDLINK_INCDIRS.db-native}
 .  endif
 .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