- Update to 1.1.13

- Remove BROKEN to 6.0
- Update patch files to use PATCH_STRIP=-p1
- Backport pkg-message from mail/postfix

PR:		ports/84781
Submitted by:	Marcus Grando <marcus@corp.grupos.com.br>
Approved by:	portmgr (erwin)

15 files changed, 119 insertions, 53 deletions

diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index 73888e079620..467765f01c17 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -12,8 +12,7 @@
 # the options are the same names as in the scripts/configure.postfix file
 
 PORTNAME=	postfix
-PORTVERSION=	1.1.12
-PORTREVISION=	1
+PORTVERSION=	1.1.13
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -32,6 +31,7 @@ COMMENT=		An alternative to widely-used Sendmail
 CONFLICTS=	courier-0.* postfix-2.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
+PATCH_STRIP=	-p1
 LATEST_LINK=	postfix1
 
 MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
@@ -65,10 +65,6 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 600000
-BROKEN=		"Does not build on FreeBSD 6.x"
-.endif
-
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
 
diff --git a/mail/postfix1/distinfo b/mail/postfix1/distinfo
index 24fa585c6712..9db2819a4f6b 100644
--- a/mail/postfix1/distinfo
+++ b/mail/postfix1/distinfo
@@ -1,8 +1,8 @@
-MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212
-SIZE (postfix/postfix-1.1.12.tar.gz) = 1190811
+MD5 (postfix/postfix-1.1.13.tar.gz) = 772f193d768a5e37b60aef37f865589c
+SIZE (postfix/postfix-1.1.13.tar.gz) = 1190791
+MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
+SIZE (postfix/postfix-pg.postfix-1.1.8.patch) = 27331
+MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
+SIZE (postfix/postfix-1.1.11+ipv6.patch.gz) = 22964
 MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
 SIZE (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 196093
-MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258
-SIZE (postfix/postfix-1.1.11+ipv6.patch.gz) = 22964
-MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
-SIZE (postfix/postfix-pg.postfix-1.1.8.patch) = 27327
diff --git a/mail/postfix1/files/patch-bd b/mail/postfix1/files/patch-bd
index ce79695f1341..5c8a2600d459 100644
--- a/mail/postfix1/files/patch-bd
+++ b/mail/postfix1/files/patch-bd
@@ -1,5 +1,5 @@
-*** ./html/local.8.html.orig	Thu Feb  3 21:15:02 2000
---- ./html/local.8.html	Thu Jun  1 22:22:30 2000
+*** postfix-1.1.13/html/local.8.html.orig	Thu Feb  3 21:15:02 2000
+--- postfix-1.1.13/html/local.8.html	Thu Jun  1 22:22:30 2000
 ***************
 *** 99,101 ****
          The default per-user mailbox is a file in  the  UNIX  mail
diff --git a/mail/postfix1/files/patch-ck b/mail/postfix1/files/patch-ck
index 6e1ddce3c8f9..1a246c52b13d 100644
--- a/mail/postfix1/files/patch-ck
+++ b/mail/postfix1/files/patch-ck
@@ -1,5 +1,5 @@
-*** ./man/man8/local.8.orig	Thu Feb  3 21:14:53 2000
---- ./man/man8/local.8	Thu Jun  1 22:42:43 2000
+*** postfix-1.1.13/man/man8/local.8.orig	Thu Feb  3 21:14:53 2000
+--- postfix-1.1.13/man/man8/local.8	Thu Jun  1 22:42:43 2000
 ***************
 *** 96,98 ****
   The default per-user mailbox is a file in the UNIX mail spool
diff --git a/mail/postfix1/files/patch-conf-main.cf b/mail/postfix1/files/patch-conf-main.cf
new file mode 100644
index 000000000000..361383c41878
--- /dev/null
+++ b/mail/postfix1/files/patch-conf-main.cf
@@ -0,0 +1,59 @@
+--- postfix-1.1.13/conf/main.cf.orig	Tue May 28 14:35:57 2002
++++ postfix-1.1.13/conf/main.cf	Wed Aug 10 19:28:08 2005
+@@ -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
+ #
+@@ -508,32 +508,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
diff --git a/mail/postfix1/files/patch-ec b/mail/postfix1/files/patch-ec
index 5f5d1ad9cadc..4ff251d7d640 100644
--- a/mail/postfix1/files/patch-ec
+++ b/mail/postfix1/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./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
+*** postfix-1.1.13/src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
+--- postfix-1.1.13/src/global/mail_params.h	Tue Jan  8 22:18:22 2002
 ***************
 *** 51,55 ****
   
diff --git a/mail/postfix1/files/patch-ed b/mail/postfix1/files/patch-ed
index f971b62720d8..7373bb600e1d 100644
--- a/mail/postfix1/files/patch-ed
+++ b/mail/postfix1/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
+*** postfix-1.1.13/src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
+--- postfix-1.1.13/src/local/mailbox.c	Thu Jun  1 22:37:48 2000
 ***************
 *** 15,17 ****
   /*	suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix1/files/patch-ei b/mail/postfix1/files/patch-ei
index 8f03b69ccc52..c70973d876e4 100644
--- a/mail/postfix1/files/patch-ei
+++ b/mail/postfix1/files/patch-ei
@@ -1,5 +1,5 @@
-*** ./src/smtpd/smtpd.h.orig	Thu Sep 14 10:17:23 2000
---- ./src/smtpd/smtpd.h	Thu Sep 14 10:17:38 2000
+*** postfix-1.1.13/src/smtpd/smtpd.h.orig	Thu Sep 14 10:17:23 2000
+--- postfix-1.1.13/src/smtpd/smtpd.h	Thu Sep 14 10:17:38 2000
 ***************
 *** 12,19 ****
     * SASL library.
diff --git a/mail/postfix1/files/patch-ej b/mail/postfix1/files/patch-ej
index 329d7bb1cf96..bae6dd4cf397 100644
--- a/mail/postfix1/files/patch-ej
+++ b/mail/postfix1/files/patch-ej
@@ -1,5 +1,5 @@
-*** ./src/smtp/smtp.h.orig	Thu Sep 14 13:04:43 2000
---- ./src/smtp/smtp.h	Thu Sep 14 13:04:53 2000
+*** postfix-1.1.13/src/smtp/smtp.h.orig	Thu Sep 14 13:04:43 2000
+--- postfix-1.1.13/src/smtp/smtp.h	Thu Sep 14 13:04:53 2000
 ***************
 *** 12,19 ****
     * SASL library.
diff --git a/mail/postfix1/files/patch-lmtp.h b/mail/postfix1/files/patch-lmtp.h
index 86d5975b2b4d..e9e3bff0f19d 100644
--- a/mail/postfix1/files/patch-lmtp.h
+++ b/mail/postfix1/files/patch-lmtp.h
@@ -1,5 +1,5 @@
---- ./src/lmtp/lmtp.h.orig	Fri Jan 19 15:43:06 2001
-+++ ./src/lmtp/lmtp.h	Sat Feb  3 14:01:09 2001
+--- postfix-1.1.13/src/lmtp/lmtp.h.orig	Fri Jan 19 15:43:06 2001
++++ postfix-1.1.13/src/lmtp/lmtp.h	Sat Feb  3 14:01:09 2001
 @@ -12,8 +12,8 @@
    * SASL library.
    */
diff --git a/mail/postfix1/files/patch-makedefs b/mail/postfix1/files/patch-makedefs
new file mode 100644
index 000000000000..bb10163bb4b2
--- /dev/null
+++ b/mail/postfix1/files/patch-makedefs
@@ -0,0 +1,13 @@
+--- postfix-1.1.13/makedefs.orig	Sat May  4 10:36:23 2002
++++ postfix-1.1.13/makedefs	Wed Aug 10 18:32:53 2005
+@@ -90,6 +90,10 @@
+ 		;;
+   FreeBSD.5*)	SYSTYPE=FREEBSD5
+ 		;;
++  FreeBSD.6*)	SYSTYPE=FREEBSD5
++		;;
++  FreeBSD.7*)	SYSTYPE=FREEBSD5
++		;;
+   OpenBSD.2*)	SYSTYPE=OPENBSD2
+ 		;;
+   OpenBSD.3*)	SYSTYPE=OPENBSD3
diff --git a/mail/postfix1/files/patch-post-install b/mail/postfix1/files/patch-post-install
index 92b2d4c2c6eb..58fc1c53a00f 100644
--- a/mail/postfix1/files/patch-post-install
+++ b/mail/postfix1/files/patch-post-install
@@ -1,5 +1,5 @@
---- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
-+++ ./conf/post-install	Fri Jan 18 12:32:54 2002
+--- postfix-1.1.13/conf/#post-install~	Fri Jan 18 12:32:54 2002
++++ postfix-1.1.13/conf/post-install	Fri Jan 18 12:32:54 2002
 @@ -183,7 +183,7 @@
  
  umask 022
diff --git a/mail/postfix1/files/patch-src::trivial-rewrite::resolve.c b/mail/postfix1/files/patch-src::trivial-rewrite::resolve.c
deleted file mode 100644
index d2a0abfadf8d..000000000000
--- a/mail/postfix1/files/patch-src::trivial-rewrite::resolve.c
+++ /dev/null
@@ -1,12 +0,0 @@
-*** ./src/trivial-rewrite/resolve.c	Mon Jul 28 16:34:38 2003
---- ./src/trivial-rewrite/resolve.c	Mon Jul 28 16:35:04 2003
-***************
-*** 148,153 ****
---- 148,154 ----
-  	    if (saved_domain)
-  		tok822_free_tree(saved_domain);
-  	    saved_domain = domain;
-+ 	    domain = 0;
-  	}
-  
-  	/*
diff --git a/mail/postfix1/pkg-message b/mail/postfix1/pkg-message
index 7fb3a804599c..d9e910d86ceb 100644
--- a/mail/postfix1/pkg-message
+++ b/mail/postfix1/pkg-message
@@ -4,28 +4,36 @@ please set these variables in your /etc/rc.conf file:
 
 sendmail_enable="YES"
 sendmail_flags="-bd"
+sendmail_pidfile="/var/spool/postfix/pid/master.pid"
+sendmail_procname="/usr/local/libexec/postfix/master"
 sendmail_outbound_enable="NO"
 sendmail_submit_enable="NO"
 sendmail_msp_queue_enable="NO"
 
-  **OR**
+This will disable Sendmail completely, and allow you to use /etc/rc.d/sendmail
+to start and stop postfix (FreeBSD 5.x and up).  For FreeBSD 4.x, it will just
+cause the system boot scripts to start sendmail for you.
 
-sendmail_enable="NONE"
+Alternatively to the above settings, you can enable postfix to start with
+the other local services, for example, after your database server starts if
+you need it to be running for postfix.  To do this, set in your rc.conf file:
 
-then type this command as root:
+sendmail_enable="NO"
+sendmail_submit_enable="NO"
+sendmail_outbound_enable="NO"
+sendmail_msp_queue_enable="NO"
 
-ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh
+Then make the following symbolic link:
 
-Either of these will disable Sendmail completely.  The latter form is useful
-if you need to wait until other local package initialization (such as ldconfig
-for Postgres or MySQL) is done.  The former method will start postfix very
-early on in the boot process.
+cd /usr/local/etc/rc.d
+ln -s /usr/local/sbin/postfix postfix.sh
 
 
-Also, you will want to disable some Sendmail-specific daily maintenance
-routines in your /etc/periodic.conf file:
+With either startup configuration, you will want to disable some
+Sendmail-specific daily maintenance routines in your /etc/periodic.conf file:
 
-daily_status_mail_rejects_enable="NO"                                      
+daily_clean_hoststat_enable="NO"
+daily_status_mail_rejects_enable="NO"
 daily_status_include_submit_mailq="NO"
 daily_submit_queuerun="NO"
 
@@ -34,3 +42,6 @@ If you are using SASL, you need to make sure that postfix has access to read
 the sasldb file.  This is accomplished by adding postfix to group mail and
 making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
 be the default for new installs).
+
+If you are upgrading from postfix version prior to 2.0, please see the README
+files for recommended changes to your configuration.
diff --git a/mail/postfix1/scripts/configure.postfix b/mail/postfix1/scripts/configure.postfix
index 6aa0216b011c..a60d0ba34630 100644
--- a/mail/postfix1/scripts/configure.postfix
+++ b/mail/postfix1/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.39 2005-05-31 08:11:30 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.40 2005-08-11 22:03:06 pav Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -92,7 +92,6 @@ for i; do
 			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
 			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz"
 			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff"
-			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;