5 files changed, 141 insertions, 246 deletions

diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index 55245b7b9bee..f242dfa6eeee 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -5,15 +5,9 @@
 # $FreeBSD$
 #
 
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
-#
-# the options are the same names as in the scripts/configure.postfix file
-
 PORTNAME=	postfix
 PORTVERSION=	1.1.13
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -26,18 +20,29 @@ MASTER_SITE_SUBDIR=	. old related/postfix
 DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	An alternative to widely-used Sendmail
 
-BROKEN=		Needs to be converted to OPTIONS instead of home-brewed configure script
-
 CONFLICTS=	courier-0.* postfix-2.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-LATEST_LINK=	postfix1
+
+LATEST_LINK=	${PORTNAME}1
 USE_SUBMAKE=	yes
 USE_RC_SUBR=	postfix.sh
 
 PATCH_STRIP=	-p1
 
+OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
+		SASL		"Cyrus SASLv1 (Simple Auth. and Sec. Layer)"		off \
+		TLS		"Enable SSL and TLS support"				off \
+		DB3		"Berkeley DB3 (required if SASL built with DB3)"	off \
+		MYSQL		"MySQL maps lookups"					off \
+		PGSQL		"PostgreSQL maps lookups"				off \
+		OPENLDAP	"OpenLDAP maps lookups (BROKEN)"			off \
+		IPV6		"IPv6 support (not KAME official)"			off \
+		TEST		"SMTP/LMTP test server and generator"			off
+
 MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
 	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
 	postsuper.1 sendmail.1
@@ -49,10 +54,6 @@ MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
 	master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \
 	smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
 
