Update to 20011121

Submitted by:	osa@freebsd.org.ru

1 files changed, 66 insertions, 69 deletions

diff --git a/mail/postfix-current/files/patch-aa b/mail/postfix-current/files/patch-aa
index 74bbbb38d097..bf5ae64dc1cc 100644
--- a/mail/postfix-current/files/patch-aa
+++ b/mail/postfix-current/files/patch-aa
@@ -1,69 +1,66 @@
-*** ./conf/main.cf.orig	Fri Jan 28 09:44:47 2000
---- ./conf/main.cf	Thu Jun  1 22:01:21 2000
-***************
-*** 19,21 ****
-  #
-! command_directory = /usr/sbin
-  
---- 19,21 ----
-  #
-! command_directory = !!PREFIX!!/sbin
-  
-***************
-*** 26,28 ****
-  #
-! daemon_directory = /usr/libexec/postfix
-  
---- 26,28 ----
-  #
-! daemon_directory = !!PREFIX!!/libexec/postfix
-  
-***************
-*** 43,45 ****
-  #
-! #default_privs = nobody
-  
---- 43,45 ----
-  #
-! default_privs = nobody
-  
-***************
-*** 180,182 ****
-  #alias_database = dbm:/etc/aliases
-! #alias_database = dbm:/etc/mail/aliases
-  #alias_database = hash:/etc/aliases
---- 180,182 ----
-  #alias_database = dbm:/etc/aliases
-! #alias_database = dbm:/etc/aliases
-  #alias_database = hash:/etc/aliases
-***************
-*** 199,202 ****
-  # 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).
-  #
---- 199,202 ----
-  # 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).
-  #
-***************
-*** 209,211 ****
-  #
-! #mail_spool_directory = /var/mail
-  #mail_spool_directory = /var/spool/mail
---- 209,211 ----
-  #
-! mail_spool_directory = /var/mail
-  # mail_spool_directory = /var/spool/mail
-***************
-*** 274,277 ****
-  #
-! #header_checks = regexp:/etc/postfix/filename
-! #header_checks = pcre:/etc/postfix/filename
-  
---- 274,277 ----
-  #
-! #header_checks = regexp:!!PREFIX!!/etc/postfix/filename
-! #header_checks = pcre:!!PREFIX!!/etc/postfix/filename
-  
+--- ./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
+ #