Update 3.02 -> 3.03:

	Added Makefile knob for the new MySQL support within lookups.
	Added Makefile knob for the improved LDAP support.
	Turn TCP Wrappers support as default behaviour.
	Turn on embedded perl.

	See doc/NewStuff in the distfile for bugfixes and enhancements.

1 files changed, 48 insertions, 16 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 030538920d15..2c4c9f2c8a8a 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -3,43 +3,72 @@
 # Date created:		23 June 1996
 # Whom:			markm@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.33 1999/06/17 08:53:10 sheldonh Exp $
+# $Id: Makefile,v 1.34 1999/06/21 11:07:07 sheldonh Exp $
 #
 
-DISTNAME=	exim-3.02
+DISTNAME=	exim-3.03
 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.02.tar.gz exim-texinfo-3.00.tar.gz
+DISTFILES=	exim-3.03.tar.gz exim-texinfo-3.00.tar.gz
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
 # If USE_XLIB is defined, the eximon monitor, which requires X, will be
-# built.
+# built. Comment it out unless you have or want XFree86 installed!
 USE_XLIB=	YES
 
 USE_PERL5=	YES
 
 MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
 
-do-configure:
-	${MKDIR} ${WRKSRC}/Local
-.if defined(USE_XLIB) && ${USE_XLIB} == YES
-	${SED} -e "s#XX_PREFIX_XX#${PREFIX}#" \
-	    < ${FILESDIR}/Makefile \
-	    > ${WRKSRC}/Local/Makefile
+# Uncomment the USE_LDAP and USE_MYSQL definitions to link against libldap
+# and libmysqlclient respectively:
+#USE_LDAP=	YES
+#USE_MYSQL=	YES
+
+# If USE_LDAP==YES then LDAP_LIB_TYPE should be one of UMICHIGAN, NETSCAPE or
+# SOLARIS7:
+LDAP_LIB_TYPE=	UMICHIGAN
+
+# You should not need to fiddle with anything below this point.
+
+SEDLIST=	-e 's,XX_PREFIX_XX,${PREFIX},' \
+		-e 's,XX_BINOWN_XX,${BINOWN},'
+.if !defined(USE_XLIB) || ${USE_XLIB} != YES
+SEDLIST+=	-e 's/^EXIM_MONITOR/\#EXIM_MONITOR/'
+.endif
+
+.if defined(USE_LDAP) && ${USE_LDAP} == YES
+SEDLIST+=	-e 's,XX_LDAP_LIBS_XX,-L${PREFIX}/lib -lber -lldap,' \
+		-e 's,XX_LDAP_INCLUDE_XX,-I${PREFIX}/include,' \
+		-e 's,XX_LDAP_TYPE_XX,${LDAP_LIB_TYPE},'
 .else
-	${SED} -e "s#XX_PREFIX_XX#${PREFIX}#" \
-	    -e "s/^EXIM_MONITOR/#EXIM_MONITOR/" \
-	    < ${FILESDIR}/Makefile \
-	    > ${WRKSRC}/Local/Makefile
+SEDLIST+=	-e 's,XX_LDAP_[^ ]*_XX,,' \
+		-e 's,^LDAP_LIB_TYPE,\#LDAP_LIB_TYPE,'
 .endif
 
+.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
+		-e 's,XX_MYSQL_INCLUDE_XX,-I${PREFIX}/include/mysql,'
+.else
+SEDLIST+=	-e 's,XX_MYSQL_[^ ]*_XX,,'
+.endif
+
+.if ( !defined(USE_LDAP) || ${USE_LDAP} != YES ) && \
+    ( !defined(USE_MYSQL) || ${USE_MYSQL} != YES )
+SEDLIST+=	-e 's/^LOOKUP_LIBS/\#LOOKUP_LIBS/' \
+		-e 's/^LOOKUP_INCLUDE/\#LOOKUP_INCLUDE/'
+.endif
+
+do-configure:
+	${MKDIR} ${WRKSRC}/Local
+	${SED} ${SEDLIST} < ${FILESDIR}/Makefile > ${WRKSRC}/Local/Makefile
+	${SED} ${SEDLIST} < ${FILESDIR}/configure.default \
+	    > ${WRKSRC}/src/configure.default
 	${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
-	${SED} -e "s#XX_BINOWN_XX#${BINOWN}#" \
-	    < ${FILESDIR}/configure.default > ${WRKSRC}/src/configure.default
 	cd ${WRKSRC}/doc && \
 	for i in ../../exim-texinfo-3.00/doc/* ; do \
 		ln -sf $$i ; \
@@ -51,4 +80,7 @@ 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>