6 files changed, 210 insertions, 90 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 559095eb9475..608bd05ee85a 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	20011210
-PORTREVISION=	1
+PORTVERSION=	20020107
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -22,11 +21,11 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	dwcjr@FreeBSD.org
 
 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
+	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
+	postsuper.1 sendmail.1
 
-MAN5=	access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
-	transport.5 virtual.5
+MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
+	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 \
@@ -47,12 +46,14 @@ BIN1=	bounce cleanup error flush lmtp local master nqmgr pickup \
 	pipe qmgr qmqpd showq smtp smtpd spawn trivial-rewrite virtual
 
 BIN2=	postalias postcat postconf postdrop postfix \
-	postkick postlock postlog postmap postsuper sendmail
+	postkick postlock postlog postmap postqueue postsuper sendmail
 
-DOC1=	0README COMPATIBILITY DB_README DEBUG_README ETRN_README \
-	FILTER_README HISTORY INSTALL LDAP_README LICENSE LINUX_README \
-	LMTP_README MACOSX_README MYSQL_README PCRE_README PORTING \
-	QMQP_README RELEASE_NOTES SASL_README TODO ULTRIX_README UUCP_README \
+DOC1=	0README COMPATIBILITY HISTORY INSTALL LICENSE \
+	PORTING RELEASE_NOTES TODO
+
+DOC2=	DB_README DEBUG_README ETRN_README FILTER_README LDAP_README \
+	LINUX_README LMTP_README MACOSX_README MYSQL_README NFS_README \
+	PCRE_README QMQP_README SASL_README ULTRIX_README UUCP_README \
 	VERP_README VIRTUAL_README
 
 NO_LATEST_LINK=	yes
@@ -111,8 +112,8 @@ do-install:
 .endfor
 
 	@${INSTALL_SCRIPT} \
-		${WRKSRC}/conf/postfix-script-sgid \
-		${PREFIX}/etc/postfix/postfix-script
+		${WRKSRC}/conf/postfix-script \
+		${PREFIX}/etc/postfix
 	@${INSTALL_SCRIPT} \
 		${WRKSRC}/auxiliary/rmail/rmail \
 		${PREFIX}/bin/rmail
@@ -160,6 +161,9 @@ do-install:
 	@cd ${WRKSRC} && for i in ${DOC1} ; do \
 		${INSTALL_DATA} $$i ${DOCSDIR} ; done && \
 		${ECHO_MSG} "Installed text documentation in ${DOCSDIR}"
