Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/mail/postfix/Makefile	2006/05/01 02:57:03	1.181
+++ pkgsrc/mail/postfix/Makefile	2006/11/10 08:08:55	1.196
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.181 2006/05/01 02:57:03 jlam Exp $
+# $NetBSD: Makefile,v 1.196 2006/11/10 08:08:55 rillig Exp $
 
-DISTNAME=	postfix-2.2.10
+DISTNAME=	postfix-2.3.4
 #PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
+DIST_SUBDIR=	postfix
 
 MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.postfix.org/
 COMMENT=	Postfix SMTP server and tools
 
-DIST_SUBDIR=	postfix
-
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=	perl
+CHECK_HEADERS_SKIP+=	src/global/mail_params.h
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,6 +24,7 @@ USE_TOOLS+=	perl
 # ${PKG_SYSCONFDIR}/main.cf.
 #
 POSTFIX_QUEUE_DIR?=	${VARBASE}/spool/postfix
+BUILD_DEFS+=		VARBASE POSTFIX_QUEUE_DIR
 
 # CCARGS is a list of options to pass to the preprocessor/compiler.
 # AUXLIBS is a list of options to pass to the linker.
@@ -51,17 +52,27 @@ SUBST_CLASSES+=		postfix
 SUBST_STAGE.postfix=	post-configure
 SUBST_FILES.postfix=	conf/main.cf src/global/mail_params.h
 SUBST_SED.postfix=	\
-	-e "s|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|"	\
-	-e "s|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|"		\
-	-e "s|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|"		\
-	-e "s|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|"	\
-	-e "s|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|"	\
-	-e "s|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|"		\
-	-e "s|^\(setgid_group\) =.*|\1 = maildrop|"			\
-	-e "s|^\(manpage_directory\) =.*|\1 = ${PREFIX}/man|"		\
-	-e "s|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|"		\
-	-e "s|^\(readme_directory\) =.*|\1 = ${DOCDIR}|"		\
-	-e "/^\#define DEF_SGID_GROUP[ 	]/s,postdrop,maildrop,g"
+	-e 's|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(setgid_group\) =.*|\1 = maildrop|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(manpage_directory\) =.*|\1 = ${PREFIX}/man|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(readme_directory\) =.*|\1 = ${DOCDIR}|'
+SUBST_SED.postfix+=	\
+	-e '/^\#define DEF_SGID_GROUP[ 	]/s,postdrop,maildrop,g'
 
 # options.mk appends to CCARGS and AUXLIBS the options needed to build
 # Postfix with support for various add-on modules.
@@ -84,7 +95,7 @@ MESSAGE_SRC+=		${PKGDIR}/MESSAGE.${OPSYS
 PLIST_SRC+=		${PKGDIR}/PLIST
 
 BUILD_TARGET=		# empty
-MAKE_ENV+=		CC=${CC:Q} OPT=${CFLAGS:M*:Q}
+MAKE_ENV+=		CC=${CC:Q} OPT=${CFLAGS:Q}
 MAKE_ENV+=		AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
 
 RCD_SCRIPTS=		postfix
@@ -97,12 +108,12 @@ PKG_GECOS.postfix=	Postfix User
 PKG_HOME.postfix=	${POSTFIX_QUEUE_DIR}
 
 CONF_FILES=		# empty
-.for _file_ in main.cf master.cf postfix-files
-CONF_FILES+=		${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_}
+.for i in main.cf master.cf postfix-files
+CONF_FILES+=		${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i}
 .endfor
 CONF_FILES_PERMS=	# empty
-.for _file_ in post-install postfix-script
-CONF_FILES_PERMS+=	${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
+.for i in post-install postfix-script
+CONF_FILES_PERMS+=	${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} \
 			${ROOT_USER} ${ROOT_GROUP} 755
 .endfor
 .if !empty(PKG_OPTIONS:Msasl)
@@ -118,11 +129,12 @@ SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFI
 SUBST_STAGE.paths=	post-patch
 
 post-extract:
-	${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
+	cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
+	rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
 
 do-configure:
 	cd ${WRKSRC} &&							\
-	${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles	\
+	env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles		\
 		'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'
 
 post-build:
@@ -134,14 +146,14 @@ do-install:
 	${INSTALL_DATA_DIR} ${LIBEXECDIR}
 	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	-${RM} -f ${WRKSRC}/conf/*.orig
+	rm -f ${WRKSRC}/conf/*.orig
 .if !empty(PKG_OPTIONS:Msasl)
 	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR}
 .endif
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf
-	cd ${WRKSRC}; ${SH} ./postfix-install -non-interactive		\
+	cd ${WRKSRC}; sh ./postfix-install -non-interactive		\
 		config_directory="${EXAMPLEDIR}"
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
 		${PREFIX}/sbin/qshape