Update mail/exim to 4.63nb1

- Add options exim-appendfile-maildir exim-appendfile-mailstore
  exim-appendfile-mbx exim-lookup-cdb exim-tcp-wrappers exim-tls
  All but exim-lookup-cdb default to off, to preserve previous
  defaults.

4 files changed, 73 insertions, 73 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index b788cd8c061..315b49b7d2f 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2006/09/16 07:09:22 schwarz Exp $
+# $NetBSD: Makefile,v 1.80 2006/11/20 11:56:42 abs Exp $
 
 DISTNAME=	exim-4.63
+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/ \
@@ -63,7 +64,7 @@ post-extract:
 		${WRKSRC}/OS/
 
 pre-configure:
-	@${SED} -e 's:@PREFIX@:${PREFIX}:' \
+	${SED} -e 's:@PREFIX@:${PREFIX}:' \
 		-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
 		-e 's:@EXIM_USER@:${EXIM_USER}:' \
 		-e 's:@EXIM_GROUP@:${EXIM_GROUP}:' \
@@ -82,7 +83,7 @@ pre-configure:
 .for opt in ${LOCAL_MAKEFILE_OPTIONS}
 	@${ECHO} ${opt} >> ${WRKSRC}/Local/Makefile
 .endfor
-	@${SED} -e 's:@PREFIX@:${PREFIX}:' \
+	${SED} -e 's:@PREFIX@:${PREFIX}:' \
 		-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
 	    < ${WRKSRC}/Local/eximon.conf.pkgsrc \
 	    > ${WRKSRC}/Local/eximon.conf
@@ -93,7 +94,7 @@ pre-configure:
 	done
 
 post-build:
-	@${SED} -e 's:@PREFIX@:${PREFIX}:' \
+	${SED} -e 's:@PREFIX@:${PREFIX}:' \
 	    ${FILESDIR}/mailer.conf.exim \
 	    > ${WRKDIR}/mailer.conf
 
@@ -102,6 +103,5 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/exim.8 ${PREFIX}/${PKGMANDIR}/man8/exim.8
 
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 442f032dfc0..b62cc0368fc 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.34 2006/08/30 21:11:37 abs Exp $
+$NetBSD: distinfo,v 1.35 2006/11/20 11:56:42 abs Exp $
 
 SHA1 (exim-4.63.tar.bz2) = 44bb57c26bee29500d0b80ba57997e5325f144d0
 RMD160 (exim-4.63.tar.bz2) = 43ff82bad9e097da670d6b5c77e672b3edc3945b
 Size (exim-4.63.tar.bz2) = 1586169 bytes
-SHA1 (patch-aa) = c7107d46d54ed08c2086af7504b432e10af9db80
+SHA1 (patch-aa) = 11de4fdeea6a99f8347dbfff5c7d76fb3ed904d1
 SHA1 (patch-ab) = 1c6e7882346974390c22e7b9e09a76c5ed670d1d
 SHA1 (patch-ac) = a3ecdafc44ad2212b00e49de594efb26612b0b75
 SHA1 (patch-ad) = 52c768378483bf02295d46c01d55f955697834eb
diff --git a/mail/exim/options.mk b/mail/exim/options.mk
index 59064fa43a2..888d9ecc77b 100644
--- a/mail/exim/options.mk
+++ b/mail/exim/options.mk
@@ -1,27 +1,51 @@
-# $NetBSD: options.mk,v 1.9 2006/05/31 18:22:24 ghen Exp $
+# $NetBSD: options.mk,v 1.10 2006/11/20 11:56:42 abs Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.exim
-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-pgsql exim-lookup-sqlite exim-lookup-whoson
-PKG_SUPPORTED_OPTIONS+= exim-old-demime gdbm inet6 saslauthd
-PKG_SUGGESTED_OPTIONS=	exim-content-scan exim-lookup-dsearch exim-old-demime
+PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
+PKG_SUPPORTED_OPTIONS+= exim-appendfile-mbx exim-build-eximon
+PKG_SUPPORTED_OPTIONS+= exim-content-scan exim-lookup-cdb exim-lookup-dnsdb
+PKG_SUPPORTED_OPTIONS+= exim-lookup-dsearch exim-lookup-ldap exim-lookup-mysql
+PKG_SUPPORTED_OPTIONS+= exim-lookup-pgsql exim-lookup-sqlite exim-lookup-whoson
+PKG_SUPPORTED_OPTIONS+= exim-old-demime exim-router-iplookup exim-tcp-wrappers
+PKG_SUPPORTED_OPTIONS+= exim-tls exim-transport-lmtp gdbm inet6 saslauth
+
+PKG_SUGGESTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
+PKG_SUGGESTED_OPTIONS+= exim-appendfile-mbx exim-content-scan
+PKG_SUGGESTED_OPTIONS+= exim-lookup-dsearch exim-old-demime exim-tcp-wrappers
+PKG_SUGGESTED_OPTIONS+= exim-tls
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_SRC=${PKGDIR}/PLIST
 