-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
-# patch it.
-MAN8base=$(MAN8:S/tlsmgr.8//)
-
 CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
 	relocated transport virtual
 
@@ -60,34 +61,116 @@ CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
 MAKEFILEFLAGS+=	DEBUG=
 .endif
 
-MAKEFILEFLAGS+=	OPT="${CFLAGS}"
+MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
 
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
+SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" TOUCH="${TOUCH}" \
+		MKDIR="${MKDIR}" POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
 
 .include <bsd.port.pre.mk>
 
-# Default requirement for postfix rcNG
+# Default requirement for postfix rc.d script
 _REQUIRE=	DAEMON
 
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
+.if !defined(WITHOUT_PCRE)
+LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
+POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
+POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
+.else
+POSTFIX_CCARGS+=	-DNO_PCRE
+.endif
+
+.if defined(WITH_SASL)
+LIB_DEPENDS+=		sasl.8:${PORTSDIR}/security/cyrus-sasl
+POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I${LOCALBASE}/include
+POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl -lpam -lcrypt
+.endif
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.if defined(WITH_TLS)
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+MAN8+=			tlsmgr.8
+POSTFIX_CCARGS+=	-DHAS_SSL -I${OPENSSLINC}
+POSTFIX_AUXLIBS+=	-L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
+DISTFILES+=		${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz
+EXTRA_PATCHES+=		${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff
+PLIST_SUB+=		SUB_TLS=""
+.else
+PLIST_SUB+=		SUB_TLS="@comment "
+.endif
+
+.if defined(WITH_DB3)
+LIB_DEPENDS+=		db3.3:${PORTSDIR}/databases/db3
+POSTFIX_CCARGS+=	-I${LOCALBASE}/include/db3
+POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -ldb3
+.endif
+
+.if defined(WITH_MYSQL)
+USE_MYSQL=		yes
+POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
+POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lcrypt -lm
+_REQUIRE+=		mysql
+.endif
+
+.if defined(WITH_PGSQL)
+USE_PGSQL=		yes
+POSTFIX_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
+POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
+PATCH_SITES+=		http://mat.cc/postfix/
+PATCHFILES+=		postfix-pg.postfix-1.1.8.patch
+_REQUIRE+=		postgresql
+.endif
+
+.if defined(WITH_OPENLDAP)
+BROKEN=			does not support OPENLDAP
+USE_OPENLDAP=		yes
+.if defined(WITH_OPENLDAP_VER)
+USE_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
+.endif
+POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
+POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lldap -llber
+_REQUIRE+=		slapd
+.endif
+
+.if defined(WITH_IPV6)
+.if ${ARCH} != i386
+BROKEN=			only supported in i386
+.endif
+.if defined(WITH_TLS)
+BROKEN=			IPv6 and TLS patch cannot be used simultaneously
+.endif
+PATCH_SITES+=		http://www.uinet.or.jp/~taka/misc/
+PATCHFILES+=		postfix-1.1.11+ipv6.patch.gz
+.endif
+
+.if defined(WITH_TEST)
+BIN1=			smtp-sink smtp-source
+PLIST_SUB+=		SUB_TEST=""
+.else
+BIN1=			# empty
+PLIST_SUB+=		SUB_TEST="@comment "
 .endif
 
 .if defined(NOPORTDOCS)
-READMEDIR=no
+READMEDIR=		no
 .else
-READMEDIR=${PREFIX}/share/doc/postfix
+READMEDIR=		${PREFIX}/share/doc/postfix
 .endif
 
-SUB_LIST+=	REQUIRE="${_REQUIRE}"
+SUB_LIST+=		REQUIRE="${_REQUIRE}"
 
 pre-patch:
+.if defined(POSTFIX_OPTIONS)
+		@${ECHO_MSG}
+		@${ECHO_MSG}
+		@${ECHO_MSG}
+		@${ECHO_MSG} "***** ALERT *****"
+		@${ECHO_MSG} "POSTFIX_OPTIONS don't work anymore, now"
+		@${ECHO_MSG} "${PORTNAME} use OPTIONS, consider use:"
+		@${ECHO_MSG} "# make config"
+		@${ECHO_MSG}
+		@${ECHO_MSG}
+		@${ECHO_MSG}
+		@sleep 10
+.endif
 .for f in ${MAN1}
 	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
 		${WRKSRC}/man/man1/${f} ${WRKSRC}/html/${f}.html
@@ -115,59 +198,49 @@ post-patch:
 
 do-configure:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO_CMD} "all: default" >> Makefile)
+		CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
+		${ECHO_CMD} "all: default" >> Makefile)
 
 pre-install:
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	 config_directory=${PREFIX}/etc/postfix \
-	 daemon_directory=${PREFIX}/libexec/postfix \
-	 command_directory=${PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PREFIX}/sbin/sendmail \
-	 newaliases_path=${PREFIX}/bin/newaliases \
-	 mailq_path=${PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PREFIX}/man \
-	 sample_directory=${PREFIX}/etc/postfix \
-	 readme_directory=${READMEDIR}
+	(cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
+		config_directory=${PREFIX}/etc/postfix \
+		daemon_directory=${PREFIX}/libexec/postfix \
+		command_directory=${PREFIX}/sbin \
+		queue_directory=/var/spool/postfix \
+		sendmail_path=${PREFIX}/sbin/sendmail \
+		newaliases_path=${PREFIX}/bin/newaliases \
+		mailq_path=${PREFIX}/bin/mailq \
+		mail_owner=postfix \
+		setgid_group=maildrop \
+		manpage_directory=${PREFIX}/man \
+		sample_directory=${PREFIX}/etc/postfix \
+		readme_directory=${READMEDIR} )
 
 .for f in ${CONF1}
