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

--- pkgsrc/mail/postfix/Makefile	2002/07/03 11:11:12	1.66
+++ pkgsrc/mail/postfix/Makefile	2003/04/21 06:25:50	1.92
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2002/07/03 11:11:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.92 2003/04/21 06:25:50 martti Exp $
 
-DISTNAME=	postfix-1.1.11
-PKGREVISION=	1
+DISTNAME=	postfix-2.0.9
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
@@ -13,125 +12,167 @@ DIST_SUBDIR=	postfix
 
 POSTFIX_SPOOL=	/var/spool/postfix
 
+USE_BUILDLINK2=	yes
+USE_PKGINSTALL=	yes
+
+PKG_SYSCONFSUBDIR=	postfix
+
+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_COMMAND_DIR=\"${PREFIX}/sbin\"
+CCARGS+=	-DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
+
 .include "../../mk/bsd.prefs.mk"
 
-# XXX No IPv6 patch available yet!
+FIX_RPATH+=	AUXLIBS
+
+#.if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
+#PATCHFILES+=		tls+ipv6-1.13-pf-2.0.7.patch.gz
+#PATCH_SITES+=		ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/
+#PATCH_DIST_STRIP=	-p1
+#BUILD_DEFS+=		POSTFIX_USE_INET6
 #
-# .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
-
-.if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES" \
-	|| defined(USE_SASL) && ${USE_SASL} == "YES" \
-	|| defined(POSTFIX_USE_MYSQL) && ${POSTFIX_USE_MYSQL} == "YES"
-CCARGS=		-I${LOCALBASE}/include
-AUXLIBS=	-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
-MAKE_ENV+=	AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
-.endif
+#CCARGS+=		-DHAS_SSL
+#AUXLIBS+=		-L${BUILDLINK_PREFIX.openssl}/lib	\
+#			-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
+#			-lssl -lcrypto
+#BUILD_DEFS+=		POSTFIX_USE_TLS
+#
+#PLIST_SRC+=		${PKGDIR}/PLIST.tls
+#MESSAGE_SRC+=		${PKGDIR}/MESSAGE.tls
+#.endif
 
 .if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES"
-DEPENDS+=	pcre>=2.08:../../devel/pcre
+.include "../../devel/pcre/buildlink2.mk"
 CCARGS+=	-DHAS_PCRE
-AUXLIBS+=	-lpcre
+AUXLIBS+=	-L${BUILDLINK_PREFIX.pcre}/lib		\
+		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib	\
+		-lpcre
 BUILD_DEFS+=	POSTFIX_USE_PCRE
+.else
+CCARGS+=	-DNO_PCRE
+.endif
+
+.if defined(POSTFIX_USE_LDAP) && ${POSTFIX_USE_LDAP} == "YES"
+.include "../../databases/openldap/buildlink2.mk"
+CCARGS+=	-DHAS_LDAP
+AUXLIBS+=	-L${BUILDLINK_PREFIX.openldap}/lib	\
+		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib	\
+		-lldap -llber
+BUILD_DEFS+=	POSTFIX_USE_LDAP
 .endif
 
 .if defined(POSTFIX_USE_MYSQL) && ${POSTFIX_USE_MYSQL} == "YES"
-DEPENDS+=	mysql-client>=3.23:../../databases/mysql-client
-CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
-AUXLIBS+=	-L${LOCALBASE}/lib/mysql -Wl,-R${LOCALBASE}/lib/mysql
-AUXLIBS+=	-lmysqlclient -lz -lm
+.include "../../databases/mysql-client/buildlink2.mk"
+CCARGS+=	-DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
+AUXLIBS+=	-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql		\
+		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql	\
+		-lmysqlclient -lz -lm
 BUILD_DEFS+=	POSTFIX_USE_MYSQL
 .endif
 
+#.if defined(POSTFIX_USE_TLS) && ${POSTFIX_USE_TLS} == "YES"
+#.include "../../security/openssl/buildlink2.mk"
+#PATCH_SITES+=	http://people.arhea.net/dawszy/NetBSD/postfix_tls/
+#PATCHFILES+=	pfixtls-1.1.11.diff.gz
+#PATCH_DIST_STRIP=	-p1
+#
+#CCARGS+=	-DHAS_SSL
+#AUXLIBS+=	-L${BUILDLINK_PREFIX.openssl}/lib	\
+#		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib	\
+#		-lssl -lcrypto
+#BUILD_DEFS+=	POSTFIX_USE_TLS
+#
+#PLIST_SRC+=	${PKGDIR}/PLIST.tls
+#MESSAGE_SRC+=	${PKGDIR}/MESSAGE.tls
+#.endif
+
 .if defined(USE_SASL) && ${USE_SASL} == "YES"
-DEPENDS+=	cyrus-sasl:../../security/cyrus-sasl
+.include "../../security/cyrus-sasl/buildlink2.mk"
 CCARGS+=	-DUSE_SASL_AUTH
-AUXLIBS+=	-lsasl
+AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib		\
+		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
+		-lsasl
+BUILD_DEFS+=	USE_SASL
+
 PLIST_SRC+=	${WRKDIR}/PLIST.sasl
 MESSAGE_SRC+=	${PKGDIR}/MESSAGE.sasl
 MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-BUILD_DEFS+=	USE_SASL
 .endif
 
+MESSAGE_SRC+=	${PKGDIR}/MESSAGE
 PLIST_SRC+=	${PKGDIR}/PLIST
 ALL_TARGET=	#empty
 MAKE_ENV=	CC="${CC}" OPT="${CFLAGS}"
