- Update to 2.2.1

PR:		ports/78852
Submitted by:	Marcus Grando <marcus@corp.grupos.com.br>
Approved by:	Vivek Khera <vivek@khera.org> (maintainer)

7 files changed, 100 insertions, 179 deletions

diff --git a/mail/postfix22/files/patch-conf::main.cf b/mail/postfix22/files/patch-conf::main.cf
new file mode 100644
index 000000000000..67e356de21dd
--- /dev/null
+++ b/mail/postfix22/files/patch-conf::main.cf
@@ -0,0 +1,64 @@
+--- conf/main.cf.orig	Sat Mar  5 11:53:42 2005
++++ conf/main.cf	Sat Mar  5 11:53:42 2005
+@@ -32,13 +32,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
+ #
+@@ -608,37 +608,37 @@
+ # 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
+ 
+ # html_directory: The location of the Postfix HTML documentation.
+ #
+-html_directory =
++html_directory = no
+ 
+ # 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.
+ # This parameter is obsolete as of Postfix 2.1.
+ #
+-sample_directory =
++sample_directory = !!PREFIX!!/etc/postfix
+ 
+ # readme_directory: The location of the Postfix README files.
+ #
+-readme_directory =
++readme_directory = no
diff --git a/mail/postfix22/files/patch-post-install b/mail/postfix22/files/patch-conf::post-install
index 92b2d4c2c6eb..78401de5bdf3 100644
--- a/mail/postfix22/files/patch-post-install
+++ b/mail/postfix22/files/patch-conf::post-install
@@ -1,6 +1,6 @@
---- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
-+++ ./conf/post-install	Fri Jan 18 12:32:54 2002
-@@ -183,7 +183,7 @@
+--- conf/post-install.orig	Thu Feb 24 08:06:08 2005
++++ conf/post-install	Sat Mar  5 11:53:42 2005
+@@ -185,7 +185,7 @@
  
  umask 022
  
diff --git a/mail/postfix22/files/patch-ec b/mail/postfix22/files/patch-ec
deleted file mode 100644
index a3f617235fba..000000000000
--- a/mail/postfix22/files/patch-ec
+++ /dev/null
@@ -1,53 +0,0 @@
-*** ./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
-***************
-*** 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;
-  
---- 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;
-  
-***************
-*** 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;
-  
---- 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;
-  
-***************
-*** 231,237 ****
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
---- 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/postfix22/files/patch-main.cf b/mail/postfix22/files/patch-main.cf
deleted file mode 100644
index 7775cd80efb2..000000000000
--- a/mail/postfix22/files/patch-main.cf
+++ /dev/null
@@ -1,108 +0,0 @@
-*** ./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 --git a/mail/postfix22/files/patch-makedefs b/mail/postfix22/files/patch-makedefs
index 05945c3e653a..93e28b087756 100644
--- a/mail/postfix22/files/patch-makedefs
+++ b/mail/postfix22/files/patch-makedefs
@@ -1,10 +1,10 @@
---- makedefs.orig	Wed Aug 25 06:13:57 2004
-+++ makedefs	Wed Aug 25 06:14:46 2004
-@@ -93,6 +93,8 @@
+--- makedefs.orig	Tue Feb  8 20:27:50 2005
++++ makedefs	Sat Mar  5 11:53:42 2005
+@@ -116,6 +116,8 @@
  		;;
    FreeBSD.5*)	SYSTYPE=FREEBSD5
  		;;
-+  FreeBSD.6*)	SYSTYPE=FREEBSD6
++  FreeBSD.6*)	SYSTYPE=FREEBSD5
 +		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
diff --git a/mail/postfix22/files/patch-src::global::mail_params.h b/mail/postfix22/files/patch-src::global::mail_params.h
new file mode 100644
index 000000000000..52ea5e9e5c35
--- /dev/null
+++ b/mail/postfix22/files/patch-src::global::mail_params.h
@@ -0,0 +1,29 @@
+--- src/global/mail_params.h.orig	Fri Feb 11 21:53:21 2005
++++ src/global/mail_params.h	Sat Mar  5 11:53:42 2005
+@@ -64,7 +64,7 @@
+ extern gid_t var_owner_gid;
+ 
+ #define VAR_SGID_GROUP		"setgid_group"
+-#define DEF_SGID_GROUP		"postdrop"
++#define DEF_SGID_GROUP		"maildrop"
+ extern char *var_sgid_group;
+ extern gid_t var_sgid_gid;
+ 
+@@ -221,7 +221,7 @@
+   */
+ #define VAR_DAEMON_DIR		"daemon_directory"
+ #ifndef DEF_DAEMON_DIR
+-#define DEF_DAEMON_DIR		"/usr/libexec/postfix"
++#define DEF_DAEMON_DIR		"!!PREFIX!!/libexec/postfix"
+ #endif
+ extern char *var_daemon_dir;
+ 
+@@ -250,7 +250,7 @@
+   */
+ #define VAR_CONFIG_DIR		"config_directory"
+ #ifndef DEF_CONFIG_DIR
+-#define DEF_CONFIG_DIR		"/etc/postfix"
++#define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
+ #endif
+ extern char *var_config_dir;
+ 
diff --git a/mail/postfix22/files/patch-src::util::sys_defs.h b/mail/postfix22/files/patch-src::util::sys_defs.h
deleted file mode 100644
index 4323acbde64a..000000000000
--- a/mail/postfix22/files/patch-src::util::sys_defs.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/util/sys_defs.h.orig	Wed Aug 25 06:15:02 2004
-+++ ./src/util/sys_defs.h	Wed Aug 25 06:15:18 2004
-@@ -24,7 +24,7 @@
-   * 4.4BSD and close derivatives.
-   */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
--    || defined(FREEBSD5) \
-+    || defined(FREEBSD5) || defined(FREEBSD6) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(OPENBSD3) \
-     || defined(NETBSD1) || defined(NETBSD2) \