From cf1cbcbcf52cf5b821cff3238848c7e53a07c7eb Mon Sep 17 00:00:00 2001 From: "David W. Chapman Jr." Date: Wed, 8 May 2002 19:52:22 +0000 Subject: Update to latest snapsho Add PGSQL support Enable IPv6 PR: 37864 Submitted by: maintainer --- mail/postfix-current/Makefile | 3 +- mail/postfix-current/distinfo | 6 ++-- mail/postfix-current/pkg-install | 13 --------- mail/postfix-current/scripts/configure.postfix | 39 +++++++++++++++++++------- 4 files changed, 35 insertions(+), 26 deletions(-) (limited to 'mail/postfix-current') diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 3e59b6eb7ad6..b30c1844f082 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.7-20020331 +PORTVERSION= 1.1.8-20020505 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ @@ -114,6 +114,7 @@ post-install: # 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 diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index 89ad2295f56a..c0599cb123ed 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,2 +1,4 @@ -MD5 (postfix/postfix-1.1.7-20020331.tar.gz) = 1198606e529250dcfdfcd4544aa58b40 -MD5 (postfix/pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz) = 578ade33d4d5475c55c31041857cc6f1 +MD5 (postfix/postfix-1.1.8-20020505.tar.gz) = 7f953cfb70c324acf963049c9ae6cba2 +MD5 (postfix/pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz) = a00656e4e7fd1e4827c3e805799d2359 +MD5 (postfix/postfix-1.1.7+ipv6.patch.gz) = 9564e8e1e3ddfb885bb1ffaaf75c670b +MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba diff --git a/mail/postfix-current/pkg-install b/mail/postfix-current/pkg-install index 8ecea1626d2b..5acdbac8d974 100644 --- a/mail/postfix-current/pkg-install +++ b/mail/postfix-current/pkg-install @@ -143,19 +143,6 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - cat <<'EOM' -To enable postfix to start at boot time, please set these variables in -your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely. - -EOM fi else if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix index bbfb3ef8f351..b0b8f9b607e9 100644 --- a/mail/postfix-current/scripts/configure.postfix +++ b/mail/postfix-current/scripts/configure.postfix @@ -17,10 +17,11 @@ PCRE "Perl Compatible Regular Expressions" OFF \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" OFF \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \ MySQL "MySQL map lookups" OFF \ +PgSQL "PostgreSQL map lookups" OFF \ OpenLDAP "OpenLDAP map lookups" OFF \ Test "SMTP/LMTP test server and generator" OFF \ -TLS "SSL and Transport Layer Security (CURRENTLY BROKEN)" OFF \ -IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ +TLS "SSL and TLS (currently broken)" OFF \ +IPv6 "IPv6 support (not KAME official)" OFF \ 2> $tempfile retval=$? @@ -55,12 +56,14 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre" echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a" + echo "PCRE_SUFFIX= +pcre" SUB_PCRE="" ;; \"SASL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -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 "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" @@ -79,34 +82,44 @@ while [ "$1" ]; do echo "MAN8+= tlsmgr.8" echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl" echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.7-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" + echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; \"DB3\") echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB3_SUFFIX= +db3" ;; \"MySQL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" 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 "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + 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" + echo "PATCH_SITES+= http://mat.cc/postfix/" + echo "PATCHFILES+= postfix-pg.postfix-1.1.8.patch" + echo "PATCH_DIST_STRIP= -p1" ;; \"OpenLDAP\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" + echo "OPENLDAP_SUFFIX= +openldap" ;; \"Test\") echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; \"IPv6\") - /usr/bin/dialog --msgbox "IPv6 is currently broken until kame updates patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 if [ `uname -m` != "i386" ]; then /usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc @@ -117,10 +130,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/" - echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}" - echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz" + echo "PATCH_SITES+= http://www.cyber-magic.org/~taka/misc/" + echo "PATCHFILES+= postfix-1.1.7+ipv6.patch.gz" echo "PATCH_DIST_STRIP= -p1" + echo "IPv6_SUFFIX= +ipv6" echo "" ;; *) @@ -134,3 +147,9 @@ done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" + +# 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= \${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" -- cgit v1.2.3