Upgrade to 19991231.

36 files changed, 372 insertions, 768 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index e6ac3a1564a..b1b572416f9 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	postfix
-# Version required:	19990601
+# Version required:	19991231
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19990906-pl09
-PKGNAME=	postfix-19990906.09
+DISTNAME=	postfix-19991231
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 9a6a6eab5f6..a41579f7913 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990906-pl09.tar.gz) = f56882fa0a53b303f6f0d707aa73acf5
+MD5 (postfix-19991231.tar.gz) = 69a22fec63b216f053d93a2c008d027a
diff --git a/mail/postfix-current/files/patch-ab b/mail/postfix-current/files/patch-ab
index 1e48d8aacfe..32a96b27bbc 100644
--- a/mail/postfix-current/files/patch-ab
+++ b/mail/postfix-current/files/patch-ab
@@ -1,60 +1,28 @@
-*** conf/main.cf.orig	Mon Sep  6 22:20:55 1999
---- conf/main.cf	Fri Sep 10 21:49:50 1999
-***************
-*** 18,36 ****
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = /some/where/postfix/bin
-  
-  # 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
-  #
---- 18,36 ----
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = !!PREFIX!!/libexec/postfix
-  
-  # 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
-  #
-***************
-*** 47,53 ****
-  # 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
-  # 
---- 47,53 ----
-  # 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
-  # 
+--- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
++++ conf/main.cf	Sun Jan  2 21:31:24 2000
+@@ -17,14 +17,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
+ #
+@@ -41,7 +41,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
+ # 
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index e6ac3a1564a..b1b572416f9 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	postfix
-# Version required:	19990601
+# Version required:	19991231
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19990906-pl09
-PKGNAME=	postfix-19990906.09
+DISTNAME=	postfix-19991231
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 9a6a6eab5f6..a41579f7913 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990906-pl09.tar.gz) = f56882fa0a53b303f6f0d707aa73acf5
+MD5 (postfix-19991231.tar.gz) = 69a22fec63b216f053d93a2c008d027a
diff --git a/mail/postfix/files/patch-ab b/mail/postfix/files/patch-ab
index 1e48d8aacfe..32a96b27bbc 100644
--- a/mail/postfix/files/patch-ab
+++ b/mail/postfix/files/patch-ab
@@ -1,60 +1,28 @@
-*** conf/main.cf.orig	Mon Sep  6 22:20:55 1999
---- conf/main.cf	Fri Sep 10 21:49:50 1999
-***************
-*** 18,36 ****
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = /some/where/postfix/bin
-  
-  # 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
-  #
---- 18,36 ----
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = !!PREFIX!!/libexec/postfix
-  
-  # 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
-  #
-***************
-*** 47,53 ****
-  # 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
-  # 
---- 47,53 ----
-  # 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
-  # 
+--- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
++++ conf/main.cf	Sun Jan  2 21:31:24 2000
+@@ -17,14 +17,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
+ #
+@@ -41,7 +41,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
+ # 
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index e6ac3a1564a..b1b572416f9 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	postfix
-# Version required:	19990601
+# Version required:	19991231
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19990906-pl09
-PKGNAME=	postfix-19990906.09
+DISTNAME=	postfix-19991231
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
diff --git a/mail/postfix1/distinfo b/mail/postfix1/distinfo
index 9a6a6eab5f6..a41579f7913 100644
--- a/mail/postfix1/distinfo
+++ b/mail/postfix1/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990906-pl09.tar.gz) = f56882fa0a53b303f6f0d707aa73acf5
+MD5 (postfix-19991231.tar.gz) = 69a22fec63b216f053d93a2c008d027a
diff --git a/mail/postfix1/files/patch-ab b/mail/postfix1/files/patch-ab
index 1e48d8aacfe..32a96b27bbc 100644
--- a/mail/postfix1/files/patch-ab
+++ b/mail/postfix1/files/patch-ab
@@ -1,60 +1,28 @@
-*** conf/main.cf.orig	Mon Sep  6 22:20:55 1999
---- conf/main.cf	Fri Sep 10 21:49:50 1999
-***************
-*** 18,36 ****
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = /some/where/postfix/bin
-  
-  # 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
-  #
---- 18,36 ----
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = !!PREFIX!!/libexec/postfix
-  
-  # 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
-  #
-***************
-*** 47,53 ****
-  # 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
-  # 
---- 47,53 ----
-  # 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
-  # 
+--- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
++++ conf/main.cf	Sun Jan  2 21:31:24 2000
+@@ -17,14 +17,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
+ #
+@@ -41,7 +41,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
+ # 
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index e6ac3a1564a..b1b572416f9 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	postfix
-# Version required:	19990601
+# Version required:	19991231
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19990906-pl09
-PKGNAME=	postfix-19990906.09
+DISTNAME=	postfix-19991231
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo
index 9a6a6eab5f6..a41579f7913 100644
--- a/mail/postfix20/distinfo
+++ b/mail/postfix20/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990906-pl09.tar.gz) = f56882fa0a53b303f6f0d707aa73acf5
+MD5 (postfix-19991231.tar.gz) = 69a22fec63b216f053d93a2c008d027a
diff --git a/mail/postfix20/files/patch-ab b/mail/postfix20/files/patch-ab
index 1e48d8aacfe..32a96b27bbc 100644
--- a/mail/postfix20/files/patch-ab
+++ b/mail/postfix20/files/patch-ab
@@ -1,60 +1,28 @@
-*** conf/main.cf.orig	Mon Sep  6 22:20:55 1999
---- conf/main.cf	Fri Sep 10 21:49:50 1999
-***************
-*** 18,36 ****
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = /some/where/postfix/bin
-  
-  # 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
-  #
---- 18,36 ----
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = !!PREFIX!!/libexec/postfix
-  
-  # 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
-  #
-***************
-*** 47,53 ****
-  # 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
-  # 
---- 47,53 ----
-  # 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
-  # 
+--- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
++++ conf/main.cf	Sun Jan  2 21:31:24 2000
+@@ -17,14 +17,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
+ #
+@@ -41,7 +41,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
+ # 
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index e6ac3a1564a..b1b572416f9 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	postfix
-# Version required:	19990601
+# Version required:	19991231
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19990906-pl09
-PKGNAME=	postfix-19990906.09
+DISTNAME=	postfix-19991231
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo
index 9a6a6eab5f6..a41579f7913 100644
--- a/mail/postfix21/distinfo
+++ b/mail/postfix21/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990906-pl09.tar.gz) = f56882fa0a53b303f6f0d707aa73acf5
+MD5 (postfix-19991231.tar.gz) = 69a22fec63b216f053d93a2c008d027a
diff --git a/mail/postfix21/files/patch-ab b/mail/postfix21/files/patch-ab
index 1e48d8aacfe..32a96b27bbc 100644
--- a/mail/postfix21/files/patch-ab
+++ b/mail/postfix21/files/patch-ab
@@ -1,60 +1,28 @@
-*** conf/main.cf.orig	Mon Sep  6 22:20:55 1999
---- conf/main.cf	Fri Sep 10 21:49:50 1999
-***************
-*** 18,36 ****
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = /some/where/postfix/bin
-  
-  # 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
-  #
---- 18,36 ----
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = !!PREFIX!!/libexec/postfix
-  
-  # 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
-  #
-***************
-*** 47,53 ****
-  # 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
-  # 
---- 47,53 ----
-  # 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
-  # 
+--- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
++++ conf/main.cf	Sun Jan  2 21:31:24 2000
+@@ -17,14 +17,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
+ #
+@@ -41,7 +41,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
+ # 
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index e6ac3a1564a..b1b572416f9 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	postfix
-# Version required:	19990601
+# Version required:	19991231
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19990906-pl09
-PKGNAME=	postfix-19990906.09
+DISTNAME=	postfix-19991231
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo
index 9a6a6eab5f6..a41579f7913 100644
--- a/mail/postfix22/distinfo
+++ b/mail/postfix22/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990906-pl09.tar.gz) = f56882fa0a53b303f6f0d707aa73acf5
+MD5 (postfix-19991231.tar.gz) = 69a22fec63b216f053d93a2c008d027a
diff --git a/mail/postfix22/files/patch-ab b/mail/postfix22/files/patch-ab
index 1e48d8aacfe..32a96b27bbc 100644
--- a/mail/postfix22/files/patch-ab
+++ b/mail/postfix22/files/patch-ab
@@ -1,60 +1,28 @@
-*** conf/main.cf.orig	Mon Sep  6 22:20:55 1999
---- conf/main.cf	Fri Sep 10 21:49:50 1999
-***************
-*** 18,36 ****
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = /some/where/postfix/bin
-  
-  # 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
-  #
---- 18,36 ----
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = !!PREFIX!!/libexec/postfix
-  
-  # 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
-  #
-***************
-*** 47,53 ****
-  # 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
-  # 
---- 47,53 ----
-  # 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
-  # 
+--- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
++++ conf/main.cf	Sun Jan  2 21:31:24 2000
+@@ -17,14 +17,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
+ #
+@@ -41,7 +41,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
+ # 
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index e6ac3a1564a..b1b572416f9 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	postfix
-# Version required:	19990601
+# Version required:	19991231
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19990906-pl09
-PKGNAME=	postfix-19990906.09
+DISTNAME=	postfix-19991231
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo
index 9a6a6eab5f6..a41579f7913 100644
--- a/mail/postfix23/distinfo
+++ b/mail/postfix23/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990906-pl09.tar.gz) = f56882fa0a53b303f6f0d707aa73acf5
+MD5 (postfix-19991231.tar.gz) = 69a22fec63b216f053d93a2c008d027a
diff --git a/mail/postfix23/files/patch-ab b/mail/postfix23/files/patch-ab
index 1e48d8aacfe..32a96b27bbc 100644
--- a/mail/postfix23/files/patch-ab
+++ b/mail/postfix23/files/patch-ab
@@ -1,60 +1,28 @@
-*** conf/main.cf.orig	Mon Sep  6 22:20:55 1999
---- conf/main.cf	Fri Sep 10 21:49:50 1999
-***************
-*** 18,36 ****
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = /some/where/postfix/bin
-  
-  # 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
-  #
---- 18,36 ----
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = !!PREFIX!!/libexec/postfix
-  
-  # 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
-  #
-***************
-*** 47,53 ****
-  # 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
-  # 
---- 47,53 ----
-  # 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
-  # 
+--- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
++++ conf/main.cf	Sun Jan  2 21:31:24 2000
+@@ -17,14 +17,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
+ #
+@@ -41,7 +41,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
+ # 
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index e6ac3a1564a..b1b572416f9 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	postfix
-# Version required:	19990601
+# Version required:	19991231
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19990906-pl09
-PKGNAME=	postfix-19990906.09
+DISTNAME=	postfix-19991231
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo
index 9a6a6eab5f6..a41579f7913 100644
--- a/mail/postfix24/distinfo
+++ b/mail/postfix24/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990906-pl09.tar.gz) = f56882fa0a53b303f6f0d707aa73acf5
+MD5 (postfix-19991231.tar.gz) = 69a22fec63b216f053d93a2c008d027a
diff --git a/mail/postfix24/files/patch-ab b/mail/postfix24/files/patch-ab
index 1e48d8aacfe..32a96b27bbc 100644
--- a/mail/postfix24/files/patch-ab
+++ b/mail/postfix24/files/patch-ab
@@ -1,60 +1,28 @@
-*** conf/main.cf.orig	Mon Sep  6 22:20:55 1999
---- conf/main.cf	Fri Sep 10 21:49:50 1999
-***************
-*** 18,36 ****
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = /some/where/postfix/bin
-  
-  # 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
-  #
---- 18,36 ----
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = !!PREFIX!!/libexec/postfix
-  
-  # 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
-  #
-***************
-*** 47,53 ****
-  # 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
-  # 
---- 47,53 ----
-  # 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
-  # 
+--- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
++++ conf/main.cf	Sun Jan  2 21:31:24 2000
+@@ -17,14 +17,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
+ #
+@@ -41,7 +41,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
+ # 
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index e6ac3a1564a..b1b572416f9 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	postfix
-# Version required:	19990601
+# Version required:	19991231
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19990906-pl09
-PKGNAME=	postfix-19990906.09
+DISTNAME=	postfix-19991231
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
index 9a6a6eab5f6..a41579f7913 100644
--- a/mail/postfix25/distinfo
+++ b/mail/postfix25/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990906-pl09.tar.gz) = f56882fa0a53b303f6f0d707aa73acf5
+MD5 (postfix-19991231.tar.gz) = 69a22fec63b216f053d93a2c008d027a
diff --git a/mail/postfix25/files/patch-ab b/mail/postfix25/files/patch-ab
index 1e48d8aacfe..32a96b27bbc 100644
--- a/mail/postfix25/files/patch-ab
+++ b/mail/postfix25/files/patch-ab
@@ -1,60 +1,28 @@
-*** conf/main.cf.orig	Mon Sep  6 22:20:55 1999
---- conf/main.cf	Fri Sep 10 21:49:50 1999
-***************
-*** 18,36 ****
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = /some/where/postfix/bin
-  
-  # 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
-  #
---- 18,36 ----
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = !!PREFIX!!/libexec/postfix
-  
-  # 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
-  #
-***************
-*** 47,53 ****
-  # 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
-  # 
---- 47,53 ----
-  # 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
-  # 
+--- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
++++ conf/main.cf	Sun Jan  2 21:31:24 2000
+@@ -17,14 +17,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
+ #
+@@ -41,7 +41,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
+ # 
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index e6ac3a1564a..b1b572416f9 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	postfix
-# Version required:	19990601
+# Version required:	19991231
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19990906-pl09
-PKGNAME=	postfix-19990906.09
+DISTNAME=	postfix-19991231
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
index 9a6a6eab5f6..a41579f7913 100644
--- a/mail/postfix26/distinfo
+++ b/mail/postfix26/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990906-pl09.tar.gz) = f56882fa0a53b303f6f0d707aa73acf5
+MD5 (postfix-19991231.tar.gz) = 69a22fec63b216f053d93a2c008d027a
diff --git a/mail/postfix26/files/patch-ab b/mail/postfix26/files/patch-ab
index 1e48d8aacfe..32a96b27bbc 100644
--- a/mail/postfix26/files/patch-ab
+++ b/mail/postfix26/files/patch-ab
@@ -1,60 +1,28 @@
-*** conf/main.cf.orig	Mon Sep  6 22:20:55 1999
---- conf/main.cf	Fri Sep 10 21:49:50 1999
-***************
-*** 18,36 ****
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = /some/where/postfix/bin
-  
-  # 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
-  #
---- 18,36 ----
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = !!PREFIX!!/libexec/postfix
-  
-  # 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
-  #
-***************
-*** 47,53 ****
-  # 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
-  # 
---- 47,53 ----
-  # 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
-  # 
+--- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
++++ conf/main.cf	Sun Jan  2 21:31:24 2000
+@@ -17,14 +17,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
+ #
+@@ -41,7 +41,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
+ # 
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index e6ac3a1564a..b1b572416f9 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	postfix
-# Version required:	19990601
+# Version required:	19991231
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19990906-pl09
-PKGNAME=	postfix-19990906.09
+DISTNAME=	postfix-19991231
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
index 9a6a6eab5f6..a41579f7913 100644
--- a/mail/postfix27/distinfo
+++ b/mail/postfix27/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990906-pl09.tar.gz) = f56882fa0a53b303f6f0d707aa73acf5
+MD5 (postfix-19991231.tar.gz) = 69a22fec63b216f053d93a2c008d027a
diff --git a/mail/postfix27/files/patch-ab b/mail/postfix27/files/patch-ab
index 1e48d8aacfe..32a96b27bbc 100644
--- a/mail/postfix27/files/patch-ab
+++ b/mail/postfix27/files/patch-ab
@@ -1,60 +1,28 @@
-*** conf/main.cf.orig	Mon Sep  6 22:20:55 1999
---- conf/main.cf	Fri Sep 10 21:49:50 1999
-***************
-*** 18,36 ****
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = /some/where/postfix/bin
-  
-  # 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
-  #
---- 18,36 ----
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = !!PREFIX!!/libexec/postfix
-  
-  # 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
-  #
-***************
-*** 47,53 ****
-  # 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
-  # 
---- 47,53 ----
-  # 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
-  # 
+--- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
++++ conf/main.cf	Sun Jan  2 21:31:24 2000
+@@ -17,14 +17,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
+ #
+@@ -41,7 +41,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
+ # 
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index e6ac3a1564a..b1b572416f9 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	postfix
-# Version required:	19990601
+# Version required:	19991231
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19990906-pl09
-PKGNAME=	postfix-19990906.09
+DISTNAME=	postfix-19991231
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
index 9a6a6eab5f6..a41579f7913 100644
--- a/mail/postfix28/distinfo
+++ b/mail/postfix28/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990906-pl09.tar.gz) = f56882fa0a53b303f6f0d707aa73acf5
+MD5 (postfix-19991231.tar.gz) = 69a22fec63b216f053d93a2c008d027a
diff --git a/mail/postfix28/files/patch-ab b/mail/postfix28/files/patch-ab
index 1e48d8aacfe..32a96b27bbc 100644
--- a/mail/postfix28/files/patch-ab
+++ b/mail/postfix28/files/patch-ab
@@ -1,60 +1,28 @@
-*** conf/main.cf.orig	Mon Sep  6 22:20:55 1999
---- conf/main.cf	Fri Sep 10 21:49:50 1999
-***************
-*** 18,36 ****
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = /some/where/postfix/bin
-  
-  # 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
-  #
---- 18,36 ----
-  # Postfix support programs and daemons. This setting can be overruled
-  # with the command_directory and daemon_directory parameters.
-  #
-! program_directory = !!PREFIX!!/libexec/postfix
-  
-  # 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
-  #
-***************
-*** 47,53 ****
-  # 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
-  # 
---- 47,53 ----
-  # 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
-  # 
+--- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
++++ conf/main.cf	Sun Jan  2 21:31:24 2000
+@@ -17,14 +17,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
+ #
+@@ -41,7 +41,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
+ #