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

--- pkgsrc/mail/postfix/Makefile	2005/11/21 23:24:30	1.167.2.1
+++ pkgsrc/mail/postfix/Makefile	2006/10/16 09:54:49	1.188
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.167.2.1 2005/11/21 23:24:30 salo Exp $
+# $NetBSD: Makefile,v 1.188 2006/10/16 09:54:49 martti Exp $
 
-DISTNAME=	postfix-2.2.5
-PKGREVISION=	1
+DISTNAME=	postfix-2.3.3
+#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+=	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 +43,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 +72,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 +83,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: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 +104,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 +111,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
@@ -124,7 +133,7 @@ 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
@@ -133,5 +142,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"