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

--- pkgsrc/mail/postfix/Makefile	2004/01/28 16:03:02	1.116
+++ pkgsrc/mail/postfix/Makefile	2005/11/21 23:24:30	1.167.2.1
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.116 2004/01/28 16:03:02 martti Exp $
+# $NetBSD: Makefile,v 1.167.2.1 2005/11/21 23:24:30 salo Exp $
 
-DISTNAME=	postfix-2.0.18
+DISTNAME=	postfix-2.2.5
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
@@ -10,144 +11,102 @@ COMMENT=	Postfix SMTP server and tools
 
 DIST_SUBDIR=	postfix
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
+CONFLICTS+=	sendmail-[0-9]* fastforward>=0.51nb2
 
-USE_BUILDLINK3=	yes
-USE_PKGINSTALL=	yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PKG_SYSCONFSUBDIR=	postfix
-POSTFIX_SPOOL=		/var/spool/postfix
+.include "../../mk/bsd.prefs.mk"
 
-OWN_DIRS=	${POSTFIX_SPOOL}
+# 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
+
+# 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_COMMAND_DIR=\"${PREFIX}/sbin\"
-CCARGS+=	-DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
+CCARGS+=	-DDEF_MANPAGE_DIR=\"${PREFIX}/man\"
+CCARGS+=	-DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\"
+CCARGS+=	-DDEF_README_DIR=\"${DOCDIR}\"
+
+# 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}|"	\
+	-e "s|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|"		\
+	-e "s|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|"		\
+	-e "s|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|"	\
+	-e "s|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|"	\
+	-e "s|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|"		\
+	-e "s|^\(setgid_group\) =.*|\1 = maildrop|"			\
+	-e "s|^\(manpage_directory\) =.*|\1 = ${PREFIX}/man|"		\
+	-e "s|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|"		\
+	-e "s|^\(readme_directory\) =.*|\1 = ${DOCDIR}|"		\
+	-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"
 
-.include "../../mk/bsd.prefs.mk"
-
-FIX_RPATH+=	AUXLIBS
-
-.if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
-.  include "../../security/openssl/buildlink3.mk"
-PATCHFILES+=		tls+ipv6-1.21-pf-2.0.18.patch.gz
-PATCH_SITES+=		ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.21/
-PATCH_DIST_STRIP=	-p1
-BUILD_DEFS+=		POSTFIX_USE_INET6
-
-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"
-.  include "../../devel/pcre/buildlink3.mk"
-CCARGS+=	-DHAS_PCRE
-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/buildlink3.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"
-.  include "../../databases/mysql-client/buildlink3.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(USE_SASL2) && ${USE_SASL2} == "YES"
-USING_SASL=YES
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
-CCARGS+=	-DUSE_SASL2_AUTH
-AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib			\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
-		-lsasl2
-BUILD_DEFS+=	USE_SASL2
-.elif defined(USE_SASL) && ${USE_SASL} == "YES"
-USING_SASL=YES
-.  include "../../security/cyrus-sasl/buildlink3.mk"
-CCARGS+=	-DUSE_SASL_AUTH
-AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib			\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
-		-lsasl
-BUILD_DEFS+=	USE_SASL
-.endif
-
-.if defined(USING_SASL)
-PLIST_SRC+=	${PKGDIR}/PLIST.sasl
-MESSAGE_SRC+=	${PKGDIR}/MESSAGE.sasl
-MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-.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
-
-FILES_SUBST+=	SHAREDIR=${SHAREDIR}
-MESSAGE_SUBST+=	SHAREDIR=${SHAREDIR}
-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/examples/${PKGBASE}
-
-CONF_FILES=	${SHAREDIR}/main.cf ${PKG_SYSCONFDIR}/main.cf
-CONF_FILES+=	${SHAREDIR}/master.cf ${PKG_SYSCONFDIR}/master.cf
-.if defined(USING_SASL)
-.  if defined(USE_SASL2)
-MAKE_DIRS+=	${PREFIX}/lib/sasl2
-CONF_FILES+=	${SHAREDIR}/smtpd.conf	${PREFIX}/lib/sasl2/smtpd.conf
-.  else
-MAKE_DIRS+=	${PREFIX}/lib/sasl
-CONF_FILES+=	${SHAREDIR}/smtpd.conf	${PREFIX}/lib/sasl/smtpd.conf
-.  endif
-.endif
+PKG_SYSCONFSUBDIR=	postfix
+LIBEXECDIR=		${PREFIX}/libexec/postfix
+DOCDIR=			${PREFIX}/share/doc/postfix
+EXAMPLEDIR=		${PREFIX}/share/examples/postfix
+
+FILES_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR}
+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
+
+BUILD_TARGET=		# empty
+MAKE_ENV=		CC="${CC}" OPT="${CFLAGS}"
+MAKE_ENV+=		AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
+
+USE_PKGINSTALL=		yes
+RCD_SCRIPTS=		postfix
+OWN_DIRS+=		${POSTFIX_QUEUE_DIR}
+MAKE_DIRS+=		${PKG_SYSCONFDIR}
+
+PKG_GROUPS?=		postfix maildrop
+PKG_USERS?=		postfix:postfix::Postfix\ User:${POSTFIX_QUEUE_DIR}
+
+CONF_FILES=		# empty
+.for _file_ in main.cf master.cf postfix-files
+CONF_FILES+=		${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_}
+.endfor
 CONF_FILES_PERMS=	# empty
-.for confscr in post-install postfix-files postfix-script
-CONF_FILES_PERMS+=	${SHAREDIR}/${confscr} ${PKG_SYSCONFDIR}/${confscr} \
+.for _file_ in post-install postfix-script
+CONF_FILES_PERMS+=	${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
 			${ROOT_USER} ${ROOT_GROUP} 755
 .endfor
-.undef confscr
-
-INSTALL_EXTRA_TMPL+=	${PKGDIR}/INSTALL
+.undef _file_
+.if !empty(PKG_OPTIONS:Msasl)
+MAKE_DIRS+=		${SASLLIBDIR}
+CONF_FILES+=		${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
+.endif
 
-pre-configure:
-	@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
+MAKE_ENV+=		DEBUG= # empty
 
 do-configure:
 	cd ${WRKSRC} &&							\
@@ -155,42 +114,24 @@ do-configure:
 		'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'
 
 post-build:
-	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
-	    <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix
-
-pre-install:
-	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
-	${INSTALL_DATA_DIR} ${SHAREDIR}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/postfix
-	${INSTALL_DATA_DIR} ${LIBEXECDIR}
-	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${SHAREDIR} ${LIBEXECDIR}
-	${CHMOD} 755 ${SHAREDIR} ${LIBEXECDIR}
-	-${RM} -f ${WRKSRC}/conf/*.orig
-.if defined(USING_SASL)
-.  if defined(USE_SASL2)
-	${ECHO} "pwcheck_method: auxprop" > ${WRKDIR}/smtpd.conf
-.  else
-	${ECHO} "pwcheck_method: sasldb" > ${WRKDIR}/smtpd.conf
-.  endif
-	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${SHAREDIR}
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/mailer.conf		\
+		> ${WRKDIR}/mailer.conf
+.if !empty(PKG_OPTIONS:Msasl)
+	${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
 .endif
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${SHAREDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-files ${SHAREDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${SHAREDIR}
-	${INSTALL_DATA} ${WRKSRC}/conf/main.cf ${SHAREDIR}
-	${INSTALL_DATA} ${WRKSRC}/conf/master.cf ${SHAREDIR}
-	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${SHAREDIR}/mailer.conf
 
 do-install:
-	cd ${WRKSRC} && ${SETENV} config_directory="${SHAREDIR}"	\
-		${SH} postfix-install -non-interactive
-
-.if ${OPSYS} == "Linux"
-.include "../../databases/db/buildlink3.mk"
-CCARGS+=	-I${BUILDLINK_PREFIX.db}/include/db2
-AUXLIBS+=	-L${BUILDLINK_PREFIX.db}/lib                    \
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db}/lib     \
-		-ldb2
+	${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}"
 
 .include "../../mk/bsd.pkg.mk"