Index: head/mail/postfix-current/Makefile =================================================================== --- head/mail/postfix-current/Makefile (revision 118756) +++ head/mail/postfix-current/Makefile (revision 118757) @@ -1,185 +1,185 @@ # New ports collection makefile for: postfix-current # Date created: 18 Mar 1999 # Whom: torstenb # # $FreeBSD$ # # To pre-select options in batch mode, run make like this: # # make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS" # # the options are the same names as in the scripts/configure.postfix file. # POSTFIX_OPTIONS can be set in /etc/make.conf also. # NOTE: PCRE is enabled by default unless you specifically disable it. PORTNAME= postfix -PORTVERSIONRAW= 2.2-20040829 +PORTVERSIONRAW= 2.2-20040919 PORTVERSION= ${PORTVERSIONRAW:S/-/./} PORTEPOCH= 2 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ ftp://ftp.tux.org/pub/net/postfix/experimental/ \ ftp://ftp.utoronto.ca/mirror/packages/postfix/experimental/ \ ftp://ftp.samurai.com/pub/postfix/experimental/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/experimental/&,} MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSIONRAW} DIST_SUBDIR= ${PORTNAME} MAINTAINER= vivek@khera.org COMMENT= A secure alternative to widely-used Sendmail CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* 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 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 + scache.8 discard.8 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to # patch it. MAN8base=$(MAN8:S/tlsmgr.8//) CONF1= main.cf master.cf access aliases canonical header_checks relocated \ transport virtual 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 .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-patch: ${ECHO} "See header_checks.5.html" > ${WRKSRC}/html/body_checks.5.html .for file in ${MAN1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN5} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN8base} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${README} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/html/${file}.html @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/README_FILES/${file} .endfor .for file in ${CONF1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} .endfor pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no .else READMEDIR=${PREFIX}/share/doc/postfix .endif do-install: cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ config_directory=${PREFIX}/etc/postfix \ daemon_directory=${PREFIX}/libexec/postfix \ command_directory=${PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PREFIX}/sbin/sendmail \ newaliases_path=${PREFIX}/bin/newaliases \ mailq_path=${PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PREFIX}/man \ sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} .for file in ${CONF1} ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ ${PREFIX}/etc/postfix/dist-${file} .endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ ${PREFIX}/bin/rmail # optional TEST binaries .for file in ${BIN1} @${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/sbin .endfor .if !defined(NOPORTDOCS) @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \ ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" .endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, # it will complain about missing files. @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list @${CAT} ${PKGMESSAGE} post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/mail/postfix-current/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.105 \ No newline at end of property +1.106 \ No newline at end of property Index: head/mail/postfix-current/distinfo =================================================================== --- head/mail/postfix-current/distinfo (revision 118756) +++ head/mail/postfix-current/distinfo (revision 118757) @@ -1,2 +1,2 @@ -MD5 (postfix/postfix-2.2-20040829.tar.gz) = f73a622382cdfc0dfe5109c35bdf98d9 -SIZE (postfix/postfix-2.2-20040829.tar.gz) = 2065746 +MD5 (postfix/postfix-2.2-20040919.tar.gz) = 4611a1087f346c3d1ddcc0c1ec9466ab +SIZE (postfix/postfix-2.2-20040919.tar.gz) = 2077140 Property changes on: head/mail/postfix-current/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.56 \ No newline at end of property +1.57 \ No newline at end of property Index: head/mail/postfix-current/pkg-plist =================================================================== --- head/mail/postfix-current/pkg-plist (revision 118756) +++ head/mail/postfix-current/pkg-plist (revision 118757) @@ -1,215 +1,217 @@ @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 etc/postfix/LICENSE etc/postfix/main.cf.default etc/postfix/makedefs.out 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 libexec/postfix/anvil libexec/postfix/bounce libexec/postfix/cleanup +libexec/postfix/discard libexec/postfix/error libexec/postfix/flush libexec/postfix/lmtp libexec/postfix/local libexec/postfix/master libexec/postfix/nqmgr libexec/postfix/oqmgr libexec/postfix/pickup libexec/postfix/pipe libexec/postfix/proxymap libexec/postfix/qmgr libexec/postfix/qmqpd libexec/postfix/scache libexec/postfix/showq libexec/postfix/smtp libexec/postfix/smtpd libexec/postfix/spawn libexec/postfix/trivial-rewrite libexec/postfix/verify libexec/postfix/virtual %%SUB_TLS%%libexec/postfix/tlsmgr sbin/postalias sbin/postcat sbin/postconf sbin/postdrop sbin/postfix sbin/postkick sbin/postlock sbin/postlog sbin/postmap sbin/postqueue sbin/postsuper sbin/sendmail %%SUB_TEST%%sbin/qmqp-source %%SUB_TEST%%sbin/smtp-sink %%SUB_TEST%%sbin/smtp-source bin/rmail bin/newaliases bin/mailq %%PORTDOCS%%%%DOCSDIR%%/AAAREADME %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html %%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README %%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html %%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html %%PORTDOCS%%%%DOCSDIR%%/DB_README %%PORTDOCS%%%%DOCSDIR%%/DB_README.html %%PORTDOCS%%%%DOCSDIR%%/DEBUG_README %%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html %%PORTDOCS%%%%DOCSDIR%%/ETRN_README %%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html %%PORTDOCS%%%%DOCSDIR%%/FILTER_README %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html %%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README %%PORTDOCS%%%%DOCSDIR%%/LDAP_README %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html %%PORTDOCS%%%%DOCSDIR%%/LINUX_README %%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html %%PORTDOCS%%%%DOCSDIR%%/LMTP_README %%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html %%PORTDOCS%%%%DOCSDIR%%/NFS_README %%PORTDOCS%%%%DOCSDIR%%/NFS_README.html %%PORTDOCS%%%%DOCSDIR%%/OVERVIEW %%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html %%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README %%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html %%PORTDOCS%%%%DOCSDIR%%/PCRE_README %%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html %%PORTDOCS%%%%DOCSDIR%%/QMQP_README %%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES %%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README %%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html %%PORTDOCS%%%%DOCSDIR%%/SASL_README %%PORTDOCS%%%%DOCSDIR%%/SASL_README.html %%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README %%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html %%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README %%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html %%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README %%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html %%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README %%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html %%PORTDOCS%%%%DOCSDIR%%/TUNING_README %%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html %%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README %%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html %%PORTDOCS%%%%DOCSDIR%%/UUCP_README %%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html %%PORTDOCS%%%%DOCSDIR%%/VERP_README %%PORTDOCS%%%%DOCSDIR%%/VERP_README.html %%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README %%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html %%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README %%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html %%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README %%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html %%PORTDOCS%%%%DOCSDIR%%/access.5.html %%PORTDOCS%%%%DOCSDIR%%/aliases.5.html %%PORTDOCS%%%%DOCSDIR%%/anvil.8.html %%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html %%PORTDOCS%%%%DOCSDIR%%/bounce.8.html %%PORTDOCS%%%%DOCSDIR%%/canonical.5.html %%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html %%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html %%PORTDOCS%%%%DOCSDIR%%/defer.8.html +%%PORTDOCS%%%%DOCSDIR%%/discard.8.html %%PORTDOCS%%%%DOCSDIR%%/error.8.html %%PORTDOCS%%%%DOCSDIR%%/flush.8.html %%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html %%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html %%PORTDOCS%%%%DOCSDIR%%/local.8.html %%PORTDOCS%%%%DOCSDIR%%/mailq.1.html %%PORTDOCS%%%%DOCSDIR%%/master.8.html %%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html %%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html %%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html %%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html %%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html %%PORTDOCS%%%%DOCSDIR%%/pickup.8.html %%PORTDOCS%%%%DOCSDIR%%/pipe.8.html %%PORTDOCS%%%%DOCSDIR%%/postalias.1.html %%PORTDOCS%%%%DOCSDIR%%/postcat.1.html %%PORTDOCS%%%%DOCSDIR%%/postconf.1.html %%PORTDOCS%%%%DOCSDIR%%/postconf.5.html %%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html %%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg %%PORTDOCS%%%%DOCSDIR%%/postfix-power.png %%PORTDOCS%%%%DOCSDIR%%/postfix.1.html %%PORTDOCS%%%%DOCSDIR%%/postkick.1.html %%PORTDOCS%%%%DOCSDIR%%/postlock.1.html %%PORTDOCS%%%%DOCSDIR%%/postlog.1.html %%PORTDOCS%%%%DOCSDIR%%/postmap.1.html %%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html %%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html %%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html %%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html %%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html %%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html %%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html %%PORTDOCS%%%%DOCSDIR%%/qshape.1.html %%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html %%PORTDOCS%%%%DOCSDIR%%/relocated.5.html %%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html %%PORTDOCS%%%%DOCSDIR%%/scache.8.html %%PORTDOCS%%%%DOCSDIR%%/showq.8.html %%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html %%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html %%PORTDOCS%%%%DOCSDIR%%/smtp.8.html %%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html %%PORTDOCS%%%%DOCSDIR%%/spawn.8.html %%PORTDOCS%%%%DOCSDIR%%/tcp_table.5.html %%PORTDOCS%%%%DOCSDIR%%/trace.8.html %%PORTDOCS%%%%DOCSDIR%%/transport.5.html %%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html %%PORTDOCS%%%%DOCSDIR%%/verify.8.html %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/postfix @unexec rmdir %D/etc/postfix 2>/dev/null || true Property changes on: head/mail/postfix-current/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/mail/postfix-current/scripts/configure.postfix =================================================================== --- head/mail/postfix-current/scripts/configure.postfix (revision 118756) +++ head/mail/postfix-current/scripts/configure.postfix (revision 118757) @@ -1,251 +1,251 @@ #!/bin/sh # $FreeBSD$ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi tempfile=`mktemp -t checklist` if [ "${POSTFIX_OPTIONS}" ]; then set ${POSTFIX_OPTIONS} fi for i; do eval status_$i=ON done if [ -z "${BATCH}" ]; then /usr/bin/dialog --title "Postfix configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 16 \ NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ TLS "SSL and TLS (BROKEN)" "$status_TLS" \ IPv6 "IPv6 support (BROKEN)" "$status_IPv6" \ IPv6TLS "IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \ MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \ PgSQL "PostgreSQL v7.4 map lookups" "$status_PgSQL" \ PgSQL73 "PostgreSQL v7.3 map lookups" "$status_PgSQL73" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `sed 's/"//g' $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_TLS="@comment " SUB_TEST="@comment " SUB_IPV6="@comment " while [ "$1" ]; do case $1 in NOPCRE) echo "WITHOUT_PCRE= yes" echo "NOPCRE_SUFFIX= +nopcre" SUB_NOPCRE="" ;; SASL) echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" echo "SASL_SUFFIX= +sasl" if [ -f ${PREFIX}/lib/libsasl.a ]; then if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then echo "USE_MYSQL=YES" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASL2) echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" echo "SASL_SUFFIX= +sasl2" if [ -f ${PREFIX}/lib/libsasl2.a ]; then if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then echo "USE_MYSQL=YES" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASLKRB) echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" ;; TLS) echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.18-2.1.0-0.9.7d.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.18-2.1.0-0.9.7d/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040829-0.9.7d.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.19-2.2-20040829-0.9.7d/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; DB3) if [ "X$BDB_SELECTED" != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" echo "DB_SUFFIX= +db3" BDB_SELECTED="3" ;; DB40) if [ "X$BDB_SELECTED" != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" echo "DB_SUFFIX= +db40" BDB_SELECTED="40" ;; DB41) if [ "X$BDB_SELECTED" != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" echo "DB_SUFFIX= +db41" BDB_SELECTED="41" ;; DB42) if [ "X$BDB_SELECTED" != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" echo "DB_SUFFIX= +db42" BDB_SELECTED="42" ;; MySQL) echo "USE_MYSQL=YES" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) echo "POSTGRESQL_PORT?= databases/postgresql7" echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" ;; PgSQL73) echo "POSTGRESQL_PORT?= databases/postgresql73" echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" ;; PgSQL72) echo "POSTGRESQL_PORT?= databases/postgresql72" echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP) echo "USE_OPENLDAP=YES" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap" ;; Test) echo "BIN1= smtp-sink smtp-source qmqp-source" # echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1" SUB_TEST="" ;; IPv6) if [ X$SUB_TLS = "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= ipv6-1.24-pf-2.2-20040504.patch.gz" + echo "PATCHFILES+= ipv6-1.25-pf-2.2-20040616.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" IPv6SELECTED=YES SUB_IPV6="" ;; IPv6TLS) if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= tls+ipv6-1.24-pf-2.2-20040504.patch.gz" + echo "PATCHFILES+= tls+ipv6-1.25-pf-2.2-20040616.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "TLS_SUFFIX= +tls+ipv6" SUB_TLS="" SUB_IPV6="" ;; *) echo "Unknown option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" # for some reason, if we alter the pkg name this way, the first build (where # we ask the configure questions) doesn't pick up the extensions, but # any subsequent build will. so "make; make install" will build twice. # don't do this for now. #echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" Property changes on: head/mail/postfix-current/scripts/configure.postfix ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.53 \ No newline at end of property +1.54 \ No newline at end of property