From khera@kcilink.com  Mon May  3 11:04:05 2004
Return-Path: <khera@kcilink.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4B4D916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 May 2004 11:04:05 -0700 (PDT)
Received: from yertle.kcilink.com (yertle.kcilink.com [65.205.34.180])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9177843D49
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 May 2004 11:04:02 -0700 (PDT)
	(envelope-from khera@kcilink.com)
Received: from crash.int.kcilink.com (crash.int.kcilink.com [192.168.7.8])
	by yertle.kcilink.com (Postfix) with ESMTP id 311F62178B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 May 2004 14:04:02 -0400 (EDT)
Received: by crash.int.kcilink.com (Postfix, from userid 100)
	id 24DA4250418; Mon,  3 May 2004 14:04:02 -0400 (EDT)
Message-Id: <20040503180402.24DA4250418@crash.int.kcilink.com>
Date: Mon,  3 May 2004 14:04:02 -0400 (EDT)
From: Vivek Khera <vivek@khera.org>
Reply-To: Vivek Khera <vivek@khera.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update postfix to 2.1.0 release
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         66215
>Category:       ports
>Synopsis:       update postfix to 2.1.0 release
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 03 11:10:21 PDT 2004
>Closed-Date:    Wed May 12 02:09:47 PDT 2004
>Last-Modified:  Wed May 12 02:09:47 PDT 2004
>Originator:     Vivek Khera
>Release:        FreeBSD 5.2.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD crash.int.kcilink.com 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #7: Wed Apr 28 12:11:01 EDT 2004 khera@crash.int.kcilink.com:/var/usr.obj/usr/src/sys/CRASH i386


	
>Description:
	

Update postfix port to 2.1.0 release.

Committer: is it possible to have the postfix 2.0.20 port currently in the
tree repo-copied to a new port postfix20 to allow for a longer transition
period for those that need it?  That port could then be marked obsolete and
removed within a few months.  If so, please copy the existing port before
committing this patch.

Also, please remove any zero-length patch files left behind, if any.  Several
were removed during this update.

>How-To-Repeat:
	
>Fix:

	


diff -Nru postfix/Makefile postfix.21/Makefile
--- postfix/Makefile	Mon May  3 11:44:53 2004
+++ postfix.21/Makefile	Mon May  3 13:54:17 2004
@@ -1,8 +1,8 @@
-# New ports collection makefile for:	postfix-current
+# New ports collection makefile for:	postfix
 # Date created: 	18 Mar 1999
 # Whom:			torstenb
 #
-# $FreeBSD: ports/mail/postfix/Makefile,v 1.84 2004/05/02 17:44:03 pav Exp $
+# $FreeBSD: ports/mail/postfix/Makefile,v 1.83 2004/03/22 21:12:08 clement Exp $
 #
 
 # To pre-select options in batch mode, run make like this:
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.20
+PORTVERSION=	2.1.0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -28,13 +28,10 @@
 DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	postfix-2.0-ns-mx-acl-patch.gz
-
 MAINTAINER=	vivek@khera.org
 COMMENT=	A secure alternative to widely-used Sendmail
 
-CONFLICTS=	courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
+CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
@@ -42,19 +39,34 @@
 	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
 	postsuper.1 sendmail.1
 
-MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
-	relocated.5 transport.5 virtual.5
+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 transport.5 virtual.5 \
+	header_checks.5 body_checks.5
 
 MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.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
+	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
 
 # 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 pcre_table regexp_table \