+	@cd ${WRKSRC}/README_FILES && for i in ${DOC2} ; do \
+		${INSTALL_DATA} $$i ${DOCSDIR} ; done && \
+		${ECHO_MSG} "Installed readme in ${DOCSDIR}"
 .endif
 
 	@${ECHO_MSG} '--------------------------------------------------'
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 900f04db2754..781e7f1819f4 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,2 +1,2 @@
-MD5 (postfix/snapshot-20011210.tar.gz) = 70e93ba261fd6aa81095067addc88b1f
-MD5 (postfix/pfixtls-0.7.13d-snap20011210-0.9.6b.tar.gz) = 44ff7bb84ec25d73979e14651452f069
+MD5 (postfix/snapshot-20020107.tar.gz) = 1a1ace7950289a78490d8dce93a47786
+MD5 (postfix/pfixtls-0.7.14-snap20020107-0.9.6c.tar.gz) = aa00167f2359ff854efcd39fc02bdcce
diff --git a/mail/postfix-current/files/patch-aa b/mail/postfix-current/files/patch-aa
index bf5ae64dc1cc..ab210efce359 100644
--- a/mail/postfix-current/files/patch-aa
+++ b/mail/postfix-current/files/patch-aa
@@ -1,66 +1,158 @@
---- ./conf/main.cf.orig	Wed Nov 28 13:49:04 2001
-+++ ./conf/main.cf	Wed Nov 28 13:53:04 2001
-@@ -31,14 +31,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--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). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -56,7 +56,7 @@
- # These rights are used in the absence of a recipient user context.
- # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
- #
--#default_privs = nobody
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
-@@ -306,7 +306,7 @@
- # tables that are not necessarily all under control by Postfix.
- #
- #alias_database = dbm:/etc/aliases
--#alias_database = dbm:/etc/mail/aliases
-+#alias_database = dbm:/etc/aliases
- #alias_database = hash:/etc/aliases
- #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
- 
-@@ -325,8 +325,8 @@
- #
- # The home_mailbox parameter specifies the optional pathname of a
- # mailbox file relative to a user's home directory. The default
--# mailbox file is /var/spool/mail/user or /var/mail/user.  Specify
--# "Maildir/" for qmail-style delivery (the / is required).
-+# mailbox file is /var/mail/user.  Specify "Maildir/" for
-+# qmail-style delivery (the / is required).
- #
- #home_mailbox = Mailbox
- #home_mailbox = Maildir/
-@@ -335,7 +335,7 @@
- # UNIX-style mailboxes are kept. The default setting depends on the
- # system type.
- #
--#mail_spool_directory = /var/mail
-+mail_spool_directory = /var/mail
- #mail_spool_directory = /var/spool/mail
- 
- # The mailbox_command parameter specifies the optional external
-@@ -424,7 +424,7 @@
- #
- # See also the body_checks example in the sample-filter.cf file.
- #
--#header_checks = regexp:/etc/postfix/header_checks
-+#header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks
- 
- # FAST ETRN SERVICE
- #
+*** ./conf/main.cf.orig	Fri Jan  4 13:09:04 2002
+--- ./conf/main.cf	Tue Jan  8 22:41:50 2002
+***************
+*** 31,44 ****
+  # The command_directory parameter specifies the location of all
+  # postXXX commands.  The default value is $program_directory.
+  #
+! 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). The
+  # default value is $program_directory. This directory must be owned
+  # by root.
+  #
+! daemon_directory = /usr/libexec/postfix
+  
+  # QUEUE AND PROCESS OWNERSHIP
+  #
+--- 31,44 ----
+  # The command_directory parameter specifies the location of all
+  # postXXX commands.  The default value is $program_directory.
+  #
+! 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). The
+  # default value is $program_directory. This directory must be owned
+  # by root.
+  #
+! daemon_directory = !!PREFIX!!/libexec/postfix
+  
+  # QUEUE AND PROCESS OWNERSHIP
+  #
+***************
+*** 56,62 ****
+  # These rights are used in the absence of a recipient user context.
+  # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
+  #
+! #default_privs = nobody
+  
+  # INTERNET HOST AND DOMAIN NAMES
+  # 
+--- 56,62 ----
+  # These rights are used in the absence of a recipient user context.
+  # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
+  #
+! default_privs = nobody
+  
+  # INTERNET HOST AND DOMAIN NAMES
+  # 
+***************
+*** 306,312 ****
+  # tables that are not necessarily all under control by Postfix.
+  #
+  #alias_database = dbm:/etc/aliases
+! #alias_database = dbm:/etc/mail/aliases
+  #alias_database = hash:/etc/aliases
+  #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
+  
+--- 306,312 ----
+  # tables that are not necessarily all under control by Postfix.
+  #
+  #alias_database = dbm:/etc/aliases
+! #alias_database = dbm:/etc/aliases
+  #alias_database = hash:/etc/aliases
+  #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
+  
+***************
+*** 325,332 ****
+  #
+  # The home_mailbox parameter specifies the optional pathname of a
+  # mailbox file relative to a user's home directory. The default
+! # mailbox file is /var/spool/mail/user or /var/mail/user.  Specify
+! # "Maildir/" for qmail-style delivery (the / is required).
+  #
+  #home_mailbox = Mailbox
+  #home_mailbox = Maildir/
+--- 325,332 ----
+  #
+  # The home_mailbox parameter specifies the optional pathname of a
+  # mailbox file relative to a user's home directory. The default
+! # mailbox file is /var/mail/user.  Specify "Maildir/" for
+! # qmail-style delivery (the / is required).
+  #
+  #home_mailbox = Mailbox
+  #home_mailbox = Maildir/
+***************
+*** 335,341 ****
+  # UNIX-style mailboxes are kept. The default setting depends on the
+  # system type.
+  #
+! #mail_spool_directory = /var/mail
+  #mail_spool_directory = /var/spool/mail
+  
+  # The mailbox_command parameter specifies the optional external
+--- 335,341 ----
+  # UNIX-style mailboxes are kept. The default setting depends on the
+  # system type.
+  #
+! mail_spool_directory = /var/mail
+  #mail_spool_directory = /var/spool/mail
+  
+  # The mailbox_command parameter specifies the optional external
+***************
+*** 424,430 ****
+  #
+  # See also the body_checks example in the sample-filter.cf file.
+  #
+! #header_checks = regexp:/etc/postfix/header_checks
+  
+  # FAST ETRN SERVICE
+  #
+--- 424,430 ----
+  #
+  # See also the body_checks example in the sample-filter.cf file.
+  #
+! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks
+  
+  # FAST ETRN SERVICE
+  #
+***************
+*** 498,506 ****
+  # the process marches on. If you use an X-based debugger, be sure to
+  # set up your XAUTHORITY environment variable before starting Postfix.
+  #
+! debugger_command =
+! 	 PATH=/usr/bin:/usr/X11R6/bin
+! 	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
+  
+  # INSTALL-TIME CONFIGURATION INFORMATION
+  #
+--- 498,506 ----
+  # the process marches on. If you use an X-based debugger, be sure to
+  # set up your XAUTHORITY environment variable before starting Postfix.
+  #
+! #debugger_command =
+! #	 PATH=/usr/bin:/usr/X11R6/bin
+! #	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
+  
+  # INSTALL-TIME CONFIGURATION INFORMATION
+  #
+***************
+*** 525,531 ****
+  # 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 =
+  
+  # manpage_path: The location of the Postfix on-line manual pages.
+  #
+--- 525,531 ----
+  # 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
+  
+  # manpage_path: The location of the Postfix on-line manual pages.
+  #
diff --git a/mail/postfix-current/files/patch-ec b/mail/postfix-current/files/patch-ec
index 1854b63342d7..5f5d1ad9cadc 100644
--- a/mail/postfix-current/files/patch-ec
+++ b/mail/postfix-current/files/patch-ec
@@ -1,20 +1,41 @@
-*** ./src/global/mail_params.h.orig	Wed May 31 19:18:31 2000
---- ./src/global/mail_params.h	Thu Jun  1 22:17:10 2000
+*** ./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
 ***************
