diff -ruN postfix-current.old/Makefile postfix-current/Makefile --- postfix-current.old/Makefile Thu Mar 10 10:27:58 2005 +++ postfix-current/Makefile Thu Mar 10 14:31:03 2005 @@ -32,43 +32,29 @@ MAINTAINER= marcus@corp.grupos.com.br COMMENT= A secure alternative to widely-used Sendmail -PORTVERSIONRAW= 2.3-20050308 +PORTVERSIONRAW= 2.3-20050309 -CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* +CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.2.* \ + sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* NO_LATEST_LINK= yes USE_SUBMAKE= yes USE_REINPLACE= yes -MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ - postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ - postsuper.1 sendmail.1 - -MAN5= access.5 aliases.5 canonical.5 cidr_table.5 ldap_table.5 \ - mysql_table.5 pgsql_table.5 postconf.5 pcre_table.5 \ - regexp_table.5 relocated.5 tcp_table.5 transport.5 virtual.5 \ - header_checks.5 body_checks.5 master.5 nisplus_table.5 \ - generic.5 - -MAN8= anvil.8 bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ - master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \ - smtp.8 smtpd.8 spawn.8 trace.8 trivial-rewrite.8 verify.8 virtual.8 \ - scache.8 discard.8 tlsmgr.8 - -CONF1= main.cf master.cf access aliases canonical header_checks relocated \ - transport virtual generic - -README= ADDRESS_CLASS_README ADDRESS_REWRITING_README \ - ADDRESS_VERIFICATION_README BACKSCATTER_README \ - BASIC_CONFIGURATION_README BUILTIN_FILTER_README \ - CONTENT_INSPECTION_README CYRUS_README DATABASE_README DB_README \ - DEBUG_README ETRN_README FILTER_README INSTALL LDAP_README \ - LINUX_README LMTP_README LOCAL_RECIPIENT_README MAILDROP_README \ - MYSQL_README NFS_README OVERVIEW PACKAGE_README PCRE_README \ - PGSQL_README QMQP_README QSHAPE_README RESTRICTION_CLASS_README \ - SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \ - SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \ - ULTRIX_README UUCP_README VERP_README VIRTUAL_README \ - XCLIENT_README XFORWARD_README IPV6_README TLS_README +MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 \ + postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 + +MAN5= access.5 aliases.5 body_checks.5 canonical.5 cidr_table.5 generic.5 \ + header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \ + pcre_table.5 pgsql_table.5 postconf.5 regexp_table.5 relocated.5 tcp_table.5 \ + transport.5 virtual.5 + +MAN8= anvil.8 bounce.8 cleanup.8 defer.8 discard.8 error.8 flush.8 lmtp.8 \ + local.8 master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 \ + scache.8 showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trace.8 trivial-rewrite.8 \ + verify.8 virtual.8 + +CONF1= access aliases canonical generic header_checks main.cf master.cf \ + relocated transport virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= @@ -102,28 +88,16 @@ ${ECHO} "all: default" >> Makefile) pre-patch: - ${ECHO} "See header_checks.5.html" > ${WRKSRC}/html/body_checks.5.html -.for f in ${MAN1} - @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/man/man1/${f} ${WRKSRC}/html/${f}.html -.endfor -.for f in ${MAN5} - @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/man/man5/${f} ${WRKSRC}/html/${f}.html -.endfor -.for f in ${MAN8} - @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/man/man8/${f} ${WRKSRC}/html/${f}.html -.endfor -.for f in ${README} - @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/html/${f}.html - @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/README_FILES/${f} -.endfor -.for f in ${CONF1} - @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${f} -.endfor + @${ECHO} "See header_checks.5.html" > ${WRKSRC}/html/body_checks.5.html + @for f in `${FIND} -P ${WRKSRC}/man -type f`; do \ + ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ + done + @for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \ + ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ + done + @for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \ + ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ + done pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -149,9 +123,9 @@ sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} + @${MKDIR} ${PREFIX}/etc/postfix/dist .for f in ${CONF1} - ${INSTALL_DATA} ${WRKSRC}/conf/${f} \ - ${PREFIX}/etc/postfix/dist-${f} + ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist .endfor @${INSTALL_SCRIPT} \ diff -ruN postfix-current.old/distinfo postfix-current/distinfo --- postfix-current.old/distinfo Thu Mar 10 10:27:58 2005 +++ postfix-current/distinfo Thu Mar 10 14:31:49 2005 @@ -1,2 +1,2 @@ -MD5 (postfix/postfix-2.3-20050308.tar.gz) = fffd69218f6e34a6c706882ed2255bff -SIZE (postfix/postfix-2.3-20050308.tar.gz) = 2407890 +MD5 (postfix/postfix-2.3-20050309.tar.gz) = e4db154e3cf7fff32ff24e97f47340e1 +SIZE (postfix/postfix-2.3-20050309.tar.gz) = 2409498 diff -ruN postfix-current.old/pkg-plist postfix-current/pkg-plist --- postfix-current.old/pkg-plist Sat Mar 5 04:52:55 2005 +++ postfix-current/pkg-plist Thu Mar 10 13:54:23 2005 @@ -1,13 +1,13 @@ -@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist-main.cf; then rm -f %D/etc/postfix/main.cf; fi -@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist-master.cf; then rm -f %D/etc/postfix/master.cf; fi -@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist-access; then rm -f %D/etc/postfix/access; fi -@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist-aliases; then rm -f %D/etc/postfix/aliases; fi -@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist-canonical; then rm -f %D/etc/postfix/canonical; fi -@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist-header_checks; then rm -f %D/etc/postfix/header_checks; fi -@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist-relocated; then rm -f %D/etc/postfix/relocated; fi -@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi -@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi -@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist-generic; then rm -f %D/etc/postfix/generic; fi +@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi +@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi +@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi +@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi +@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi +@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi +@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi +@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi +@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi +@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi etc/postfix/LICENSE etc/postfix/TLS_LICENSE etc/postfix/main.cf.default @@ -15,16 +15,16 @@ etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script -etc/postfix/dist-main.cf -etc/postfix/dist-master.cf -etc/postfix/dist-access -etc/postfix/dist-aliases -etc/postfix/dist-canonical -etc/postfix/dist-header_checks -etc/postfix/dist-relocated -etc/postfix/dist-transport -etc/postfix/dist-virtual -etc/postfix/dist-generic +etc/postfix/dist/main.cf +etc/postfix/dist/master.cf +etc/postfix/dist/access +etc/postfix/dist/aliases +etc/postfix/dist/canonical +etc/postfix/dist/header_checks +etc/postfix/dist/relocated +etc/postfix/dist/transport +etc/postfix/dist/virtual +etc/postfix/dist/generic libexec/postfix/anvil libexec/postfix/bounce libexec/postfix/cleanup @@ -227,4 +227,5 @@ %%PORTDOCS%%%%DOCSDIR%%/generic.5.html %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/postfix +@dirrm etc/postfix/dist @unexec rmdir %D/etc/postfix 2>/dev/null || true diff -ruN postfix-current.old/scripts/configure.postfix postfix-current/scripts/configure.postfix --- postfix-current.old/scripts/configure.postfix Thu Mar 10 10:27:58 2005 +++ postfix-current/scripts/configure.postfix Thu Mar 10 13:40:39 2005 @@ -73,25 +73,23 @@ /bin/echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl" + /bin/echo "SASL_SUFFIX= +sasl" if [ -f ${LOCALBASE}/lib/libsasl.a ]; then if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then SASL_USE_MYSQL="YES" fi fi - SUB_SASL="" ;; SASL2) /bin/echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl2" + /bin/echo "SASL_SUFFIX= +sasl2" if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then SASL_USE_MYSQL="YES" fi fi - SUB_SASL="" ;; SASLKRB) /bin/echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" @@ -103,7 +101,7 @@ /bin/echo "USE_OPENSSL= yes" /bin/echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}" /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - /bin/echo "TLS_SUFFIX= +tls" + /bin/echo "TLS_SUFFIX= +tls" ;; DB3) if [ "X$BDB_SELECTED" != "X" ]; then @@ -114,7 +112,7 @@ /bin/echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" - /bin/echo "DB_SUFFIX= +db3" + /bin/echo "DB_SUFFIX= +db3" BDB_SELECTED="3" ;; DB40) @@ -126,7 +124,7 @@ /bin/echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" - /bin/echo "DB_SUFFIX= +db40" + /bin/echo "DB_SUFFIX= +db40" BDB_SELECTED="40" ;; DB41) @@ -138,7 +136,7 @@ /bin/echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" - /bin/echo "DB_SUFFIX= +db41" + /bin/echo "DB_SUFFIX= +db41" BDB_SELECTED="41" ;; DB42) @@ -150,7 +148,7 @@ /bin/echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42" /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42" /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" - /bin/echo "DB_SUFFIX= +db42" + /bin/echo "DB_SUFFIX= +db42" BDB_SELECTED="42" ;; DB43) @@ -162,13 +160,13 @@ /bin/echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43" /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43" /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb" - /bin/echo "DB_SUFFIX= +db43" + /bin/echo "DB_SUFFIX= +db43" BDB_SELECTED="43" ;; MySQL) /bin/echo "USE_MYSQL=YES" /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" + /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then /bin/echo "USE_OPENSSL= yes" @@ -182,7 +180,7 @@ PgSQL) /bin/echo "USE_PGSQL=YES" /bin/echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" + /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" /bin/echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP) @@ -193,7 +191,7 @@ ;; NIS) /bin/echo "POSTFIX_CCARGS+= -DHAS_NIS" - /bin/echo "NIS_SUFFIX= +nis" + /bin/echo "NIS_SUFFIX= +nis" ;; Test) /bin/echo "BIN1= smtp-sink smtp-source qmqp-source" @@ -215,7 +213,7 @@ if [ $? = 0 ]; then /bin/echo "USE_MYSQL=YES" /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" + /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then /bin/echo "USE_OPENSSL= yes"