+.if !empty(PKG_OPTIONS:Mexim-appendfile-maildir)
+LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MAILDIR=yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-appendfile-mailstore)
+LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MAILSTORE=yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-appendfile-mbx)
+LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MBX=yes
+.endif
+
 .if !empty(PKG_OPTIONS:Mexim-build-eximon)
 LOCAL_MAKEFILE_OPTIONS+=EXIM_MONITOR=eximon.bin
 LOCAL_MAKEFILE_OPTIONS+=X11=${X11BASE}
 PLIST_SRC+=${PKGDIR}/PLIST.eximon
-.include "../../mk/x11.buildlink3.mk"
+.  include "../../mk/x11.buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-content-scan)
 LOCAL_MAKEFILE_OPTIONS+=WITH_CONTENT_SCAN=YES
 .endif
 
+.if !empty(PKG_OPTIONS:Mexim-lookup-cdb)
+LOCAL_MAKEFILE_OPTIONS+=LOOKUP_CDB=YES
+DEPENDS+=cdb-[0-9]*:../../databases/cdb
+.endif
+
 .if !empty(PKG_OPTIONS:Mexim-lookup-dnsdb)
 LOCAL_MAKEFILE_OPTIONS+=LOOKUP_DNSDB=YES
 .endif
@@ -33,31 +57,31 @@ LOCAL_MAKEFILE_OPTIONS+=LOOKUP_DSEARCH=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-client}  -L${LOCALBASE}/${BUILDLINK_LIBDIRS.openldap-client} -lldap -llber
+LOOKUP_LIBS+=-lldap -llber
 .  include "../../databases/openldap-client/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
+LOOKUP_LIBS+=-lmysqlclient
 .  include "../../mk/mysql.buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-lookup-pgsql)
 LOCAL_MAKEFILE_OPTIONS+=LOOKUP_PGSQL=YES
-LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.pgsql}  -L${LOCALBASE}/${BUILDLINK_LIBDIRS.mysql} -lpq
+LOOKUP_LIBS+=-lpq
 .  include "../../mk/pgsql.buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-lookup-sqlite)
 LOCAL_MAKEFILE_OPTIONS+=LOOKUP_SQLITE=YES
-LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.sqlite3}  -L${LOCALBASE}/${BUILDLINK_LIBDIRS.sqlite3} -lsqlite3
+LOOKUP_LIBS+=-lsqlite3
 .  include "../../databases/sqlite3/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
+LOOKUP_LIBS+=-lwhoson
 .  include "../../net/whoson/buildlink3.mk"
 .endif
 
@@ -65,6 +89,26 @@ LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.whoson} -L${
 LOCAL_MAKEFILE_OPTIONS+=WITH_OLD_DEMIME=YES
 .endif
 
+.if !empty(PKG_OPTIONS:Mexim-router-iplookup)
+LOCAL_MAKEFILE_OPTIONS+=ROUTER_IPLOOKUP=yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-tcp-wrappers)
+LOCAL_MAKEFILE_OPTIONS+=USE_TCP_WRAPPERS=yes
+LOOKUP_LIBS+=-lwrap
+.  include "../../security/tcp_wrappers/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-tls)
+LOCAL_MAKEFILE_OPTIONS+=SUPPORT_TLS=yes
+LOOKUP_LIBS+=-lssl -lcrypto
+.  include "../../security/openssl/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mexim-transport-lmtp)
+LOCAL_MAKEFILE_OPTIONS+=TRANSPORT_LMTP=yes
+.endif
+
 .if !empty(PKG_OPTIONS:Minet6)
 LOCAL_MAKEFILE_OPTIONS+=HAVE_IPV6=YES
 .endif
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
index 4f6c5b9ae6e..f339bda7cc6 100644
--- a/mail/exim/patches/patch-aa
+++ b/mail/exim/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.16 2006/08/08 15:24:01 abs Exp $
+$NetBSD: patch-aa,v 1.17 2006/11/20 11:56:42 abs Exp $
 
---- Local/Makefile.pkgsrc.orig	2006-08-08 16:11:10.000000000 +0100
+--- Local/Makefile.pkgsrc.orig	2006-11-15 11:58:34.000000000 +0000
 +++ Local/Makefile.pkgsrc
 @@ -100,7 +100,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
@@ -34,7 +34,7 @@ $NetBSD: patch-aa,v 1.16 2006/08/08 15:24:01 abs Exp $
  # you want to use a group other than the default group for the given user.
  
 -# EXIM_GROUP=
-+EXIM_GROUP=@EXIM_GROUP@
++EXIM_GROUP=ref:@EXIM_GROUP@
  
  # Many sites define a user called "exim", with an appropriate default group,
  # and use
@@ -47,28 +47,6 @@ $NetBSD: patch-aa,v 1.16 2006/08/08 15:24:01 abs Exp $
  
  
  
-@@ -235,7 +235,7 @@ TRANSPORT_SMTP=yes
- # This one is special-purpose, and commonly not required, so it is not
- # included by default.
- 
--# TRANSPORT_LMTP=yes
-+TRANSPORT_LMTP=yes
- 
- 
- #------------------------------------------------------------------------------
-@@ -244,9 +244,9 @@ TRANSPORT_SMTP=yes
- # MBX, is included only when requested. If you do not know what this is about,
- # leave these settings commented out.
- 
--# SUPPORT_MAILDIR=yes
--# SUPPORT_MAILSTORE=yes
--# SUPPORT_MBX=yes
-+SUPPORT_MAILDIR=yes
-+SUPPORT_MAILSTORE=yes
-+SUPPORT_MBX=yes
- 
- 
- #------------------------------------------------------------------------------
 @@ -320,7 +320,7 @@ LOOKUP_LSEARCH=yes
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
@@ -92,21 +70,7 @@ $NetBSD: patch-aa,v 1.16 2006/08/08 15:24:01 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -562,10 +562,11 @@ HEADERS_CHARSET="ISO-8859-1"
- # leave these settings commented out.
- 
- # This setting is required for any TLS support (either OpenSSL or GnuTLS)
--# SUPPORT_TLS=yes
-+SUPPORT_TLS=yes
- 
- # Uncomment this setting if you are using OpenSSL
--# TLS_LIBS=-lssl -lcrypto
-+TLS_LIBS=-L${SSLBASE}/lib -Wl,-R${SSLBASE}/lib -lssl -lcrypto
-+TLS_INCLUDE=-I${SSLBASE}/include
- 
- # Uncomment these settings if you are using GnuTLS
- # USE_GNUTLS=yes
-@@ -629,7 +630,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -629,7 +629,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:
  
@@ -115,17 +79,7 @@ $NetBSD: patch-aa,v 1.16 2006/08/08 15:24:01 abs Exp $
  
  # 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
-@@ -791,7 +792,8 @@ ZCAT_COMMAND=/usr/bin/zcat
- # this setting. See the manual section entitled "Use of tcpwrappers" in the
- # chapter on building and installing Exim.
- #
--# USE_TCP_WRAPPERS=yes
-+USE_TCP_WRAPPERS=yes
-+EXTRALIBS_EXIM=-lwrap
- #
- # 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:
-@@ -870,11 +872,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+@@ -870,11 +870,11 @@ 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.
  
@@ -142,7 +96,7 @@ $NetBSD: patch-aa,v 1.16 2006/08/08 15:24:01 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -1068,7 +1070,7 @@ TMPDIR="/tmp"
+@@ -1068,7 +1068,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:
  
@@ -151,11 +105,13 @@ $NetBSD: patch-aa,v 1.16 2006/08/08 15:24:01 abs Exp $
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-@@ -1104,3 +1106,8 @@ TMPDIR="/tmp"
+@@ -1104,3 +1104,10 @@ TMPDIR="/tmp"
  # SUPPORT_MOVE_FROZEN_MESSAGES=yes
  
  # End of EDITME for Exim 4.
 +
++EXTRALIBS_EXIM=-liconv
++
 +@EXIM_USE_DB_CONFIG@
 +@EXIM_DBMLIB@
 +INCLUDE=@EXIM_INCLUDE@