diff options
author | Edwin Groothuis <edwin@FreeBSD.org> | 2004-11-27 02:24:12 +0000 |
---|---|---|
committer | Edwin Groothuis <edwin@FreeBSD.org> | 2004-11-27 02:24:12 +0000 |
commit | 72029aab04ffed607b923b59882c3a7bd23968c7 (patch) | |
tree | 21042788f936f4877e6d51773da1c2f2ed6590ba /mail/postfix-current | |
parent | 81f580eacad569bd0d69c9f72ff0c7c09dfb70b6 (diff) | |
download | ports-72029aab04ffed607b923b59882c3a7bd23968c7.tar.gz ports-72029aab04ffed607b923b59882c3a7bd23968c7.zip |
update mail/postfix-current to latest
update postfix-current to latest version
add option to enable NIS maps
IPv6 and TLS patches are still broken, unfortunately
PR: ports/74010
Submitted by: Vivek Khera <vivek@khera.org>
Notes
Notes:
svn path=/head/; revision=122544
Diffstat (limited to 'mail/postfix-current')
-rw-r--r-- | mail/postfix-current/Makefile | 37 | ||||
-rw-r--r-- | mail/postfix-current/distinfo | 6 | ||||
-rw-r--r-- | mail/postfix-current/pkg-plist | 3 | ||||
-rw-r--r-- | mail/postfix-current/scripts/configure.postfix | 11 |
4 files changed, 34 insertions, 23 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 67d7a70dde8b..fcb337cfc627 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -15,7 +15,7 @@ # NOTE: PCRE is enabled by default unless you specifically disable it. PORTNAME= postfix -PORTVERSIONRAW= 2.2-20040919 +PORTVERSIONRAW= 2.2-20041030 PORTVERSION= ${PORTVERSIONRAW:S/-/./} PORTEPOCH= 2 CATEGORIES= mail ipv6 @@ -24,6 +24,7 @@ MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ ftp://ftp.tux.org/pub/net/postfix/experimental/ \ ftp://ftp.utoronto.ca/mirror/packages/postfix/experimental/ \ ftp://ftp.samurai.com/pub/postfix/experimental/ \ + http://people.FreeBSD.org/~seanc/ports/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/experimental/&,} MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSIONRAW} @@ -44,7 +45,7 @@ MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.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 + header_checks.5 body_checks.5 master.5 nisplus_table.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 \ @@ -104,26 +105,26 @@ post-patch: pre-patch: ${ECHO} "<body>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY>" > ${WRKSRC}/html/body_checks.5.html -.for file in ${MAN1} +.for f in ${MAN1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html + ${WRKSRC}/man/man1/${f} ${WRKSRC}/html/${f}.html .endfor -.for file in ${MAN5} +.for f in ${MAN5} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html + ${WRKSRC}/man/man5/${f} ${WRKSRC}/html/${f}.html .endfor -.for file in ${MAN8base} +.for f in ${MAN8base} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html + ${WRKSRC}/man/man8/${f} ${WRKSRC}/html/${f}.html .endfor -.for file in ${README} +.for f in ${README} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/html/${file}.html + ${WRKSRC}/html/${f}.html @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/README_FILES/${file} + ${WRKSRC}/README_FILES/${f} .endfor -.for file in ${CONF1} - @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} +.for f in ${CONF1} + @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${f} .endfor pre-install: @@ -150,9 +151,9 @@ do-install: sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} -.for file in ${CONF1} - ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ - ${PREFIX}/etc/postfix/dist-${file} +.for f in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${f} \ + ${PREFIX}/etc/postfix/dist-${f} .endfor @${INSTALL_SCRIPT} \ @@ -160,8 +161,8 @@ do-install: ${PREFIX}/bin/rmail # optional TEST binaries -.for file in ${BIN1} - @${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/sbin +.for f in ${BIN1} + @${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin .endfor .if !defined(NOPORTDOCS) diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index 2c5a16fa656a..efc7ce78be36 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,2 +1,4 @@ -MD5 (postfix/postfix-2.2-20040919.tar.gz) = 4611a1087f346c3d1ddcc0c1ec9466ab -SIZE (postfix/postfix-2.2-20040919.tar.gz) = 2077140 +MD5 (postfix/postfix-2.2-20041030.tar.gz) = f179f5d50d387d2eb82351bdb03dac9e +SIZE (postfix/postfix-2.2-20041030.tar.gz) = 2106328 +MD5 (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 2f5df0781abd0390611158b4a5fb63c4 +SIZE (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 239159 diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist index d0034a0e1d6d..5f20b813f439 100644 --- a/mail/postfix-current/pkg-plist +++ b/mail/postfix-current/pkg-plist @@ -167,8 +167,10 @@ bin/mailq %%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html %%PORTDOCS%%%%DOCSDIR%%/local.8.html %%PORTDOCS%%%%DOCSDIR%%/mailq.1.html +%%PORTDOCS%%%%DOCSDIR%%/master.5.html %%PORTDOCS%%%%DOCSDIR%%/master.8.html %%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html +%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html %%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html %%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html %%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html @@ -181,6 +183,7 @@ bin/mailq %%PORTDOCS%%%%DOCSDIR%%/postconf.5.html %%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html %%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg +%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html %%PORTDOCS%%%%DOCSDIR%%/postfix-power.png %%PORTDOCS%%%%DOCSDIR%%/postfix.1.html %%PORTDOCS%%%%DOCSDIR%%/postkick.1.html diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix index 450b7761ae96..74a4bf8433d8 100644 --- a/mail/postfix-current/scripts/configure.postfix +++ b/mail/postfix-current/scripts/configure.postfix @@ -35,6 +35,7 @@ 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" \ +NIS "NIS map lookups" "$status_NIS" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile @@ -108,8 +109,8 @@ while [ "$1" ]; do 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.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 "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" @@ -195,6 +196,10 @@ while [ "$1" ]; do echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap" ;; + NIS) + echo "POSTFIX_CCARGS+= -DHAS_NIS" + echo "NIS_SUFFIX= +nis" + ;; Test) echo "BIN1= smtp-sink smtp-source qmqp-source" # echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1" @@ -248,4 +253,4 @@ echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" # 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}" +#echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${NIS_SUFFIX}" |