Update to 3.13:

	Bugfix release.

IPv6 support is compiled in.  I can't test to see whether it works, and
got no feedback from a request for testing on the exim-users mailing
list.

Also added hooks for SMTP AUTH and PAM support, disabled by default
for now.

3 files changed, 38 insertions, 10 deletions

diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index 2ad0731db1d6..9b996b8c1f79 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -1,18 +1,17 @@
 # New ports collection makefile for:	exim
-# Version required:	3.10
+# Version required:	3.13
 # Date created:		23 June 1996
 # Whom:			markm@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	exim-3.12
+DISTNAME=	exim-3.13
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
-		ftp://ftp.quite.net/pub/exim/ \
 		http://www.exim.org/ftp/ \
 		ftp://ftp.is.co.za/networking/mail/transport/exim/
-DISTFILES=	exim-3.12.tar.gz exim-texinfo-3.10.tar.gz
+DISTFILES=	exim-3.13.tar.gz exim-texinfo-3.10.tar.gz
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
@@ -24,15 +23,22 @@ USE_PERL5=	YES
 
 MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
 
-# Uncomment the USE_LDAP and USE_MYSQL definitions to link against libldap
-# and libmysqlclient respectively:
+# Uncomment the USE_LDAP, USE_MYSQL and USE_PAM definitions to link against
+# libldap, libmysqlclient and libpam respectively.  The libpam linkage is
+# required for SMTP AUTH support.
 #USE_LDAP=	YES
 #USE_MYSQL=	YES
+#USE_PAM=	YES
 
 # If USE_LDAP==YES then LDAP_LIB_TYPE should be one of UMICHIGAN, NETSCAPE or
 # SOLARIS7:
 LDAP_LIB_TYPE=	UMICHIGAN
 
+# If USE_PAM==YES then one or more of USE_CRAM_MD5 and USE_PLAINTEXT
+# must be left uncommented.
+PAM_CRAM_MD5=	YES
+PAM_PLAINTEXT=	YES
+
 # You should not need to fiddle with anything below this point.
 
 SEDLIST=	-e 's,XX_PREFIX_XX,${PREFIX},' \
@@ -63,6 +69,21 @@ SEDLIST+=	-e 's/^LOOKUP_LIBS/\#LOOKUP_LIBS/' \
 		-e 's/^LOOKUP_INCLUDE/\#LOOKUP_INCLUDE/'
 .endif
 
+.if ( !defined(USE_PAM) || ${USE_PAM} != YES )
+SEDLIST+=	-e 's/^SUPPORT_PAM/\#SUPPORT_PAM/' \
+		-e 's/^PAM_LIBS/\#PAM_LIBS/'
+.endif
+
+.if ( !defined(USE_PAM) || ${USE_PAM} != YES ) || \
+    ( !defined(PAM_CRAM_MD5) || ${PAM_CRAM_MD5} != YES )
+SEDLIST+=	-e 's/^AUTH_CRAM_MD5/\#AUTH_CRAM_MD5/'
+.endif
+
+.if ( !defined(USE_PAM) || ${USE_PAM} != YES ) || \
+    ( !defined(PAM_PLAINTEXT) || ${PAM_PLAINTEXT} != YES )
+SEDLIST+=	-e 's/^AUTH_PLAINTEXT/\#AUTH_PLAINTEXT/'
+.endif
+
 do-configure:
 	${MKDIR} ${WRKSRC}/Local
 	${SED} ${SEDLIST} < ${FILESDIR}/Makefile > ${WRKSRC}/Local/Makefile
@@ -80,7 +101,4 @@ post-build:
 	${TOUCH} ${WRKSRC}/build-${OPSYS}-${MACHINE_ARCH}/eximon.bin
 	${TOUCH} ${WRKSRC}/build-${OPSYS}-${MACHINE_ARCH}/eximon
 
-post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
-
 .include <bsd.port.mk>
diff --git a/mail/exim-old/distinfo b/mail/exim-old/distinfo
index f2dbf8b4c3d2..837eb016a70d 100644
--- a/mail/exim-old/distinfo
+++ b/mail/exim-old/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-3.12.tar.gz) = 336cd605cb121703af4f22a8c34bb333
+MD5 (exim-3.13.tar.gz) = d4821c12e75814ddeb9a304d58c1e248
 MD5 (exim-texinfo-3.10.tar.gz) = c8c2596e6a303f774e0a627e61b4dffc
diff --git a/mail/exim-old/files/Makefile b/mail/exim-old/files/Makefile
index 7897639c8726..9bdafa248abd 100644
--- a/mail/exim-old/files/Makefile
+++ b/mail/exim-old/files/Makefile
@@ -1,6 +1,7 @@
 ##################################################
 #          The Exim mail transport agent         #
 ##################################################
+# $FreeBSD$
 
 # This is the template for Exim's main build-time configuration file. It
 # contains settings that are independent of any operating system. It should
@@ -474,4 +475,13 @@ TRANSPORT_SMTP=yes
 USE_TCP_WRAPPERS=yes
 EXTRALIBS=-lwrap
 
+
+# Experimental SMTP AUTH support, untested by the maintainer of the FreeBSD
+# port of Exim.
+
+AUTH_CRAM_MD5=yes
+AUTH_PLAINTEXT=yes
+SUPPORT_PAM=yes
+PAM_LIBS=-lpam
+
 # End of EDITME