o Upgrade to 19990601

PR:		ports/12603
Submitted by:	Hoss Firooznia <hfir@math.rochester.edu>

o Put CFLAGS in the proper place (not in ALL_TARGET)

3 files changed, 24 insertions, 25 deletions

diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index 5da40f0feb9f..3c0d378f2d33 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -1,40 +1,40 @@
 # New ports collection makefile for:	postfix
-# Version required:	postfix 19990317-pl03
+# Version required:	19990601
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.1.1.1 1999/03/29 20:15:08 torstenb Exp $
+# $Id: Makefile,v 1.2 1999/05/02 20:26:38 torstenb Exp $
 #
 
-DISTNAME=	postfix-19990317-pl03
-PKGNAME=	postfix-alpha-19990317.03
+DISTNAME=	postfix-19990601
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/ \
-		ftp://ftp.snoopy.net/pub/mirrors/postfix/ \
-		ftp://ftp.reverse.net/pub/postfix/ \
-		ftp://postfix.eu.org/pub/postfix/ \
-		ftp://ftp.sunet.se/pub/unix/mail/postfix/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/ \
-		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/
+MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
+		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
+		ftp://ftp.reverse.net/pub/postfix/official/ \
+		ftp://postfix.eu.org/pub/postfix/official/ \
+		ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
+		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
+		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-ALL_TARGET=	default "OPT=${CFLAGS}"
+ALL_TARGET=	default
 
 SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
+MAKE_ENV+=	"OPT=${CFLAGS}"
 
 MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
 	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
 	sendmail.1
 MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
-	showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+	showq.8 smtp.8 smtpd.8 trivial-rewrite.8 error.8
 
 SHAREMODE=	0644
 
 do-install:
 	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
-	@chown root:wheel ${PREFIX}/etc/postfix
+	@/usr/sbin/chown root:wheel ${PREFIX}/etc/postfix
 	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
 	@for f in access main.cf master.cf ; do \
@@ -53,19 +53,17 @@ do-install:
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
 	@mkdir -p -m 0755 ${PREFIX}/libexec/postfix
-	@for f in bounce cleanup fsstone local master pickup pipe \
-		qmgr showq smtp smtp-sink smtp-source smtpd \
-		trivial-rewrite ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
+		 showq smtp smtpd trivial-rewrite ; do \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
 	done
-	@for f in sendmail postalias postcat postconf postfix \
-		postkick postlock postlog postmap postsuper ; do \
+	@for f in postalias postcat postconf postdrop postfix postkick \
+		postlock postlog postmap postsuper sendmail smtp-sink \
+		smtp-source ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/sbin/$$f ;\
 	done
-	@${INSTALL} -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
-		${PREFIX}/sbin/postdrop
 	@for f in ${MAN1} ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
 			${PREFIX}/man/man1/$$f ;\
diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo
index 0ff555aac014..2e79546a5262 100644
--- a/mail/postfix21/distinfo
+++ b/mail/postfix21/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990317-pl03.tar.gz) = d40f5773f4886ecbff40908588f07406
+MD5 (postfix-19990601.tar.gz) = adf54dfceb7950587b3e1a0966e84026
diff --git a/mail/postfix21/pkg-plist b/mail/postfix21/pkg-plist
index 28bc453e2bc2..d03bf1373f1c 100644
--- a/mail/postfix21/pkg-plist
+++ b/mail/postfix21/pkg-plist
@@ -22,6 +22,7 @@ etc/postfix/postfix-script
 etc/postfix/master.cf
 libexec/postfix/bounce
 libexec/postfix/cleanup
+libexec/postfix/error
 libexec/postfix/fsstone
 libexec/postfix/local
 libexec/postfix/master
@@ -30,8 +31,6 @@ libexec/postfix/pipe
 libexec/postfix/qmgr
 libexec/postfix/showq
 libexec/postfix/smtp
-libexec/postfix/smtp-sink
-libexec/postfix/smtp-source
 libexec/postfix/smtpd
 libexec/postfix/trivial-rewrite
 sbin/sendmail
@@ -45,5 +44,7 @@ sbin/postlog
 sbin/postmap
 sbin/postsuper
 sbin/postdrop
+sbin/smtp-sink
+sbin/smtp-source
 @exec mkdir -p -m 0755 /var/spool/postfix
 @exec chown root:wheel /var/spool/postfix