ports/52511: update of postfix-current port

[Ben Rosengart]

>Number:         52511
>Category:       ports
>Synopsis:       update of postfix-current port
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 20 20:40:03 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Ben Rosengart
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
TINHO
>Environment:
System: FreeBSD absinthe.tinho.net 4.6-STABLE FreeBSD 4.6-STABLE #6: Thu Jun 27 12:33:13 EDT 2002 root@:/d4/obj/usr/src/sys/ABSINTHE i386


	
>Description:

The postfix-current port is for the relatively ancient
1.1.11-20021115.  These patches bring it up to the latest, 2.0.9-20030424.
This is my first submission to ports, so please be kind.  :-)

>How-To-Repeat:
	
>Fix:

diff -ru /usr/ports/mail/postfix-current/Makefile postfix-current/Makefile
--- /usr/ports/mail/postfix-current/Makefile	Sat Feb 22 04:54:30 2003
+++ postfix-current/Makefile	Tue May 20 22:51:16 2003
@@ -7,14 +7,15 @@
 
 # To pre-select options in batch mode, run make like this:
 #
-#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
+#  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
-PORTVERSION=	1.1.11-20021115
-#PORTREVISION=	1
+PORTVERSION=	2.0.9-20030424
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
@@ -41,8 +42,8 @@
 	relocated.5 transport.5 virtual.5
 
 MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \
-	smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
+	master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
+	smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
 
 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
 # patch it.
@@ -71,6 +72,15 @@
 .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}" && \
@@ -107,7 +117,7 @@
 .endif
 
 do-install:
-	cd ${WRKSRC}; sh postfix-install -non-interactive install_root=/ tempdir=/tmp \
+	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 \
Only in /usr/ports/mail/postfix-current: Makefile.inc
diff -ru /usr/ports/mail/postfix-current/distinfo postfix-current/distinfo
--- /usr/ports/mail/postfix-current/distinfo	Sat Nov 23 04:22:58 2002
+++ postfix-current/distinfo	Tue May 20 22:53:34 2003
@@ -1,4 +1 @@
-MD5 (postfix/postfix-1.1.11-20021115.tar.gz) = dd3c98b616844a3548049bbaa418c296
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-20021031-0.9.6g.tar.gz) = 1fc29989315ab5570486929c24187626
-MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
-MD5 (postfix/tls+ipv6-1.8-pf-1.1.11-20021115.patch) = f01d9a0e28fb3d1a59614f2093ad24f3
+MD5 (postfix/postfix-2.0.9-20030424.tar.gz) = f02afb07a4ff5ada3251b0b61cf6bc38
>Release-Note:
>Audit-Trail:
>Unformatted: