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

--- pkgsrc/mail/postfix/Makefile	2006/01/10 06:38:14	1.175
+++ pkgsrc/mail/postfix/Makefile	2006/05/01 02:57:03	1.181
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.175 2006/01/10 06:38:14 martti Exp $
+# $NetBSD: Makefile,v 1.181 2006/05/01 02:57:03 jlam Exp $
 
-DISTNAME=	postfix-2.2.8
+DISTNAME=	postfix-2.2.10
 #PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
@@ -11,10 +11,12 @@ 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_TOOLS+=	perl
+
 .include "../../mk/bsd.prefs.mk"
 
 # POSTFIX_QUEUE_DIR is the default queue directory for Postfix.  This is
@@ -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
@@ -88,7 +92,9 @@ OWN_DIRS+=		${POSTFIX_QUEUE_DIR} ${POSTF
 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
@@ -106,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
@@ -131,5 +143,7 @@ do-install:
 	${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"