+MAKE_ENV+=	AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
+
+POSTFIX_CONF_FILES=	conf/main.cf src/util/sys_defs.h postfix-install
+POSTFIX_CONF_FILES+=	conf/sample-misc.cf src/global/mail_params.h
+
+PLIST_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+PLIST_SUBST+=	POSTFIX_SPOOL=${POSTFIX_SPOOL}
+
+PKG_GROUPS?=	postfix maildrop
+PKG_USERS?=	postfix:postfix::Postfix\\ User:${POSTFIX_SPOOL}
+
+LIBEXECDIR=	${PREFIX}/libexec/${PKGBASE}
+SHAREDIR=	${PREFIX}/share/${PKGBASE}
+
+CONF_FILES+=	${SHAREDIR}/main.cf ${PKG_SYSCONFDIR}/main.cf
+CONF_FILES+=	${SHAREDIR}/master.cf ${PKG_SYSCONFDIR}/master.cf
 
 pre-configure:
-	${CP} ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.dist
-	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
-	    < ${WRKSRC}/conf/main.cf.dist \
-	    > ${WRKSRC}/conf/main.cf
-	${CP} ${WRKSRC}/src/util/sys_defs.h ${WRKSRC}/src/util/sys_defs.h.dist
-	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
-	    < ${WRKSRC}/src/util/sys_defs.h.dist \
-	    > ${WRKSRC}/src/util/sys_defs.h
-	${CP} ${WRKSRC}/postfix-install ${WRKSRC}/postfix-install.dist
-	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
-	    < ${WRKSRC}/postfix-install.dist \
-	    > ${WRKSRC}/postfix-install
-	${CP} ${WRKSRC}/conf/sample-misc.cf ${WRKSRC}/conf/sample-misc.cf.dist
-	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
-	    < ${WRKSRC}/conf/sample-misc.cf.dist \
-	    > ${WRKSRC}/conf/sample-misc.cf
-	${CP} ${WRKSRC}/src/global/mail_params.h \
-		${WRKSRC}/src/global/mail_params.h.dist
-	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
-	    < ${WRKSRC}/src/global/mail_params.h.dist \
-	    > ${WRKSRC}/src/global/mail_params.h
+	@for i in ${POSTFIX_CONF_FILES}; do				\
+		${CP} ${WRKSRC}/$${i} ${WRKSRC}/$${i}.dist;		\
+		${SED} -e 's|__PREFIX|'${PREFIX}'|g'			\
+			-e 's|__PKG_SYSCONFDIR|'${PKG_SYSCONFDIR}'|g'	\
+			< ${WRKSRC}/$${i}.dist				\
+			> ${WRKSRC}/$${i};				\
+	done
 
 do-configure:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
-	'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}' )
+	(cd ${WRKSRC} && \
+	${SETENV} ${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
-	${INSTALL_DATA_DIR} ${PREFIX}/share/postfix
+	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
+	${INSTALL_DATA_DIR} ${SHAREDIR}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/postfix
-	${INSTALL_DATA_DIR} ${PREFIX}/libexec/postfix
-	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/share/postfix \
-	    ${PREFIX}/libexec/postfix
-	${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
+	${INSTALL_DATA_DIR} ${LIBEXECDIR}
+	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${SHAREDIR} ${LIBEXECDIR}
+	${CHMOD} 755 ${SHAREDIR} ${LIBEXECDIR}
 	-${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
 .endif
-	${TEST} -f /etc/postfix/postfix-files || \
-		${INSTALL_DATA} ${WRKSRC}/conf/postfix-files /etc/postfix
-	${TEST} -f /etc/postfix/postfix-script || \
-		${INSTALL_DATA} ${WRKSRC}/conf/postfix-script /etc/postfix
-	${TEST} -f /etc/postfix/main.cf || \
-		${INSTALL_DATA} ${WRKSRC}/conf/main.cf /etc/postfix
-	${TEST} -f /etc/postfix/master.cf || \
-		${INSTALL_DATA} ${WRKSRC}/conf/master.cf /etc/postfix
+	for pf in postfix-files postfix-script main.cf master.cf; do \
+		${TEST} -f ${PKG_SYSCONFDIR}/$$pf || \
+		    ${INSTALL_DATA} ${WRKSRC}/conf/$$pf ${PKG_SYSCONFDIR}; \
+	done
 
 do-install:
 	(cd ${WRKSRC} && ${SH} postfix-install -non-interactive)
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/conf/main.cf ${PREFIX}/share/postfix
-	${INSTALL_DATA} ${WRKSRC}/conf/master.cf ${PREFIX}/share/postfix
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${PREFIX}/share/postfix
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-files ${PREFIX}/share/postfix
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${PREFIX}/share/postfix
+	${INSTALL_DATA} ${WRKSRC}/conf/main.cf ${SHAREDIR}
+	${INSTALL_DATA} ${WRKSRC}/conf/master.cf ${SHAREDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${SHAREDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-files ${SHAREDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${SHAREDIR}
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${PREFIX}/etc
-	${LN} -sf ${PREFIX}/share/postfix/post-install /etc/postfix
-	${LN} -sf ${PREFIX}/share/postfix/postfix-files /etc/postfix
-	${LN} -sf ${PREFIX}/share/postfix/postfix-script /etc/postfix
+	${LN} -sf ${SHAREDIR}/post-install ${PKG_SYSCONFDIR}
+	${LN} -sf ${SHAREDIR}/postfix-files ${PKG_SYSCONFDIR}
+	${LN} -sf ${SHAREDIR}/postfix-script ${PKG_SYSCONFDIR}
 	${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
 
 .include "../../mk/bsd.pkg.mk"