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

--- pkgsrc/mail/postfix/Makefile	2002/01/31 21:20:34	1.53
+++ pkgsrc/mail/postfix/Makefile	2006/10/19 06:37:04	1.194
@@ -1,98 +1,160 @@
-# $NetBSD: Makefile,v 1.53 2002/01/31 21:20:34 jlam Exp $
+# $NetBSD: Makefile,v 1.194 2006/10/19 06:37:04 martti Exp $
 
-DISTNAME=	postfix-20010228-pl08
-PKGNAME=	postfix-20010228pl8
+DISTNAME=	postfix-2.3.3
+#PKGREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	ftp://postfix.cloud9.net/official/
-
-PATCHFILES=	postfix-20010228release-ercpt.diff
-PATCH_SITES=	ftp://ftp.gw.com/pub/people/kim/patches/
-PATCH_DIST_STRIP+=	-p1
+MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
+DIST_SUBDIR=	postfix
 
-MAINTAINER=	packages@netbsd.org
+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]*
 
-POSTFIX_SPOOL=	/var/spool/postfix
-
-.include "../../mk/bsd.prefs.mk"
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-.if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
-PATCHFILES+=	postfix-20010228pl04-v6-20010809a.diff.gz
-PATCH_SITES+=	ftp://ftp.kame.net/pub/kame/misc/
-BUILD_DEFS+=	POSTFIX_USE_INET6
-.endif
+USE_TOOLS+=	perl
 
-.if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES" \
-	|| defined(USE_SASL) && ${USE_SASL} == "YES"
-CCARGS=		-I${LOCALBASE}/include
-AUXLIBS=	-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
-MAKE_ENV+=	AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
-.endif
+.include "../../mk/bsd.prefs.mk"
 
-.if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES"
-DEPENDS+=	pcre>=2.08:../../devel/pcre
-CCARGS+=	-DHAS_PCRE
-AUXLIBS+=	-lpcre
-BUILD_DEFS+=	POSTFIX_USE_PCRE
+# POSTFIX_QUEUE_DIR is the default queue directory for Postfix.  This is
+# merely a default, and may be changed by setting "queue_directory" in
+# ${PKG_SYSCONFDIR}/main.cf.
+#
+POSTFIX_QUEUE_DIR?=	${VARBASE}/spool/postfix
+BUILD_DEFS+=		VARBASE
+
+# CCARGS is a list of options to pass to the preprocessor/compiler.
+# AUXLIBS is a list of options to pass to the linker.
+#
+CCARGS=		# empty
+AUXLIBS=	${LDFLAGS}
+FIX_RPATH+=	AUXLIBS
+
+# Set some default paths to override ${WRKSRC}/src/global/mail_params.h.
+CCARGS+=	-DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\"
+CCARGS+=	-DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
+CCARGS+=	-DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
+CCARGS+=	-DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\"
+CCARGS+=	-DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
+CCARGS+=	-DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
+CCARGS+=	-DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\"
+CCARGS+=	-DDEF_MANPAGE_DIR=\"${PREFIX}/man\"
+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
+SUBST_FILES.postfix=	conf/main.cf src/global/mail_params.h
+SUBST_SED.postfix=	\
+	-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.
+#
+.include "options.mk"
+
+PKG_SYSCONFSUBDIR=	postfix
+LIBEXECDIR=		${PREFIX}/libexec/postfix
+DOCDIR=			${PREFIX}/share/doc/postfix
+EXAMPLEDIR=		${PREFIX}/share/examples/postfix
+
+FILES_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR:Q}
+MESSAGE_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR}
+MESSAGE_SUBST+=		DOCDIR=${DOCDIR}
+
+MESSAGE_SRC+=		${PKGDIR}/MESSAGE
+.if exists(${PKGDIR}/MESSAGE.${OPSYS})
+MESSAGE_SRC+=		${PKGDIR}/MESSAGE.${OPSYS}
 .endif
+PLIST_SRC+=		${PKGDIR}/PLIST
 
-.if defined(USE_SASL) && ${USE_SASL} == "YES"
-DEPENDS+=	cyrus-sasl:../../security/cyrus-sasl
-CCARGS+=	-DUSE_SASL_AUTH
-AUXLIBS+=	-lsasl
-PLIST_SRC+=	${WRKDIR}/PLIST.sasl
-MESSAGE_SRC+=	${PKGDIR}/MESSAGE.sasl
-MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-BUILD_DEFS+=	USE_SASL
+BUILD_TARGET=		# empty
+MAKE_ENV+=		CC=${CC:Q} OPT=${CFLAGS:Q}
+MAKE_ENV+=		AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
+
+RCD_SCRIPTS=		postfix
+OWN_DIRS+=		${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
+MAKE_DIRS+=		${PKG_SYSCONFDIR}
+
+PKG_GROUPS?=		postfix maildrop
+PKG_USERS?=		postfix:postfix
+PKG_GECOS.postfix=	Postfix User
+PKG_HOME.postfix=	${POSTFIX_QUEUE_DIR}
+
+CONF_FILES=		# empty
+.for i in main.cf master.cf postfix-files
+CONF_FILES+=		${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i}
+.endfor
+CONF_FILES_PERMS=	# empty
+.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)
+MAKE_DIRS+=		${SASLLIBDIR}
+CONF_FILES+=		${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
 .endif
 
-PLIST_SRC+=	${PKGDIR}/PLIST
-ALL_TARGET=	#empty
+MAKE_ENV+=		DEBUG= # empty
 
-pre-configure:
-	${CP} ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.dist
-	${CP} ${WRKSRC}/src/util/sys_defs.h ${WRKSRC}/src/util/sys_defs.h.dist
-	${CP} ${WRKSRC}/INSTALL.sh ${WRKSRC}/INSTALL.sh.dist
-	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
-	    < ${WRKSRC}/conf/main.cf.dist \
-	    > ${WRKSRC}/conf/main.cf
-	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
-	    < ${WRKSRC}/src/util/sys_defs.h.dist \
-	    > ${WRKSRC}/src/util/sys_defs.h
-	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
-	    < ${WRKSRC}/INSTALL.sh.dist \
-	    > ${WRKSRC}/INSTALL.sh
+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
+	rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
 
 do-configure:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} makefiles)
+	cd ${WRKSRC} &&							\
+	env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles		\
+		'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'
 
 post-build:
-	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
-	    <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix
-
-pre-install:
-	${INSTALL_DATA_DIR} /etc/postfix ${PREFIX}/share/postfix \
-	    ${PREFIX}/share/doc/postfix ${PREFIX}/libexec/postfix
-	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
-	${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
-	-${RM} -f ${WRKSRC}/conf/*.orig
-.if defined(USE_SASL) && ${USE_SASL} == "YES"
-	echo "pwcheck_method: sasldb" > ${WRKDIR}/smtpd.conf
-	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${PREFIX}/lib/sasl
-	echo lib/sasl/smtpd.conf > ${WRKDIR}/PLIST.sasl
+.if !empty(PKG_OPTIONS:Msasl)
+	${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
 .endif
 
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${PREFIX}/etc
-	${LN} -sf ${PREFIX}/share/postfix/postfix-script /etc/postfix
-	${INSTALL_DATA_DIR} ${POSTFIX_SPOOL}
-	${CHMOD} 755 ${POSTFIX_SPOOL}
-	${TEST} -f /etc/postfix/main.cf || \
-		${INSTALL_DATA} ${PREFIX}/share/postfix/main.cf /etc/postfix
-	${TEST} -f /etc/postfix/master.cf || \
-		${INSTALL_DATA} ${PREFIX}/share/postfix/master.cf /etc/postfix
+do-install:
+	${INSTALL_DATA_DIR} ${LIBEXECDIR}
+	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	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		\
+		config_directory="${EXAMPLEDIR}"
+	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
+		${PREFIX}/sbin/qshape
 
 .include "../../mk/bsd.pkg.mk"