1 files changed, 58 insertions, 59 deletions

diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index 839c9f1819ad..9c4068489960 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -1,90 +1,82 @@
 # New ports collection makefile for:	postfix
-# Date created:		18 Mar 1999
+# Date created: 	18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
 PORTNAME=	postfix
-PORTVERSION=	19991231.13
-PORTREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
+PORTVERSION=	20010228
+CATEGORIES=	mail ipv6
+MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
+		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
 		ftp://ftp.tux.org/pub/net/postfix/official/ \
 		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
 		ftp://ftp.samurai.com/pub/postfix/official/ \
-		ftp://ftp.nl.uu.net/pub/unix/mail/postfix/official/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
-		ftp://ftp.mira.net/pub/unix/mail/postfix/official/ \
-		ftp://coda.nctu.edu.tw/network/mail/postfix/official/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-DISTNAME=	${PORTNAME}-19991231-pl13
+MASTER_SITE_SUBDIR= . old related/postfix
+DISTNAME=	release-${PORTVERSION}
 
 MAINTAINER=	blaz@amis.net
 
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-.if defined(CC)
-MAKEFILEFLAGS+=	CC="${CC}"
-.endif
-
-MAKEFILEFLAGS+=	OPT="${CFLAGS}"
-SCRIPTS_ENV+=   MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-
 MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
 	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
 	sendmail.1
 
-MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
+MAN5=	access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
+	transport.5 virtual.5
 
-MAN8=	bounce.8 cleanup.8 defer.8 error.8 local.8 master.8 pickup.8 \
-	pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
+	master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \
+	spawn.8 trivial-rewrite.8
 
 CONF1=	access aliases canonical main.cf master.cf \
-	relocated transport virtual
+	regexp_table relocated transport virtual
 
 CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
-	sample-filter.cf sample-local.cf sample-misc.cf \
+	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
 	sample-smtpd.cf sample-transport.cf sample-virtual.cf
 
-BIN1=	bounce cleanup error local master pickup \
-	pipe qmgr showq smtp smtpd trivial-rewrite
+BIN1=	bounce cleanup error flush lmtp local master pickup \
+	pipe qmgr showq smtp smtpd spawn trivial-rewrite
 
 BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
-POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz
+.if defined(NOPORTDOCS)
+PLIST_SUB+=	SUB_DOCS="@comment "
+.else
+PLIST_SUB+=	SUB_DOCS=""
+DOCDIR=		${PREFIX}/share/doc/postfix
 .endif
 
-.if defined(WITH_LDAP)
-CONF2+=			sample-ldap.cf
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-PLIST_SUB+=		WITH_LDAP=""
-.else
-PLIST_SUB+=		WITH_LDAP="@comment "
+.if !defined(DEBUG)
+MAKEFILEFLAGS+=	DEBUG=
 .endif
 
-.if defined(WITH_PCRE)
-CONF2+=			sample-pcre.cf
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libpcre.a
-PLIST_SUB+=		WITH_PCRE=""
-.else
-PLIST_SUB+=		WITH_PCRE="@comment "
+.if defined(CC)
+MAKEFILEFLAGS+=	CC="${CC}"
+.endif
+
+MAKEFILEFLAGS+=	OPT="${CFLAGS}"
+
+SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
+		PREFIX="${PREFIX}" \
+		TOUCH="${TOUCH}" \
+		MKDIR="${MKDIR}" \
+		MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
+
+pre-fetch:
+	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
 post-patch:
-	(cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
+	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
 	${ECHO} "all: default" >> Makefile)
 
@@ -122,7 +114,13 @@ do-install:
 
 .for file in ${BIN2}
 	@${INSTALL_PROGRAM} \
-		${WRKSRC}/${file}/${file} \
+		${WRKSRC}/src/${file}/${file} \
+		${PREFIX}/sbin
+.endfor
+
+.for file in ${BIN3}
+	@${INSTALL_PROGRAM} \
+		${WRKSRC}/src/smtpstone/${file} \
 		${PREFIX}/sbin
 .endfor
 
@@ -145,11 +143,9 @@ do-install:
 .endfor
 
 .if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix
-	@cd ${WRKSRC} && ${INSTALL_DATA} LDAP_README MYSQL_README ${PREFIX}/share/doc/postfix
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix/html
-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${PREFIX}/share/doc/postfix/html && \
-		${ECHO_MSG} "Installed documentation in ${PREFIX}/share/doc/postfix"
+	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
+	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
+		${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
 .endif
 
 	@${ECHO_MSG} '--------------------------------------------------'
@@ -160,6 +156,9 @@ do-install:
 post-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
+post-clean:
+	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
 .include <bsd.port.pre.mk>
 
 replace:
@@ -170,10 +169,10 @@ replace:
 	${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
 	${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
 	${ECHO} "#" >> /etc/mail/mailer.conf
-	${ECHO} "sendmail	${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
-	${ECHO} "send-mail	${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
-	${ECHO} "mailq		${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
-	${ECHO} "newaliases	${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
+	${ECHO} "sendmail	${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+	${ECHO} "send-mail	${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+	${ECHO} "mailq		${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+	${ECHO} "newaliases	${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
 .else
 	@${ECHO_MSG} "===> Replacing sendmail"
 	@if [ -e /usr/sbin/sendmail ]; then \