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

--- pkgsrc/mail/postfix/Makefile	2005/04/04 18:13:32	1.160
+++ pkgsrc/mail/postfix/Makefile	2006/05/01 02:57:03	1.181
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.160 2005/04/04 18:13:32 martti Exp $
+# $NetBSD: Makefile,v 1.181 2006/05/01 02:57:03 jlam Exp $
 
-DISTNAME=	postfix-2.2.2
+DISTNAME=	postfix-2.2.10
+#PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
@@ -10,10 +11,11 @@ COMMENT=	Postfix SMTP server and tools
 
 DIST_SUBDIR=	postfix
 
-CONFLICTS+=	sendmail-[0-9]* fastforward>=0.51nb2
+CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-USE_BUILDLINK3=		yes
+
+USE_TOOLS+=	perl
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -27,7 +29,7 @@ POSTFIX_QUEUE_DIR?=	${VARBASE}/spool/pos
 # AUXLIBS is a list of options to pass to the linker.
 #
 CCARGS=		# empty
-AUXLIBS=	# empty
+AUXLIBS=	${LDFLAGS}
 FIX_RPATH+=	AUXLIBS
 
 # Set some default paths to override ${WRKSRC}/src/global/mail_params.h.
@@ -42,6 +44,8 @@ CCARGS+=	-DDEF_MANPAGE_DIR=\"${PREFIX}/m
 CCARGS+=	-DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\"
 CCARGS+=	-DDEF_README_DIR=\"${DOCDIR}\"
 
+REPLACE_PERL+=	auxiliary/qshape/qshape.pl
+
 # Override those same default paths in the installed example main.cf.
 SUBST_CLASSES+=		postfix
 SUBST_STAGE.postfix=	post-configure
@@ -69,7 +73,7 @@ LIBEXECDIR=		${PREFIX}/libexec/postfix
 DOCDIR=			${PREFIX}/share/doc/postfix
 EXAMPLEDIR=		${PREFIX}/share/examples/postfix
 
-FILES_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR}
+FILES_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR:Q}
 MESSAGE_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR}
 MESSAGE_SUBST+=		DOCDIR=${DOCDIR}
 
@@ -80,16 +84,17 @@ MESSAGE_SRC+=		${PKGDIR}/MESSAGE.${OPSYS
 PLIST_SRC+=		${PKGDIR}/PLIST
 
 BUILD_TARGET=		# empty
-MAKE_ENV=		CC="${CC}" OPT="${CFLAGS}"
-MAKE_ENV+=		AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
+MAKE_ENV+=		CC=${CC:Q} OPT=${CFLAGS:M*:Q}
+MAKE_ENV+=		AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
 
-USE_PKGINSTALL=		yes
 RCD_SCRIPTS=		postfix
-OWN_DIRS+=		${POSTFIX_QUEUE_DIR}
+OWN_DIRS+=		${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
 
 PKG_GROUPS?=		postfix maildrop
-PKG_USERS?=		postfix:postfix::Postfix\\ User:${POSTFIX_QUEUE_DIR}
+PKG_USERS?=		postfix:postfix
+PKG_GECOS.postfix=	Postfix User
+PKG_HOME.postfix=	${POSTFIX_QUEUE_DIR}
 
 CONF_FILES=		# empty
 .for _file_ in main.cf master.cf postfix-files
@@ -100,7 +105,6 @@ CONF_FILES_PERMS=	# empty
 CONF_FILES_PERMS+=	${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
 			${ROOT_USER} ${ROOT_GROUP} 755
 .endfor
-.undef _file_
 .if !empty(PKG_OPTIONS:Msasl)
 MAKE_DIRS+=		${SASLLIBDIR}
 CONF_FILES+=		${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
@@ -108,14 +112,20 @@ CONF_FILES+=		${EXAMPLEDIR}/smtpd.conf $
 
 MAKE_ENV+=		DEBUG= # empty
 
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	${WRKDIR}/mailer.conf
+SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_STAGE.paths=	post-patch
+
+post-extract:
+	${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
+
 do-configure:
 	cd ${WRKSRC} &&							\
 	${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles	\
 		'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'
 
 post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/mailer.conf		\
-		> ${WRKDIR}/mailer.conf
 .if !empty(PKG_OPTIONS:Msasl)
 	${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
 .endif
@@ -128,13 +138,12 @@ do-install:
 .if !empty(PKG_OPTIONS:Msasl)
 	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR}
 .endif
-	@for i in ${POSTFIX_EXAMPLE_FILES}; do				\
-		${INSTALL_DATA} ${WRKSRC}/conf/$$i ${EXAMPLEDIR}/$$i;	\
-	done
 	${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		\
 		config_directory="${EXAMPLEDIR}"
+	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
+		${PREFIX}/sbin/qshape
 
 .include "../../mk/bsd.pkg.mk"