-*** 155,157 ****
+*** 51,55 ****
+  
+  #define VAR_SGID_GROUP		"setgid_group"
+! #define DEF_SGID_GROUP		"postdrop"
+  extern char *var_sgid_group;
+  extern gid_t var_sgid_gid;
+--- 51,55 ----
+  
+  #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"
   #endif
---- 155,157 ----
+  
+--- 170,174 ----
+  #define VAR_PROGRAM_DIR		"program_directory"
   #ifndef DEF_PROGRAM_DIR
 ! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
   #endif
+  
 ***************
-*** 189,191 ****
+*** 204,208 ****
+  #define VAR_CONFIG_DIR		"config_directory"
   #ifndef DEF_CONFIG_DIR
 ! #define DEF_CONFIG_DIR		"/etc/postfix"
   #endif
---- 189,191 ----
+  extern char *var_config_dir;
+--- 204,208 ----
+  #define VAR_CONFIG_DIR		"config_directory"
   #ifndef DEF_CONFIG_DIR
 ! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
   #endif
+  extern char *var_config_dir;
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 89cbe7070d57..6d0a94ad171d 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -61,13 +61,14 @@ libexec/postfix/virtual
 sbin/postalias
 sbin/postcat
 sbin/postconf
+sbin/postdrop
 sbin/postfix
 sbin/postkick
 sbin/postlock
 sbin/postlog
 sbin/postmap
+sbin/postqueue
 sbin/postsuper
-sbin/postdrop
 sbin/sendmail
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
@@ -85,6 +86,7 @@ sbin/sendmail
 %%SUB_DOCS%%share/doc/postfix/LMTP_README
 %%SUB_DOCS%%share/doc/postfix/MACOSX_README
 %%SUB_DOCS%%share/doc/postfix/MYSQL_README
+%%SUB_DOCS%%share/doc/postfix/NFS_README
 %%SUB_DOCS%%share/doc/postfix/PCRE_README
 %%SUB_DOCS%%share/doc/postfix/PORTING
 %%SUB_DOCS%%share/doc/postfix/QMQP_README
@@ -134,6 +136,7 @@ sbin/sendmail
 %%SUB_DOCS%%share/doc/postfix/postlock.1.html
 %%SUB_DOCS%%share/doc/postfix/postlog.1.html
 %%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postqueue.1.html
 %%SUB_DOCS%%share/doc/postfix/postsuper.1.html
 %%SUB_DOCS%%share/doc/postfix/qmgr.8.html
 %%SUB_DOCS%%share/doc/postfix/qmqpd.8.html
diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix
index a14f77d77f03..da5218cca38c 100644
--- a/mail/postfix-current/scripts/configure.postfix
+++ b/mail/postfix-current/scripts/configure.postfix
@@ -87,8 +87,8 @@ while [ "$1" ]; do
 			echo "BIN1+=		tlsmgr"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
 			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.7.13d-snap20011210-0.9.6b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.7.13d-snap20011210-0.9.6b/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.7.14-snap20020107-0.9.6c.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.7.14-snap20020107-0.9.6c/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			SUB_TLS=""
 			;;