-	relocated transport virtual
+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=
@@ -88,6 +100,7 @@
 	${ECHO} "all: default" >> Makefile)
 
 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}
 	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
 		${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html
@@ -100,9 +113,11 @@
 	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
 		${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html
 .endfor
-.for file in faq rate rewrite uce
+.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}
@@ -134,7 +149,7 @@
 
 .for file in ${CONF1}
 	${INSTALL_DATA} ${WRKSRC}/conf/${file} \
-		${PREFIX}/etc/postfix/sample-${file}
+		${PREFIX}/etc/postfix/dist-${file}
 .endfor
 
 	@${INSTALL_SCRIPT} \
@@ -143,14 +158,12 @@
 
 # optional TEST binaries
 .for file in ${BIN1}
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/src/smtpstone/${file} \
-		${PREFIX}/sbin
+	@${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 *.gif ${DOCSDIR} && \
+	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
 		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
 .endif
 
diff -Nru postfix/distinfo postfix.21/distinfo
--- postfix/distinfo	Mon May  3 11:44:53 2004
+++ postfix.21/distinfo	Thu Apr 29 17:04:55 2004
@@ -1,9 +1,8 @@
-MD5 (postfix/postfix-2.0.20.tar.gz) = 92479b64d132262be505a17ec02bc2a8
-SIZE (postfix/postfix-2.0.20.tar.gz) = 1354414
-MD5 (postfix/postfix-2.0-ns-mx-acl-patch.gz) = 55a3d76d52fddd5cd0365004957a1160
-SIZE (postfix/postfix-2.0-ns-mx-acl-patch.gz) = 4673
-MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 0d557a1331f0afc12b7decdc328947a1
-SIZE (postfix/postfix-pg.postfix-2.0.0.2.patch) = 27423
-MD5 (postfix/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz) = b39c08eabe807db4af5bcb1cafc9761e
-MD5 (postfix/ipv6-1.21-pf-2.0.18.patch.gz) = f30495d44b140239df02a0599d280d68
-MD5 (postfix/tls+ipv6-1.21-pf-2.0.18.patch.gz) = 8d273f922352a0ff32c57c29bec26b46
+MD5 (postfix/postfix-2.1.0.tar.gz) = 286856c9597cfa244c3b6133dce12749
+SIZE (postfix/postfix-2.1.0.tar.gz) = 1992845
+MD5 (postfix/pfixtls-0.8.18-2.1.0-0.9.7d.tar.gz) = 01785d9636bdae51a906320e581b1e6b
+SIZE (postfix/pfixtls-0.8.18-2.1.0-0.9.7d.tar.gz) = 239141
+MD5 (postfix/ipv6-1.23-pf-2.1.0.patch.gz) = 1939697e37d9b420b1cfbeafaa68b8cc
+SIZE (postfix/ipv6-1.23-pf-2.1.0.patch.gz) = 51962
+MD5 (postfix/ipv6-1.23-pf-2.1.0.patch.gz) = 1939697e37d9b420b1cfbeafaa68b8cc
+SIZE (postfix/ipv6-1.23-pf-2.1.0.patch.gz) = 51962
diff -Nru postfix/files/patch-ea postfix.21/files/patch-ea
--- postfix/files/patch-ea	Thu Jan  9 00:10:39 2003
+++ postfix.21/files/patch-ea	Wed Dec 31 19:00:00 1969
@@ -1,13 +0,0 @@
-*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
---- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
-***************
-*** 118,121 ****
-  /* FILES
-! /*	/etc/postfix/canonical*, canonical mapping table
-! /*	/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
---- 118,121 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
diff -Nru postfix/files/patch-eb postfix.21/files/patch-eb
--- postfix/files/patch-eb	Thu Jan  9 00:10:39 2003
+++ postfix.21/files/patch-eb	Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
-*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
---- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
-***************
-*** 53,55 ****
-  /* FILES
-! /*	/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
---- 53,55 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
diff -Nru postfix/files/patch-ec postfix.21/files/patch-ec
--- postfix/files/patch-ec	Wed Jan 30 14:59:39 2002
+++ postfix.21/files/patch-ec	Fri Mar 26 14:29:23 2004
@@ -1,41 +1,53 @@
-*** ./src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
---- ./src/global/mail_params.h	Tue Jan  8 22:18:22 2002
+*** ./src/global/mail_params.h.orig	Sat Jan 17 10:04:00 2004
+--- ./src/global/mail_params.h	Fri Jan 30 14:48:23 2004
 ***************
-*** 51,55 ****
+*** 64,70 ****
+  extern gid_t var_owner_gid;
   
   #define VAR_SGID_GROUP		"setgid_group"
 ! #define DEF_SGID_GROUP		"postdrop"
   extern char *var_sgid_group;
   extern gid_t var_sgid_gid;
---- 51,55 ----
+  
+--- 64,70 ----
+  extern gid_t var_owner_gid;
   
   #define VAR_SGID_GROUP		"setgid_group"
 ! #define DEF_SGID_GROUP		"maildrop"
   extern char *var_sgid_group;
   extern gid_t var_sgid_gid;
+  
 ***************
-*** 170,174 ****
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
+*** 202,208 ****
+    */
+  #define VAR_DAEMON_DIR		"daemon_directory"
+  #ifndef DEF_DAEMON_DIR
+! #define DEF_DAEMON_DIR		"/usr/libexec/postfix"
   #endif
+  extern char *var_daemon_dir;
   
---- 170,174 ----
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
+--- 202,208 ----
+    */
+  #define VAR_DAEMON_DIR		"daemon_directory"
+  #ifndef DEF_DAEMON_DIR
+! #define DEF_DAEMON_DIR		"!!PREFIX!!/libexec/postfix"
   #endif
+  extern char *var_daemon_dir;
   
 ***************
-*** 204,208 ****
+*** 231,237 ****
+    */
   #define VAR_CONFIG_DIR		"config_directory"
   #ifndef DEF_CONFIG_DIR
 ! #define DEF_CONFIG_DIR		"/etc/postfix"
   #endif
   extern char *var_config_dir;
---- 204,208 ----
+  
+--- 231,237 ----
+    */
   #define VAR_CONFIG_DIR		"config_directory"
   #ifndef DEF_CONFIG_DIR
 ! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
   #endif
   extern char *var_config_dir;
+  
diff -Nru postfix/files/patch-ed postfix.21/files/patch-ed
--- postfix/files/patch-ed	Sun Mar  4 14:34:58 2001
+++ postfix.21/files/patch-ed	Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
-*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
-***************
-*** 15,17 ****
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/[spool/]mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
---- 15,17 ----
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
diff -Nru postfix/files/patch-ee postfix.21/files/patch-ee
--- postfix/files/patch-ee	Thu Jan  9 00:10:39 2003
+++ postfix.21/files/patch-ee	Wed Dec 31 19:00:00 1969
@@ -1,13 +0,0 @@
-*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
---- ./src/master/master.c	Thu Jun  1 22:43:50 2000
-***************
-*** 104,107 ****
-  /* FILES
-! /*	/etc/postfix/main.cf: global configuration file.
-! /*	/etc/postfix/master.cf: master process configuration file.
-  /*	/var/spool/postfix/pid/master.pid: master lock file.
---- 104,107 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/main.cf: global configuration file.
-! /*	!!PREFIX!!/etc/postfix/master.cf: master process configuration file.
-  /*	/var/spool/postfix/pid/master.pid: master lock file.
diff -Nru postfix/files/patch-ef postfix.21/files/patch-ef
--- postfix/files/patch-ef	Thu Jan  9 00:10:39 2003
+++ postfix.21/files/patch-ef	Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
-*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
---- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
-***************
-*** 39,41 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 39,41 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff -Nru postfix/files/patch-eg postfix.21/files/patch-eg
--- postfix/files/patch-eg	Thu Jan  9 00:10:39 2003
+++ postfix.21/files/patch-eg	Wed Dec 31 19:00:00 1969
@@ -1,20 +0,0 @@
-*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
---- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
-***************
-*** 57,59 ****
-  /*	The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! /*	files are kept in \fB/etc/postfix\fR.
-  /* .IP "\fB-F \fIfull_name\fR
---- 57,59 ----
-  /*	The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! /*	files are kept in \fB!!PREFIX!!/etc/postfix\fR.
-  /* .IP "\fB-F \fIfull_name\fR
-***************
-*** 159,161 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 159,161 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff -Nru postfix/files/patch-eh postfix.21/files/patch-eh
--- postfix/files/patch-eh	Thu Jan  9 00:10:39 2003
+++ postfix.21/files/patch-eh	Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
-*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
---- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
-***************
-*** 32,34 ****
-  /* FILES
-! /*	/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
---- 32,34 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
diff -Nru postfix/files/patch-main.cf postfix.21/files/patch-main.cf
--- postfix/files/patch-main.cf	Wed Jul 23 10:19:37 2003
+++ postfix.21/files/patch-main.cf	Mon Apr 26 17:01:44 2004
@@ -1,58 +1,108 @@
---- ./conf/main.cf	Wed Jan  8 22:11:52 2003
-+++ ./conf/main.cf	Wed Jan  8 22:11:53 2003
-@@ -31,13 +31,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -590,32 +590,32 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
+*** ./conf/main.cf~	Mon Apr 26 16:54:42 2004
+--- ./conf/main.cf	Mon Apr 26 16:54:42 2004
+***************
+*** 32,44 ****
+  # The command_directory parameter specifies the location of all
+  # postXXX commands.
+  #
+! command_directory = /usr/sbin
+  
+  # The daemon_directory parameter specifies the location of all Postfix
+  # daemon programs (i.e. programs listed in the master.cf file). This
+  # directory must be owned by root.
+  #
+! daemon_directory = /usr/libexec/postfix
+  
+  # QUEUE AND PROCESS OWNERSHIP
+  #
+--- 32,44 ----
+  # The command_directory parameter specifies the location of all
+  # postXXX commands.
+  #
+! command_directory = !!PREFIX!!/sbin
+  
+  # The daemon_directory parameter specifies the location of all Postfix
+  # daemon programs (i.e. programs listed in the master.cf file). This
+  # directory must be owned by root.
+  #
+! daemon_directory = !!PREFIX!!/libexec/postfix
+  
+  # QUEUE AND PROCESS OWNERSHIP
+  #
+***************
+*** 595,631 ****
+  # sendmail_path: The full pathname of the Postfix sendmail command.
+  # This is the Sendmail-compatible mail posting interface.
+  # 
+! sendmail_path =
+  
+  # newaliases_path: The full pathname of the Postfix newaliases command.
+  # This is the Sendmail-compatible command to build alias databases.
+  #
+! newaliases_path =
+  
+  # mailq_path: The full pathname of the Postfix mailq command.  This
+  # is the Sendmail-compatible mail queue listing command.
+  # 
+! mailq_path =
+  
+  # setgid_group: The group for mail submission and queue management
+  # commands.  This must be a group name with a numerical group ID that
+  # is not shared with other accounts, not even with the Postfix account.
+  #
+! setgid_group =
+  
+  # html_directory: The location of the Postfix HTML documentation.
+  #
+! html_directory =
+  
+  # manpage_directory: The location of the Postfix on-line manual pages.
+  #
+! manpage_directory =
+  
+  # sample_directory: The location of the Postfix sample configuration files.
+  # This parameter is obsolete as of Postfix 2.1.
+  #
+! sample_directory =
+  
+  # readme_directory: The location of the Postfix README files.
+  #
+! readme_directory =
+--- 595,631 ----
+  # sendmail_path: The full pathname of the Postfix sendmail command.
+  # This is the Sendmail-compatible mail posting interface.
+  # 
+! sendmail_path = !!PREFIX!!/sbin/sendmail
+  
+  # newaliases_path: The full pathname of the Postfix newaliases command.
+  # This is the Sendmail-compatible command to build alias databases.
+  #
+! newaliases_path = !!PREFIX!!/bin/newaliases
+  
+  # mailq_path: The full pathname of the Postfix mailq command.  This
+  # is the Sendmail-compatible mail queue listing command.
+  # 
+! mailq_path = !!PREFIX!!/bin/mailq
+  
+  # setgid_group: The group for mail submission and queue management
+  # commands.  This must be a group name with a numerical group ID that
+  # is not shared with other accounts, not even with the Postfix account.
+  #
+! setgid_group = maildrop
+  
+  # html_directory: The location of the Postfix HTML documentation.
+  #
+! html_directory = no
+  
+  # manpage_directory: The location of the Postfix on-line manual pages.
+  #
+! manpage_directory = !!PREFIX!!/man
+  
+  # sample_directory: The location of the Postfix sample configuration files.
+  # This parameter is obsolete as of Postfix 2.1.
+  #
+! sample_directory = !!PREFIX!!/etc/postfix
+  
+  # readme_directory: The location of the Postfix README files.
+  #
+! readme_directory = no
diff -Nru postfix/pkg-install postfix.21/pkg-install
--- postfix/pkg-install	Mon Apr 19 15:26:42 2004
+++ postfix.21/pkg-install	Mon Apr 26 15:55:33 2004
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$FreeBSD: ports/mail/postfix/pkg-install,v 1.17 2004/04/13 15:08:15 des Exp $
+#	$FreeBSD: ports/mail/postfix-current/pkg-install,v 1.16 2004/04/13 15:37:52 des Exp $
 #
 
 # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
@@ -118,13 +118,14 @@
 fi
 
 if [ x"$2" = xPOST-INSTALL ]; then
-	CONF1="main.cf master.cf access aliases canonical pcre_table \
-	regexp_table relocated transport virtual"
+	# CONF1 copied from Makefile.  Keep consistent!
+	CONF1="main.cf master.cf access aliases canonical \
+	header_checks relocated transport virtual"
 
 	for file in $CONF1
 	do
 	        if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then
-        	        cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file
+        	        cp ${PKG_PREFIX}/etc/postfix/dist-$file ${PKG_PREFIX}/etc/postfix/$file
 	        fi
 	done
 
diff -Nru postfix/pkg-plist postfix.21/pkg-plist
--- postfix/pkg-plist	Thu Aug 28 10:12:11 2003
+++ postfix.21/pkg-plist	Thu Apr 29 17:15:51 2004
@@ -1,58 +1,27 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi
-@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi
-bin/rmail
+@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/sample-access
-etc/postfix/sample-aliases
-etc/postfix/sample-canonical
-etc/postfix/sample-pcre_table
-etc/postfix/sample-regexp_table
-etc/postfix/sample-relocated
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-auth.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-compatibility.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-filter.cf
-etc/postfix/sample-flush.cf
-%%SUB_IPV6%%etc/postfix/sample-ipv6.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-lmtp.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-mime.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre-access.cf
-etc/postfix/sample-pcre-body.cf
-etc/postfix/sample-pcre-header.cf
-etc/postfix/sample-qmqpd.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-regexp-access.cf
-etc/postfix/sample-regexp-body.cf
-etc/postfix/sample-regexp-header.cf
-etc/postfix/sample-relocated.cf
-etc/postfix/sample-resource.cf
-etc/postfix/sample-rewrite.cf
-etc/postfix/sample-smtp.cf
-etc/postfix/sample-smtpd.cf
-etc/postfix/sample-transport.cf
-etc/postfix/sample-virtual.cf
-etc/postfix/sample-transport
-etc/postfix/sample-virtual
-%%SUB_TLS%%etc/postfix/sample-tls.cf
+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/bounce
 libexec/postfix/cleanup
 libexec/postfix/error
@@ -61,6 +30,7 @@
 libexec/postfix/local
 libexec/postfix/master
 libexec/postfix/nqmgr
+libexec/postfix/oqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/proxymap
@@ -71,6 +41,7 @@
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/trivial-rewrite
+libexec/postfix/verify
 libexec/postfix/virtual
 %%SUB_TLS%%libexec/postfix/tlsmgr
 sbin/postalias
@@ -85,69 +56,127 @@
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
-bin/newaliases
-bin/mailq
+%%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%%/LOCAL_RECIPIENT_README
+%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/MACOSX_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%%/architecture.html
-%%PORTDOCS%%%%DOCSDIR%%/backstage.html
-%%PORTDOCS%%%%DOCSDIR%%/basic.html
-%%PORTDOCS%%%%DOCSDIR%%/big-picture.gif
-%%PORTDOCS%%%%DOCSDIR%%/big-picture.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%%/commands.html
 %%PORTDOCS%%%%DOCSDIR%%/defer.8.html
-%%PORTDOCS%%%%DOCSDIR%%/delivering.html
 %%PORTDOCS%%%%DOCSDIR%%/error.8.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/flush.8.html
-%%PORTDOCS%%%%DOCSDIR%%/goals.html
-%%PORTDOCS%%%%DOCSDIR%%/inbound.gif
+%%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%%/motivation.html
+%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
-%%PORTDOCS%%%%DOCSDIR%%/nqmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/outbound.gif
+%%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
@@ -157,24 +186,23 @@
 %%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%%/queuing.html
-%%PORTDOCS%%%%DOCSDIR%%/rate.html
-%%PORTDOCS%%%%DOCSDIR%%/receiving.html
+%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
 %%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
-%%PORTDOCS%%%%DOCSDIR%%/resource.html
-%%PORTDOCS%%%%DOCSDIR%%/rewrite.html
-%%PORTDOCS%%%%DOCSDIR%%/security.html
 %%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
 %%PORTDOCS%%%%DOCSDIR%%/showq.8.html
-%%PORTDOCS%%%%DOCSDIR%%/small-picture.gif
+%%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%%/trace.8.html
 %%PORTDOCS%%%%DOCSDIR%%/transport.5.html
 %%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
-%%PORTDOCS%%%%DOCSDIR%%/uce.html
+%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff -Nru postfix/scripts/configure postfix.21/scripts/configure
--- postfix/scripts/configure	Thu Jan  9 10:17:01 2003
+++ postfix.21/scripts/configure	Wed Jul 23 10:19:37 2003
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/mail/postfix/scripts/configure,v 1.7 2003/01/09 05:10:39 petef Exp $
+# $FreeBSD: ports/mail/postfix-current/scripts/configure,v 1.8 2003/07/23 06:30:11 erwin Exp $
 
 for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \
 	mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \
diff -Nru postfix/scripts/configure.postfix postfix.21/scripts/configure.postfix
--- postfix/scripts/configure.postfix	Fri Apr  2 11:45:09 2004
+++ postfix.21/scripts/configure.postfix	Thu Apr 29 17:05:45 2004
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: ports/mail/postfix/scripts/configure.postfix,v 1.46 2004/03/29 16:13:44 pav Exp $
+# $FreeBSD: ports/mail/postfix-current/scripts/configure.postfix,v 1.49 2004/03/25 17:37:20 osa Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -34,7 +34,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 WANT_OPENLDAP_VER)" "$status_OpenLDAP" \
+OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
 2> $tempfile
 
@@ -108,8 +108,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.16-2.0.16-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.16-2.0.16-0.9.7b/pfixtls.diff"
+			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 "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -173,9 +173,6 @@
 			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 "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
 			echo "PGSQL_SUFFIX=	+pgsql"
 			;;
 		PgSQL73)
@@ -183,9 +180,6 @@
 			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 "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
 			echo "PGSQL_SUFFIX=	+pgsql"
 			;;
 		PgSQL72)
@@ -193,9 +187,6 @@
 			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 "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
 			echo "PGSQL_SUFFIX=	+pgsql"
 			;;
 		OpenLDAP)
@@ -205,7 +196,8 @@
 			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
 		Test)
-			echo "BIN1=		smtp-sink smtp-source"
+			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)
@@ -215,7 +207,7 @@
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.21-pf-2.0.18.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.23-pf-2.1.0.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -233,7 +225,7 @@
 			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.21-pf-2.0.18.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.23-pf-2.1.0.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
>Release-Note:
>Audit-Trail:

From: Xin LI <delphij@frontfree.net>
To: Vivek Khera <vivek@khera.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/66215: update postfix to 2.1.0 release
Date: Tue, 4 May 2004 11:22:18 +0800

 --1UWUbFP1cBYEclgG
 Content-Type: multipart/mixed; boundary="/04w6evG8XlLl3ft"
 Content-Disposition: inline
 
 
 --/04w6evG8XlLl3ft
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Maintainer, would you please review my patch based on your patch, which
 upgrades postfix to 2.1.1 (just released)?
 
 To quote Wietse's comment:
 
 "Patch 01 fixes a signal 11 problem in the check_policy_service
 feature when SASL support is compiled in but turned off in the
 SMTP server (smtpd_sasl_auth_enable = no)."
 
 The new proposaled patch is in attachment.
 
 Cheers,
 --
 Xin LI <delphij frontfree net>	http://www.delphij.net/
 See complete headers for GPG key and other information.
 
 
 --/04w6evG8XlLl3ft
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=patch-postfix
 Content-Transfer-Encoding: quoted-printable
 
 Index: Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/Makefile,v
 retrieving revision 1.84
 diff -u -r1.84 Makefile
 --- Makefile	2 May 2004 17:44:03 -0000	1.84
 +++ Makefile	4 May 2004 03:17:07 -0000
 @@ -1,4 +1,4 @@
 -# New ports collection makefile for:	postfix-current
 +# New ports collection makefile for:	postfix
  # Date created: 	18 Mar 1999
  # Whom:			torstenb
  #
 @@ -15,7 +15,7 @@
  # NOTE: PCRE is enabled by default unless you specifically disable it.
 =20
  PORTNAME=3D	postfix
 -PORTVERSION=3D	2.0.20
 +PORTVERSION=3D	2.1.1
  PORTEPOCH=3D	1
  CATEGORIES=3D	mail ipv6
  MASTER_SITES=3D	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 @@ -28,13 +28,10 @@
  DISTNAME=3D	postfix-${PORTVERSION}
  DIST_SUBDIR=3D	${PORTNAME}
 =20
 -PATCH_SITES=3D	${MASTER_SITES}
 -PATCHFILES=3D	postfix-2.0-ns-mx-acl-patch.gz
 -
  MAINTAINER=3D	vivek@khera.org
  COMMENT=3D	A secure alternative to widely-used Sendmail
 =20
 -CONFLICTS=3D	courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.*=
  zmailer-2.*
 +CONFLICTS=3D	courier-0.* postfix-1.* postfix-2.0.* sendmail-8.* sendmail-*=
 -8.* smail-3.* zmailer-2.*
  USE_SUBMAKE=3D	yes
  USE_REINPLACE=3D	yes
 =20
 @@ -42,19 +39,34 @@
  	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
  	postsuper.1 sendmail.1
 =20
 -MAN5=3D	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
 -	relocated.5 transport.5 virtual.5
 +MAN5=3D	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 transport.5 virtual.5 \
 +	header_checks.5 body_checks.5
 =20
  MAN8=3D	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.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
 +	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
 =20
  # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
  # patch it.
  MAN8base=3D$(MAN8:S/tlsmgr.8//)
 =20
 -CONF1=3D	main.cf master.cf access aliases canonical pcre_table regexp_tabl=
 e \
 -	relocated transport virtual
 +CONF1=3D	main.cf master.cf access aliases canonical header_checks relocate=
 d \
 +	transport virtual
 +
 +README=3D 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
 =20
  .if !defined(DEBUG)
  MAKEFILEFLAGS+=3D	DEBUG=3D
 @@ -88,6 +100,7 @@
  	${ECHO} "all: default" >> Makefile)
 =20
  pre-patch:
 +	${ECHO} "<body>See <A HREF=3D"header_checks.5.html">header_checks.5.html<=
 /A></BODY>" > ${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
 @@ -100,9 +113,11 @@
  	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
  		${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html
  .endfor
 -.for file in faq rate rewrite uce
 +.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}/c=
 onf/${file}
 @@ -134,7 +149,7 @@
 =20
  .for file in ${CONF1}
  	${INSTALL_DATA} ${WRKSRC}/conf/${file} \
 -		${PREFIX}/etc/postfix/sample-${file}
 +		${PREFIX}/etc/postfix/dist-${file}
  .endfor
 =20
  	@${INSTALL_SCRIPT} \
 @@ -143,14 +158,12 @@
 =20
  # optional TEST binaries
  .for file in ${BIN1}
 -	@${INSTALL_PROGRAM} \
 -		${WRKSRC}/src/smtpstone/${file} \
 -		${PREFIX}/sbin
 +	@${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/sbin
  .endfor
 =20
  .if !defined(NOPORTDOCS)
  	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
 -	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
 +	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
  		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
  .endif
 =20
 Index: distinfo
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/distinfo,v
 retrieving revision 1.48
 diff -u -r1.48 distinfo
 --- distinfo	2 May 2004 17:44:03 -0000	1.48
 +++ distinfo	4 May 2004 03:17:07 -0000
 @@ -1,9 +1,8 @@
 -MD5 (postfix/postfix-2.0.20.tar.gz) =3D 92479b64d132262be505a17ec02bc2a8
 -SIZE (postfix/postfix-2.0.20.tar.gz) =3D 1354414
 -MD5 (postfix/postfix-2.0-ns-mx-acl-patch.gz) =3D 55a3d76d52fddd5cd03650049=
 57a1160
 -SIZE (postfix/postfix-2.0-ns-mx-acl-patch.gz) =3D 4673
 -MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) =3D 0d557a1331f0afc12b7decd=
 c328947a1
 -SIZE (postfix/postfix-pg.postfix-2.0.0.2.patch) =3D 27423
 -MD5 (postfix/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz) =3D b39c08eabe807db4af5b=
 cb1cafc9761e
 -MD5 (postfix/ipv6-1.21-pf-2.0.18.patch.gz) =3D f30495d44b140239df02a0599d2=
 80d68
 -MD5 (postfix/tls+ipv6-1.21-pf-2.0.18.patch.gz) =3D 8d273f922352a0ff32c57c2=
 9bec26b46
 +MD5 (postfix/postfix-2.1.1.tar.gz) =3D fd747b82f949e00040c2f101e1c7a6e4
 +SIZE (postfix/postfix-2.1.1.tar.gz) =3D 1969624
 +MD5 (postfix/pfixtls-0.8.18-2.1.0-0.9.7d.tar.gz) =3D 01785d9636bdae51a9063=
 20e581b1e6b
 +SIZE (postfix/pfixtls-0.8.18-2.1.0-0.9.7d.tar.gz) =3D 239141
 +MD5 (postfix/ipv6-1.23-pf-2.1.0.patch.gz) =3D 1939697e37d9b420b1cfbeafaa68=
 b8cc
 +SIZE (postfix/ipv6-1.23-pf-2.1.0.patch.gz) =3D 51962
 +MD5 (postfix/ipv6-1.23-pf-2.1.0.patch.gz) =3D 1939697e37d9b420b1cfbeafaa68=
 b8cc
 +SIZE (postfix/ipv6-1.23-pf-2.1.0.patch.gz) =3D 51962
 Index: pkg-install
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/pkg-install,v
 retrieving revision 1.17
 diff -u -r1.17 pkg-install
 --- pkg-install	13 Apr 2004 15:08:15 -0000	1.17
 +++ pkg-install	4 May 2004 03:17:07 -0000
 @@ -1,6 +1,6 @@
  #!/bin/sh
  #
 -#	$FreeBSD: ports/mail/postfix/pkg-install,v 1.17 2004/04/13 15:08:15 des =
 Exp $
 +#	$FreeBSD: ports/mail/postfix-current/pkg-install,v 1.16 2004/04/13 15:37=
 :52 des Exp $
  #
 =20
  # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
 @@ -118,13 +118,14 @@
  fi
 =20
  if [ x"$2" =3D xPOST-INSTALL ]; then
 -	CONF1=3D"main.cf master.cf access aliases canonical pcre_table \
 -	regexp_table relocated transport virtual"
 +	# CONF1 copied from Makefile.  Keep consistent!
 +	CONF1=3D"main.cf master.cf access aliases canonical \
 +	header_checks relocated transport virtual"
 =20
  	for file in $CONF1
  	do
  	        if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then
 -        	        cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/e=
 tc/postfix/$file
 +        	        cp ${PKG_PREFIX}/etc/postfix/dist-$file ${PKG_PREFIX}/etc=
 /postfix/$file
  	        fi
  	done
 =20
 Index: pkg-plist
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/pkg-plist,v
 retrieving revision 1.17
 diff -u -r1.17 pkg-plist
 --- pkg-plist	27 Aug 2003 20:19:57 -0000	1.17
 +++ pkg-plist	4 May 2004 03:17:07 -0000
 @@ -1,58 +1,27 @@
 -@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; th=
 en rm -f %D/etc/postfix/main.cf; fi
 -@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf=
 ; then rm -f %D/etc/postfix/master.cf; fi
 -@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then=
  rm -f %D/etc/postfix/access; fi
 -@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; th=
 en rm -f %D/etc/postfix/aliases; fi
 -@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical=
 ; then rm -f %D/etc/postfix/canonical; fi
 -@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_tab=
 le; then rm -f %D/etc/postfix/pcre_table; fi
 -@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp=
 _table; then rm -f %D/etc/postfix/regexp_table; fi
 -@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated=
 ; then rm -f %D/etc/postfix/relocated; fi
 -@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport=
 ; then rm -f %D/etc/postfix/transport; fi
 -@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; th=
 en rm -f %D/etc/postfix/virtual; fi
 -bin/rmail
 +@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 r=
 m -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/sample-access
 -etc/postfix/sample-aliases
 -etc/postfix/sample-canonical
 -etc/postfix/sample-pcre_table
 -etc/postfix/sample-regexp_table
 -etc/postfix/sample-relocated
 -etc/postfix/sample-aliases.cf
 -etc/postfix/sample-auth.cf
 -etc/postfix/sample-canonical.cf
 -etc/postfix/sample-compatibility.cf
 -etc/postfix/sample-debug.cf
 -etc/postfix/sample-filter.cf
 -etc/postfix/sample-flush.cf
 -%%SUB_IPV6%%etc/postfix/sample-ipv6.cf
 -etc/postfix/sample-ldap.cf
 -etc/postfix/sample-lmtp.cf
 -etc/postfix/sample-local.cf
 -etc/postfix/sample-main.cf
 -etc/postfix/sample-master.cf
 -etc/postfix/sample-mime.cf
 -etc/postfix/sample-misc.cf
 -etc/postfix/sample-pcre-access.cf
 -etc/postfix/sample-pcre-body.cf
 -etc/postfix/sample-pcre-header.cf
 -etc/postfix/sample-qmqpd.cf
 -etc/postfix/sample-rate.cf
 -etc/postfix/sample-regexp-access.cf
 -etc/postfix/sample-regexp-body.cf
 -etc/postfix/sample-regexp-header.cf
 -etc/postfix/sample-relocated.cf
 -etc/postfix/sample-resource.cf
 -etc/postfix/sample-rewrite.cf
 -etc/postfix/sample-smtp.cf
 -etc/postfix/sample-smtpd.cf
 -etc/postfix/sample-transport.cf
 -etc/postfix/sample-virtual.cf
 -etc/postfix/sample-transport
 -etc/postfix/sample-virtual
 -%%SUB_TLS%%etc/postfix/sample-tls.cf
 +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/bounce
  libexec/postfix/cleanup
  libexec/postfix/error
 @@ -61,6 +30,7 @@
  libexec/postfix/local
  libexec/postfix/master
  libexec/postfix/nqmgr
 +libexec/postfix/oqmgr
  libexec/postfix/pickup
  libexec/postfix/pipe
  libexec/postfix/proxymap
 @@ -71,6 +41,7 @@
  libexec/postfix/smtpd
  libexec/postfix/spawn
  libexec/postfix/trivial-rewrite
 +libexec/postfix/verify
  libexec/postfix/virtual
  %%SUB_TLS%%libexec/postfix/tlsmgr
  sbin/postalias
 @@ -85,69 +56,127 @@
  sbin/postqueue
  sbin/postsuper
  sbin/sendmail
 -bin/newaliases
 -bin/mailq
 +%%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%%/LOCAL_RECIPIENT_README
 +%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LMTP_README
 -%%PORTDOCS%%%%DOCSDIR%%/MACOSX_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%%/architecture.html
 -%%PORTDOCS%%%%DOCSDIR%%/backstage.html
 -%%PORTDOCS%%%%DOCSDIR%%/basic.html
 -%%PORTDOCS%%%%DOCSDIR%%/big-picture.gif
 -%%PORTDOCS%%%%DOCSDIR%%/big-picture.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%%/commands.html
  %%PORTDOCS%%%%DOCSDIR%%/defer.8.html
 -%%PORTDOCS%%%%DOCSDIR%%/delivering.html
  %%PORTDOCS%%%%DOCSDIR%%/error.8.html
 -%%PORTDOCS%%%%DOCSDIR%%/faq.html
  %%PORTDOCS%%%%DOCSDIR%%/flush.8.html
 -%%PORTDOCS%%%%DOCSDIR%%/goals.html
 -%%PORTDOCS%%%%DOCSDIR%%/inbound.gif
 +%%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%%/motivation.html
 +%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
  %%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
 -%%PORTDOCS%%%%DOCSDIR%%/nqmgr.8.html
 -%%PORTDOCS%%%%DOCSDIR%%/outbound.gif
 +%%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
 @@ -157,24 +186,23 @@
  %%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%%/queuing.html
 -%%PORTDOCS%%%%DOCSDIR%%/rate.html
 -%%PORTDOCS%%%%DOCSDIR%%/receiving.html
 +%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
  %%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
  %%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
 -%%PORTDOCS%%%%DOCSDIR%%/resource.html
 -%%PORTDOCS%%%%DOCSDIR%%/rewrite.html
 -%%PORTDOCS%%%%DOCSDIR%%/security.html
  %%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
  %%PORTDOCS%%%%DOCSDIR%%/showq.8.html
 -%%PORTDOCS%%%%DOCSDIR%%/small-picture.gif
 +%%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%%/trace.8.html
  %%PORTDOCS%%%%DOCSDIR%%/transport.5.html
  %%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
 -%%PORTDOCS%%%%DOCSDIR%%/uce.html
 +%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
 Index: files/patch-ea
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/files/patch-ea,v
 retrieving revision 1.4
 diff -u -r1.4 patch-ea
 --- files/patch-ea	9 Jan 2003 05:10:39 -0000	1.4
 +++ files/patch-ea	4 May 2004 03:17:07 -0000
 @@ -1,13 +0,0 @@
 -*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
 ---- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
 -***************
 -*** 118,121 ****
 -  /* FILES
 -! /*	/etc/postfix/canonical*, canonical mapping table
 -! /*	/etc/postfix/virtual*, virtual mapping table
 -  /* LICENSE
 ---- 118,121 ----
 -  /* FILES
 -! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
 -! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
 -  /* LICENSE
 Index: files/patch-eb
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/files/patch-eb,v
 retrieving revision 1.4
 diff -u -r1.4 patch-eb
 --- files/patch-eb	9 Jan 2003 05:10:39 -0000	1.4
 +++ files/patch-eb	4 May 2004 03:17:07 -0000
 @@ -1,11 +0,0 @@
 -*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
 ---- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
 -***************
 -*** 53,55 ****
 -  /* FILES
 -! /*	/etc/postfix: default Postfix configuration directory.
 -  /* ENVIRONMENT
 ---- 53,55 ----
 -  /* FILES
 -! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory.
 -  /* ENVIRONMENT
 Index: files/patch-ec
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/files/patch-ec,v
 retrieving revision 1.4
 diff -u -r1.4 patch-ec
 --- files/patch-ec	30 Jan 2002 19:59:39 -0000	1.4
 +++ files/patch-ec	4 May 2004 03:17:07 -0000
 @@ -1,41 +1,53 @@
 -*** ./src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
 ---- ./src/global/mail_params.h	Tue Jan  8 22:18:22 2002
 +*** ./src/global/mail_params.h.orig	Sat Jan 17 10:04:00 2004
 +--- ./src/global/mail_params.h	Fri Jan 30 14:48:23 2004
  ***************
 -*** 51,55 ****
 +*** 64,70 ****
 +  extern gid_t var_owner_gid;
   =20
    #define VAR_SGID_GROUP		"setgid_group"
  ! #define DEF_SGID_GROUP		"postdrop"
    extern char *var_sgid_group;
    extern gid_t var_sgid_gid;
 ---- 51,55 ----
 + =20
 +--- 64,70 ----
 +  extern gid_t var_owner_gid;
   =20
    #define VAR_SGID_GROUP		"setgid_group"
  ! #define DEF_SGID_GROUP		"maildrop"
    extern char *var_sgid_group;
    extern gid_t var_sgid_gid;
 + =20
  ***************
 -*** 170,174 ****
 -  #define VAR_PROGRAM_DIR		"program_directory"
 -  #ifndef DEF_PROGRAM_DIR
 -! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
 +*** 202,208 ****
 +    */
 +  #define VAR_DAEMON_DIR		"daemon_directory"
 +  #ifndef DEF_DAEMON_DIR
 +! #define DEF_DAEMON_DIR		"/usr/libexec/postfix"
    #endif
 +  extern char *var_daemon_dir;
   =20
 ---- 170,174 ----
 -  #define VAR_PROGRAM_DIR		"program_directory"
 -  #ifndef DEF_PROGRAM_DIR
 -! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
 +--- 202,208 ----
 +    */
 +  #define VAR_DAEMON_DIR		"daemon_directory"
 +  #ifndef DEF_DAEMON_DIR
 +! #define DEF_DAEMON_DIR		"!!PREFIX!!/libexec/postfix"
    #endif
 +  extern char *var_daemon_dir;
   =20
  ***************
 -*** 204,208 ****
 +*** 231,237 ****
 +    */
    #define VAR_CONFIG_DIR		"config_directory"
    #ifndef DEF_CONFIG_DIR
  ! #define DEF_CONFIG_DIR		"/etc/postfix"
    #endif
    extern char *var_config_dir;
 ---- 204,208 ----
 + =20
 +--- 231,237 ----
 +    */
    #define VAR_CONFIG_DIR		"config_directory"
    #ifndef DEF_CONFIG_DIR
  ! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
    #endif
    extern char *var_config_dir;
 + =20
 Index: files/patch-ed
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/files/patch-ed,v
 retrieving revision 1.2
 diff -u -r1.2 patch-ed
 --- files/patch-ed	4 Mar 2001 19:34:58 -0000	1.2
 +++ files/patch-ed	4 May 2004 03:17:07 -0000
 @@ -1,11 +0,0 @@
 -*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
 ---- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
 -***************
 -*** 15,17 ****
 -  /*	suppression. The default is direct mailbox delivery to
 -! /*	/var/[spool/]mail/\fIuser\fR; when a \fIhome_mailbox\fR
 -  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
 ---- 15,17 ----
 -  /*	suppression. The default is direct mailbox delivery to
 -! /*	/var/mail/\fIuser\fR; when a \fIhome_mailbox\fR
 -  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
 Index: files/patch-ee
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/files/patch-ee,v
 retrieving revision 1.4
 diff -u -r1.4 patch-ee
 --- files/patch-ee	9 Jan 2003 05:10:39 -0000	1.4
 +++ files/patch-ee	4 May 2004 03:17:07 -0000
 @@ -1,13 +0,0 @@
 -*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
 ---- ./src/master/master.c	Thu Jun  1 22:43:50 2000
 -***************
 -*** 104,107 ****
 -  /* FILES
 -! /*	/etc/postfix/main.cf: global configuration file.
 -! /*	/etc/postfix/master.cf: master process configuration file.
 -  /*	/var/spool/postfix/pid/master.pid: master lock file.
 ---- 104,107 ----
 -  /* FILES
 -! /*	!!PREFIX!!/etc/postfix/main.cf: global configuration file.
 -! /*	!!PREFIX!!/etc/postfix/master.cf: master process configuration file.
 -  /*	/var/spool/postfix/pid/master.pid: master lock file.
 Index: files/patch-ef
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/files/patch-ef,v
 retrieving revision 1.4
 diff -u -r1.4 patch-ef
 --- files/patch-ef	9 Jan 2003 05:10:39 -0000	1.4
 +++ files/patch-ef	4 May 2004 03:17:07 -0000
 @@ -1,11 +0,0 @@
 -*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
 ---- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
 -***************
 -*** 39,41 ****
 -  /*	/var/spool/postfix, mail queue
 -! /*	/etc/postfix, configuration files
 -  /* CONFIGURATION PARAMETERS
 ---- 39,41 ----
 -  /*	/var/spool/postfix, mail queue
 -! /*	!!PREFIX!!/etc/postfix, configuration files
 -  /* CONFIGURATION PARAMETERS
 Index: files/patch-eg
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/files/patch-eg,v
 retrieving revision 1.5
 diff -u -r1.5 patch-eg
 --- files/patch-eg	9 Jan 2003 05:10:39 -0000	1.5
 +++ files/patch-eg	4 May 2004 03:17:07 -0000
 @@ -1,20 +0,0 @@
 -*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
 ---- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
 -***************
 -*** 57,59 ****
 -  /*	The path name of the \fBsendmail.cf\fR file. Postfix configuration
 -! /*	files are kept in \fB/etc/postfix\fR.
 -  /* .IP "\fB-F \fIfull_name\fR
 ---- 57,59 ----
 -  /*	The path name of the \fBsendmail.cf\fR file. Postfix configuration
 -! /*	files are kept in \fB!!PREFIX!!/etc/postfix\fR.
 -  /* .IP "\fB-F \fIfull_name\fR
 -***************
 -*** 159,161 ****
 -  /*	/var/spool/postfix, mail queue
 -! /*	/etc/postfix, configuration files
 -  /* CONFIGURATION PARAMETERS
 ---- 159,161 ----
 -  /*	/var/spool/postfix, mail queue
 -! /*	!!PREFIX!!/etc/postfix, configuration files
 -  /* CONFIGURATION PARAMETERS
 Index: files/patch-eh
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/files/patch-eh,v
 retrieving revision 1.4
 diff -u -r1.4 patch-eh
 --- files/patch-eh	9 Jan 2003 05:10:39 -0000	1.4
 +++ files/patch-eh	4 May 2004 03:17:07 -0000
 @@ -1,11 +0,0 @@
 -*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
 ---- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
 -***************
 -*** 32,34 ****
 -  /* FILES
 -! /*	/etc/postfix/transport*
 -  /* CONFIGURATION PARAMETERS
 ---- 32,34 ----
 -  /* FILES
 -! /*	!!PREFIX!!/etc/postfix/transport*
 -  /* CONFIGURATION PARAMETERS
 Index: files/patch-main.cf
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/files/patch-main.cf,v
 retrieving revision 1.2
 diff -u -r1.2 patch-main.cf
 --- files/patch-main.cf	23 Jul 2003 07:04:08 -0000	1.2
 +++ files/patch-main.cf	4 May 2004 03:17:07 -0000
 @@ -1,58 +1,108 @@
 ---- ./conf/main.cf	Wed Jan  8 22:11:52 2003
 -+++ ./conf/main.cf	Wed Jan  8 22:11:53 2003
 -@@ -31,13 +31,13 @@
 - # The command_directory parameter specifies the location of all
 - # postXXX commands.
 - #
 --command_directory =3D /usr/sbin
 -+command_directory =3D !!PREFIX!!/sbin
 -=20
 - # The daemon_directory parameter specifies the location of all Postfix
 - # daemon programs (i.e. programs listed in the master.cf file). This
 - # directory must be owned by root.
 - #
 --daemon_directory =3D /usr/libexec/postfix
 -+daemon_directory =3D !!PREFIX!!/libexec/postfix
 -=20
 - # QUEUE AND PROCESS OWNERSHIP
 - #
 -@@ -590,32 +590,32 @@
 - # sendmail_path: The full pathname of the Postfix sendmail command.
 - # This is the Sendmail-compatible mail posting interface.
 - #=20
 --sendmail_path =3D
 -+sendmail_path =3D !!PREFIX!!/sbin/sendmail
 -=20
 - # newaliases_path: The full pathname of the Postfix newaliases command.
 - # This is the Sendmail-compatible command to build alias databases.
 - #
 --newaliases_path =3D
 -+newaliases_path =3D !!PREFIX!!/bin/newaliases
 -=20
 - # mailq_path: The full pathname of the Postfix mailq command.  This
 - # is the Sendmail-compatible mail queue listing command.
 - #=20
 --mailq_path =3D
 -+mailq_path =3D !!PREFIX!!/bin/mailq
 -=20
 - # setgid_group: The group for mail submission and queue management
 - # commands.  This must be a group name with a numerical group ID that
 - # is not shared with other accounts, not even with the Postfix account.
 - #
 --setgid_group =3D
 -+setgid_group =3D maildrop
 -=20
 - # manpage_directory: The location of the Postfix on-line manual pages.
 - #
 --manpage_directory =3D
 -+manpage_directory =3D !!PREFIX!!/man
 -=20
 - # sample_directory: The location of the Postfix sample configuration file=
 s.
 - #
 --sample_directory =3D
 -+sample_directory =3D !!PREFIX!!/etc/postfix
 -=20
 - # readme_directory: The location of the Postfix README files.
 - #
 --readme_directory =3D
 -+readme_directory =3D no
 +*** ./conf/main.cf~	Mon Apr 26 16:54:42 2004
 +--- ./conf/main.cf	Mon Apr 26 16:54:42 2004
 +***************
 +*** 32,44 ****
 +  # The command_directory parameter specifies the location of all
 +  # postXXX commands.
 +  #
 +! command_directory =3D /usr/sbin
 + =20
 +  # The daemon_directory parameter specifies the location of all Postfix
 +  # daemon programs (i.e. programs listed in the master.cf file). This
 +  # directory must be owned by root.
 +  #
 +! daemon_directory =3D /usr/libexec/postfix
 + =20
 +  # QUEUE AND PROCESS OWNERSHIP
 +  #
 +--- 32,44 ----
 +  # The command_directory parameter specifies the location of all
 +  # postXXX commands.
 +  #
 +! command_directory =3D !!PREFIX!!/sbin
 + =20
 +  # The daemon_directory parameter specifies the location of all Postfix
 +  # daemon programs (i.e. programs listed in the master.cf file). This
 +  # directory must be owned by root.
 +  #
 +! daemon_directory =3D !!PREFIX!!/libexec/postfix
 + =20
 +  # QUEUE AND PROCESS OWNERSHIP
 +  #
 +***************
 +*** 595,631 ****
 +  # sendmail_path: The full pathname of the Postfix sendmail command.
 +  # This is the Sendmail-compatible mail posting interface.
 +  #=20
 +! sendmail_path =3D
 + =20
 +  # newaliases_path: The full pathname of the Postfix newaliases command.
 +  # This is the Sendmail-compatible command to build alias databases.
 +  #
 +! newaliases_path =3D
 + =20
 +  # mailq_path: The full pathname of the Postfix mailq command.  This
 +  # is the Sendmail-compatible mail queue listing command.
 +  #=20
 +! mailq_path =3D
 + =20
 +  # setgid_group: The group for mail submission and queue management
 +  # commands.  This must be a group name with a numerical group ID that
 +  # is not shared with other accounts, not even with the Postfix account.
 +  #
 +! setgid_group =3D
 + =20
 +  # html_directory: The location of the Postfix HTML documentation.
 +  #
 +! html_directory =3D
 + =20
 +  # manpage_directory: The location of the Postfix on-line manual pages.
 +  #
 +! manpage_directory =3D
 + =20
 +  # sample_directory: The location of the Postfix sample configuration fil=
 es.
 +  # This parameter is obsolete as of Postfix 2.1.
 +  #
 +! sample_directory =3D
 + =20
 +  # readme_directory: The location of the Postfix README files.
 +  #
 +! readme_directory =3D
 +--- 595,631 ----
 +  # sendmail_path: The full pathname of the Postfix sendmail command.
 +  # This is the Sendmail-compatible mail posting interface.
 +  #=20
 +! sendmail_path =3D !!PREFIX!!/sbin/sendmail
 + =20
 +  # newaliases_path: The full pathname of the Postfix newaliases command.
 +  # This is the Sendmail-compatible command to build alias databases.
 +  #
 +! newaliases_path =3D !!PREFIX!!/bin/newaliases
 + =20
 +  # mailq_path: The full pathname of the Postfix mailq command.  This
 +  # is the Sendmail-compatible mail queue listing command.
 +  #=20
 +! mailq_path =3D !!PREFIX!!/bin/mailq
 + =20
 +  # setgid_group: The group for mail submission and queue management
 +  # commands.  This must be a group name with a numerical group ID that
 +  # is not shared with other accounts, not even with the Postfix account.
 +  #
 +! setgid_group =3D maildrop
 + =20
 +  # html_directory: The location of the Postfix HTML documentation.
 +  #
 +! html_directory =3D no
 + =20
 +  # manpage_directory: The location of the Postfix on-line manual pages.
 +  #
 +! manpage_directory =3D !!PREFIX!!/man
 + =20
 +  # sample_directory: The location of the Postfix sample configuration fil=
 es.
 +  # This parameter is obsolete as of Postfix 2.1.
 +  #
 +! sample_directory =3D !!PREFIX!!/etc/postfix
 + =20
 +  # readme_directory: The location of the Postfix README files.
 +  #
 +! readme_directory =3D no
 Index: scripts/configure
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/scripts/configure,v
 retrieving revision 1.7
 diff -u -r1.7 configure
 --- scripts/configure	9 Jan 2003 05:10:39 -0000	1.7
 +++ scripts/configure	4 May 2004 03:17:07 -0000
 @@ -1,6 +1,6 @@
  #!/bin/sh
  #
 -# $FreeBSD: ports/mail/postfix/scripts/configure,v 1.7 2003/01/09 05:10:39=
  petef Exp $
 +# $FreeBSD: ports/mail/postfix-current/scripts/configure,v 1.8 2003/07/23 =
 06:30:11 erwin Exp $
 =20
  for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \
  	mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \
 Index: scripts/configure.postfix
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/mail/postfix/scripts/configure.postfix,v
 retrieving revision 1.46
 diff -u -r1.46 configure.postfix
 --- scripts/configure.postfix	29 Mar 2004 16:13:44 -0000	1.46
 +++ scripts/configure.postfix	4 May 2004 03:17:07 -0000
 @@ -1,5 +1,5 @@
  #!/bin/sh
 -# $FreeBSD: ports/mail/postfix/scripts/configure.postfix,v 1.46 2004/03/29=
  16:13:44 pav Exp $
 +# $FreeBSD: ports/mail/postfix-current/scripts/configure.postfix,v 1.49 20=
 04/03/25 17:37:20 osa Exp $
 =20
  if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
  	exit
 @@ -34,7 +34,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 WANT_OPENLDAP_VER)" "$sta=
 tus_OpenLDAP" \
 +OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$sta=
 tus_OpenLDAP" \
  Test		"SMTP/LMTP test server and generator" "$status_Test" \
  2> $tempfile
 =20
 @@ -108,8 +108,8 @@
  			echo "USE_OPENSSL=3D	yes"
  			echo "POSTFIX_CCARGS+=3D	-DHAS_SSL -I\${OPENSSLINC}"
  			echo "POSTFIX_AUXLIBS+=3D	-L\${OPENSSLLIB} -lssl -lcrypto"
 -			echo "DISTFILES+=3D	\${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.16-0.9.7b.ta=
 r.gz"
 -			echo "EXTRA_PATCHES+=3D	\${WRKDIR}/pfixtls-0.8.16-2.0.16-0.9.7b/pfixtls=
 .diff"
 +			echo "DISTFILES+=3D	\${DISTNAME}.tar.gz pfixtls-0.8.18-2.1.0-0.9.7d.tar=
 .gz"
 +			echo "EXTRA_PATCHES+=3D	\${WRKDIR}/pfixtls-0.8.18-2.1.0-0.9.7d/pfixtls.=
 diff"
  			echo "PATCH_STRIP=3D	-p1"
  			echo "TLS_SUFFIX=3D	+tls"
  			SUB_TLS=3D""
 @@ -173,9 +173,6 @@
  			echo "LIB_DEPENDS+=3D	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
  			echo "POSTFIX_CCARGS+=3D	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCA=
 LBASE}/pgsql/include"
  			echo "POSTFIX_AUXLIBS+=3D	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib=
  -lpq -lcrypt"
 -			echo "PATCH_SITES+=3D	http://mat.cc/postfix/"
 -			echo "PATCHFILES+=3D	postfix-pg.postfix-2.0.0.2.patch"
 -			echo "PATCH_DIST_STRIP=3D -p1"
  			echo "PGSQL_SUFFIX=3D	+pgsql"
  			;;
  		PgSQL73)
 @@ -183,9 +180,6 @@
  			echo "LIB_DEPENDS+=3D	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
  			echo "POSTFIX_CCARGS+=3D	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCA=
 LBASE}/pgsql/include"
  			echo "POSTFIX_AUXLIBS+=3D	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib=
  -lpq -lcrypt"
 -			echo "PATCH_SITES+=3D	http://mat.cc/postfix/"
 -			echo "PATCHFILES+=3D	postfix-pg.postfix-2.0.0.2.patch"
 -			echo "PATCH_DIST_STRIP=3D -p1"
  			echo "PGSQL_SUFFIX=3D	+pgsql"
  			;;
  		PgSQL72)
 @@ -193,9 +187,6 @@
  			echo "LIB_DEPENDS+=3D	pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}"
  			echo "POSTFIX_CCARGS+=3D	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCA=
 LBASE}/pgsql/include"
  			echo "POSTFIX_AUXLIBS+=3D	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib=
  -lpq -lcrypt"
 -			echo "PATCH_SITES+=3D	http://mat.cc/postfix/"
 -			echo "PATCHFILES+=3D	postfix-pg.postfix-2.0.0.2.patch"
 -			echo "PATCH_DIST_STRIP=3D -p1"
  			echo "PGSQL_SUFFIX=3D	+pgsql"
  			;;
  		OpenLDAP)
 @@ -205,7 +196,8 @@
  			echo "OPENLDAP_SUFFIX=3D	+openldap"
  			;;
  		Test)
 -			echo "BIN1=3D		smtp-sink smtp-source"
 +			echo "BIN1=3D		smtp-sink smtp-source qmqp-source"
 +#			echo "MAN1+=3D		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
  			SUB_TEST=3D""
  			;;
  		IPv6)
 @@ -215,7 +207,7 @@
  				exit 1
  			fi
  			echo "PATCH_SITES+=3D	http://www.ipnet6.org/postfix/download/"
 -			echo "PATCHFILES+=3D	ipv6-1.21-pf-2.0.18.patch.gz"
 +			echo "PATCHFILES+=3D	ipv6-1.23-pf-2.1.0.patch.gz"
  			echo "PATCH_DIST_STRIP=3D	-p1"
  			echo "IPv6_SUFFIX=3D	+ipv6"
  			echo ""
 @@ -233,7 +225,7 @@
  			echo "POSTFIX_CCARGS+=3D	-DHAS_SSL -I\${OPENSSLINC}"
  			echo "POSTFIX_AUXLIBS+=3D	-L\${OPENSSLLIB} -lssl -lcrypto"
  			echo "PATCH_SITES+=3D	http://www.ipnet6.org/postfix/download/"
 -			echo "PATCHFILES+=3D	tls+ipv6-1.21-pf-2.0.18.patch.gz"
 +			echo "PATCHFILES+=3D	tls+ipv6-1.23-pf-2.1.0.patch.gz"
  			echo "PATCH_DIST_STRIP=3D	-p1"
  			echo "TLS_SUFFIX=3D	+tls+ipv6"
  			SUB_TLS=3D""
 
 --/04w6evG8XlLl3ft--
 
 --1UWUbFP1cBYEclgG
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (FreeBSD)
 
 iD8DBQFAlwxqOfuToMruuMARArdoAJ9gs9tERqUZm5uk+9A36CGD8FmEvQCeOuGO
 0lVukgbX24AgBUmvzeL3rlw=
 =kr08
 -----END PGP SIGNATURE-----
 
 --1UWUbFP1cBYEclgG--

From: Vivek Khera <vivek@khera.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/66215: update postfix to 2.1.0 release
Date: Tue, 4 May 2004 10:01:06 -0400

 On May 3, 2004, at 11:22 PM, Xin LI wrote:
 
 > Maintainer, would you please review my patch based on your patch, which
 > upgrades postfix to 2.1.1 (just released)?
 >
 
 Yeah... that happens to me *every* time I submit a postfix update... :-(
 
 Anyhow, I'll have a patch ready as soon as this one is committed.  If I 
 could see just what you updated (ie, a patch based on what you get 
 after you apply my 2.1.0 patch) it would be easier to examine.  Thanks.
 
State-Changed-From-To: open->repocopy 
State-Changed-By: pav 
State-Changed-When: Tue May 4 10:20:24 PDT 2004 
State-Changed-Why:  
I would like to request a repocopy mail/postfix -> mail/postfix20, 
to keep a 2.0.x branch of postfix around for few more months 
before all people are ready to upgrade to 2.1.x branch. 


Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: pav 
Responsible-Changed-When: Tue May 4 10:20:24 PDT 2004 
Responsible-Changed-Why:  
I would like to request a repocopy mail/postfix -> mail/postfix20, 
to keep a 2.0.x branch of postfix around for few more months 
before all people are ready to upgrade to 2.1.x branch. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=66215 

From: Roman Neuhauser <neuhauser@chello.cz>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/66215
Date: Tue, 11 May 2004 21:33:11 +0200

 I haven't been following recent postfix developments too closely, but
 why this change?
 
 .for file in ${CONF1}
 ${INSTALL_DATA} ${WRKSRC}/conf/${file} \
 -       ${PREFIX}/etc/postfix/sample-${file}
 +       ${PREFIX}/etc/postfix/dist-${file}
 .endfor
 
 That looks quite gratuitous.
 
 -- 
 FreeBSD 4.9-RELEASE-p2
 9:30PM up 13:51, 4 users, load averages: 0.00, 0.00, 0.00
State-Changed-From-To: repocopy->open 
State-Changed-By: marcus 
State-Changed-When: Tue May 11 19:23:03 PDT 2004 
State-Changed-Why:  
Repo-copy complete. 


Responsible-Changed-From-To: portmgr->pav 
Responsible-Changed-By: marcus 
Responsible-Changed-When: Tue May 11 19:23:03 PDT 2004 
Responsible-Changed-Why:  
Repo-copy complete. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=66215 

From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
To: Vivek Khera <vivek@khera.org>
Cc: Pav Lucistnik <pav@FreeBSD.org>, FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/66215: update postfix to 2.1.0 release
Date: Wed, 12 May 2004 10:18:24 +0200

 Pav Lucistnik wrote:
 
 > Synopsis: update postfix to 2.1.0 release
 > 
 > State-Changed-From-To: open->repocopy
 > State-Changed-By: pav
 > State-Changed-When: Tue May 4 10:20:24 PDT 2004
 > State-Changed-Why: 
 > I would like to request a repocopy mail/postfix -> mail/postfix20,
 > to keep a 2.0.x branch of postfix around for few more months
 > before all people are ready to upgrade to 2.1.x branch.
 
 Don't forget to
 
 - adjust CONFLICTS in mail/postfix20
 - adjust LATEST_LINK in mail/postfix20 or mail/postfix
 
 while I'm here,
 
   DISTNAME=       postfix-${PORTVERSION}
 
 seems superfluous to me.
 
 -Oliver
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Wed May 12 02:08:26 PDT 2004 
State-Changed-Why:  
Committed, thank you! Please consider update to 2.1.1 *hint hint* 

http://www.freebsd.org/cgi/query-pr.cgi?pr=66215 
>Unformatted:
