- Update to 2.1.0

PR:		ports/66215
Submitted by:	Vivek Khera <vivek@khera.org> (maintainer)

9 files changed, 134 insertions, 162 deletions

diff --git a/mail/postfix/files/patch-ea b/mail/postfix/files/patch-ea
deleted file mode 100644
index 6c3f98d2af4f..000000000000
--- a/mail/postfix/files/patch-ea
+++ /dev/null
@@ -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 --git a/mail/postfix/files/patch-eb b/mail/postfix/files/patch-eb
deleted file mode 100644
index e67680963d2d..000000000000
--- a/mail/postfix/files/patch-eb
+++ /dev/null
@@ -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 --git a/mail/postfix/files/patch-ec b/mail/postfix/files/patch-ec
index 5f5d1ad9cadc..a3f617235fba 100644
--- a/mail/postfix/files/patch-ec
+++ b/mail/postfix/files/patch-ec
@@ -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 --git a/mail/postfix/files/patch-ed b/mail/postfix/files/patch-ed
deleted file mode 100644
index f971b62720d8..000000000000
--- a/mail/postfix/files/patch-ed
+++ /dev/null
@@ -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 --git a/mail/postfix/files/patch-ee b/mail/postfix/files/patch-ee
deleted file mode 100644
index ef44eac24b73..000000000000
--- a/mail/postfix/files/patch-ee
+++ /dev/null
@@ -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 --git a/mail/postfix/files/patch-ef b/mail/postfix/files/patch-ef
deleted file mode 100644
index 586b304a103d..000000000000
--- a/mail/postfix/files/patch-ef
+++ /dev/null
@@ -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 --git a/mail/postfix/files/patch-eg b/mail/postfix/files/patch-eg
deleted file mode 100644
index 2983bbfd86ea..000000000000
--- a/mail/postfix/files/patch-eg
+++ /dev/null
@@ -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 --git a/mail/postfix/files/patch-eh b/mail/postfix/files/patch-eh
deleted file mode 100644
index c104c3680d21..000000000000
--- a/mail/postfix/files/patch-eh
+++ /dev/null
@@ -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 --git a/mail/postfix/files/patch-main.cf b/mail/postfix/files/patch-main.cf
index 6281b6b6d7f1..7775cd80efb2 100644
--- a/mail/postfix/files/patch-main.cf
+++ b/mail/postfix/files/patch-main.cf
@@ -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