-	${INSTALL_DATA} ${WRKSRC}/conf/${f} \
-		${PREFIX}/etc/postfix/sample-${f}
+	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/sample-${f}
 .endfor
 
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/auxiliary/rmail/rmail \
-		${PREFIX}/bin/rmail
+	@${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
 
 # optional TEST binaries
 .for f in ${BIN1}
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/src/smtpstone/${f} \
-		${PREFIX}/sbin
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/smtpstone/${f} ${PREFIX}/sbin
 .endfor
 
 .if !defined(NOPORTDOCS)
 	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
-		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
+	@(cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
+		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" )
 .endif
 
 post-install:
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them after this step, and
-# if we run etc/postfix/post-install again during package installation,
-# it will complain about missing files.
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list
+	@# Fix compressed man pages
+	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
+	@${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
 	@${CAT} ${PKGMESSAGE}
 
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
 .include <bsd.port.post.mk>
diff --git a/mail/postfix1/files/postfix.sh.in b/mail/postfix1/files/postfix.sh.in
index c44c1d84b050..e6df5f7506ef 100644
--- a/mail/postfix1/files/postfix.sh.in
+++ b/mail/postfix1/files/postfix.sh.in
@@ -19,13 +19,7 @@
 . %%RC_SUBR%%
 
 name="postfix"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${postfix_enable="NO"}
-: ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
-: ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
+rcvar=${name}_enable
 
 start_cmd=${name}_start
 stop_cmd=${name}_stop
@@ -42,4 +36,10 @@ postfix_stop() {
 	%%PREFIX%%/sbin/postfix stop
 }
 
+load_rc_config $name
+
+: ${postfix_enable="NO"}
+: ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
+: ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
+
 run_rc_command "$1"
diff --git a/mail/postfix1/pkg-message b/mail/postfix1/pkg-message
index 7e16c6748239..b2ee82ee4e9d 100644
--- a/mail/postfix1/pkg-message
+++ b/mail/postfix1/pkg-message
@@ -1,4 +1,4 @@
-To enable postfix rcNG startup script please add postfix_enable="YES" in
+To enable postfix rc.d startup script please add postfix_enable="YES" in
 your rc.conf
 
 If you not need sendmail anymore, please add in your rc.conf:
diff --git a/mail/postfix1/scripts/configure.postfix b/mail/postfix1/scripts/configure.postfix
deleted file mode 100644
index dd6434ce5f26..000000000000
--- a/mail/postfix1/scripts/configure.postfix
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.44 2006-01-24 20:11:07 mnag Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-else
-	set PCRE
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-MySQL		"MySQL map lookups" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \
-IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TLS="@comment "
-SUB_TEST="@comment "
-
-for i; do
-	case $i in
-		PCRE)
-			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
-			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lpcre"
-			echo "PCRE_SUFFIX=	+pcre"
-			SUB_PCRE=""
-			;;
-		SASL)
-			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl"
-			if [ -f ${PREFIX}/lib/libsasl.a ]; then 
-				if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
-					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			fi
-			echo ".if exists(/usr/lib/libkrb.a)"
-			echo "POSTFIX_AUXLIBS+=	-lkrb -ldes -lcom_err"
-			echo ".endif"
-			SUB_SASL=""
-			;;
-		TLS)
-			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff"
-			echo "TLS_SUFFIX=	+tls"
-			SUB_TLS=""
-			;;
-		DB3)
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB3_SUFFIX=	+db3"
-			;;
-		MySQL)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			echo "MYSQL_SUFFIX=	+mysql"
-			echo "_REQUIRE+=	mysql"
-			;;
-		PgSQL)
-			echo "USE_PGSQL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
-			echo "PATCH_DIST_STRIP= -p1"
-			echo "_REQUIRE+=	postgresql"
-			;;
-		OpenLDAP)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap"
-			echo "_REQUIRE+=	slapd"
-			;;
-		Test)
-			echo "BIN1=		smtp-sink smtp-source"
-			SUB_TEST=""
-			;;
-		IPv6)
-			if [ `uname -m` != "i386" ]; then
-				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			if [ -z $SUB_TLS ]; then
-				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "PATCH_SITES+=	http://www.uinet.or.jp/~taka/misc/"
-			echo "PATCHFILES+=	postfix-1.1.11+ipv6.patch.gz"
-			echo "PATCH_DIST_STRIP= -p1"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			;;
-	        "")
-			;;
-		*)
-			echo "Invalid option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-done
-
-echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will.  so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"
diff --git a/mail/postfix1/scripts/fix-files-list b/mail/postfix1/scripts/fix-files-list
deleted file mode 100644
index cc4a1083a814..000000000000
--- a/mail/postfix1/scripts/fix-files-list
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them later, and if we
-# run post-install it will complain about missing files
-# (script from Simon J. Mudd)
-
-ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1
-%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/
-w
-q
-EOF