18 files changed, 151 insertions, 325 deletions

diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index 5acef00fe967..60a21176d364 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -7,15 +7,12 @@
 
 # To pre-select options in batch mode, run make like this:
 #
-#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
+#  make -DBATCH POSTFIX_OPTIONS="DB3 PCRE"
 #
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
+# the options are the same names as in the scripts/configure.postfix file
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.13
+PORTVERSION=	1.1.12
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -28,8 +25,8 @@ MASTER_SITE_SUBDIR=	. old related/postfix
 DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	khera@kciLink.com
-COMMENT=	A secure alternative to widely-used Sendmail
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=		An alternative to widely-used Sendmail
 
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
@@ -42,8 +39,8 @@ MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
 	relocated.5 transport.5 virtual.5
 
 MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
-	smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
+	master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \
+	smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
 
 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
 # patch it.
@@ -70,15 +67,6 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
@@ -115,7 +103,7 @@ READMEDIR=${PREFIX}/share/doc/postfix
 .endif
 
 do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
+	cd ${WRKSRC}; sh postfix-install -non-interactive install_root=/ tempdir=/tmp \
 	 config_directory=${PREFIX}/etc/postfix \
 	 daemon_directory=${PREFIX}/libexec/postfix \
 	 command_directory=${PREFIX}/sbin \
diff --git a/mail/postfix1/distinfo b/mail/postfix1/distinfo
index 1a4d11248e8e..832388cccb96 100644
--- a/mail/postfix1/distinfo
+++ b/mail/postfix1/distinfo
@@ -1,5 +1,4 @@
-MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
-MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
-MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
+MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212
+MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
+MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258
+MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
diff --git a/mail/postfix1/files/patch-bd b/mail/postfix1/files/patch-bd
new file mode 100644
index 000000000000..ce79695f1341
--- /dev/null
+++ b/mail/postfix1/files/patch-bd
@@ -0,0 +1,11 @@
+*** ./html/local.8.html.orig	Thu Feb  3 21:15:02 2000
+--- ./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
+!        spool  directory (<b>/var/mail/</b><i>user</i> or <b>/var/spool/mail/</b><i>user</i>);
+         the location can be specified with  the  <b>mail</b><i>_</i><b>spool</b><i>_</i><b>direc-</b>
+--- 99,101 ----
+         The default per-user mailbox is a file in  the  UNIX  mail
+!        spool  directory (<b>/var/mail/</b><i>user</i>);
+         the location can be specified with  the  <b>mail</b><i>_</i><b>spool</b><i>_</i><b>direc-</b>
diff --git a/mail/postfix1/files/patch-ck b/mail/postfix1/files/patch-ck
new file mode 100644
index 000000000000..6e1ddce3c8f9
--- /dev/null
+++ b/mail/postfix1/files/patch-ck
@@ -0,0 +1,11 @@
+*** ./man/man8/local.8.orig	Thu Feb  3 21:14:53 2000
+--- ./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
+! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
+  the location can be specified with the \fBmail_spool_directory\fR
+--- 96,98 ----
+  The default per-user mailbox is a file in the UNIX mail spool
+! directory (\fB/var/mail/\fIuser\fR);
+  the location can be specified with the \fBmail_spool_directory\fR
diff --git a/mail/postfix1/files/patch-ea b/mail/postfix1/files/patch-ea
deleted file mode 100644
index 6c3f98d2af4f..000000000000
--- a/mail/postfix1/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/postfix1/files/patch-eb b/mail/postfix1/files/patch-eb
deleted file mode 100644
index e67680963d2d..000000000000
--- a/mail/postfix1/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/postfix1/files/patch-ee b/mail/postfix1/files/patch-ee
deleted file mode 100644
index ef44eac24b73..000000000000
--- a/mail/postfix1/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/postfix1/files/patch-ef b/mail/postfix1/files/patch-ef
deleted file mode 100644
index 586b304a103d..000000000000
--- a/mail/postfix1/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/postfix1/files/patch-eg b/mail/postfix1/files/patch-eg
deleted file mode 100644
index 2983bbfd86ea..000000000000
--- a/mail/postfix1/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/postfix1/files/patch-eh b/mail/postfix1/files/patch-eh
deleted file mode 100644
index c104c3680d21..000000000000
--- a/mail/postfix1/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/postfix1/files/patch-ei b/mail/postfix1/files/patch-ei
new file mode 100644
index 000000000000..8f03b69ccc52
--- /dev/null
+++ b/mail/postfix1/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./src/smtpd/smtpd.h.orig	Thu Sep 14 10:17:23 2000
+--- ./src/smtpd/smtpd.h	Thu Sep 14 10:17:38 2000
+***************
+*** 12,19 ****
+    * SASL library.
+    */
+  #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+  #endif
+  
+   /*
+--- 12,19 ----
+    * SASL library.
+    */
+  #ifdef USE_SASL_AUTH
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
+  #endif
+  
+   /*
diff --git a/mail/postfix1/files/patch-ej b/mail/postfix1/files/patch-ej
new file mode 100644
index 000000000000..329d7bb1cf96
--- /dev/null
+++ b/mail/postfix1/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./src/smtp/smtp.h.orig	Thu Sep 14 13:04:43 2000
+--- ./src/smtp/smtp.h	Thu Sep 14 13:04:53 2000
+***************
+*** 12,19 ****
+    * SASL library.
+    */
+  #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+  #endif
+  
+   /*
+--- 12,19 ----
+    * SASL library.
+    */
+  #ifdef USE_SASL_AUTH
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
+  #endif
+  
+   /*
diff --git a/mail/postfix1/files/patch-lmtp.h b/mail/postfix1/files/patch-lmtp.h
new file mode 100644
index 000000000000..86d5975b2b4d
--- /dev/null
+++ b/mail/postfix1/files/patch-lmtp.h
@@ -0,0 +1,13 @@
+--- ./src/lmtp/lmtp.h.orig	Fri Jan 19 15:43:06 2001
++++ ./src/lmtp/lmtp.h	Sat Feb  3 14:01:09 2001
+@@ -12,8 +12,8 @@
+   * SASL library.
+   */
+ #ifdef USE_SASL_AUTH
+-#include <sasl.h>
+-#include <saslutil.h>
++#include <sasl1/sasl.h>
++#include <sasl1/saslutil.h>
+ #endif
+ 
+  /*
diff --git a/mail/postfix1/files/patch-main.cf b/mail/postfix1/files/patch-main.cf
deleted file mode 100644
index 6281b6b6d7f1..000000000000
--- a/mail/postfix1/files/patch-main.cf
+++ /dev/null
@@ -1,58 +0,0 @@
---- ./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
diff --git a/mail/postfix1/pkg-install b/mail/postfix1/pkg-install
index 8cf5a9a5aefe..1ef1fb5b2089 100644
--- a/mail/postfix1/pkg-install
+++ b/mail/postfix1/pkg-install
@@ -3,19 +3,8 @@
 #	$FreeBSD$
 #
 
-# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
-# will make the port/package use defaults which makes postfix replaces
-# sendmail as much as possible.
-
 PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then
-    DEFAULT_REPLACE_MAILERCONF=n
-else
-    DEFAULT_REPLACE_MAILERCONF=y
-fi
 
 ask() {
     local question default answer
@@ -158,8 +147,7 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
         OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
     fi
     if [ ${OSVERSION} -ge 400014 ]; then
-        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" \
-	    ${DEFAULT_REPLACE_MAILERCONF}; then
+        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then
             mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
             echo "#"						>  /etc/mail/mailer.conf
             echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
diff --git a/mail/postfix1/pkg-message b/mail/postfix1/pkg-message
index 1c9fd6699bb9..7fb3a804599c 100644
--- a/mail/postfix1/pkg-message
+++ b/mail/postfix1/pkg-message
@@ -8,24 +8,23 @@ sendmail_outbound_enable="NO"
 sendmail_submit_enable="NO"
 sendmail_msp_queue_enable="NO"
 
-This will disable Sendmail completely.
+  **OR**
 
-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:
+sendmail_enable="NONE"
 
-sendmail_enable="NONE"                                
+then type this command as root:
 
-Then make the following symbolic link:
+ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh
 
-cd /usr/local/etc/rc.d
-ln -s /usr/local/sbin/postfix postfix.sh
+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.
 
 
 Also, you will want to disable some Sendmail-specific daily maintenance
 routines in your /etc/periodic.conf file:
 
-daily_clean_hoststat_enable="NO"
 daily_status_mail_rejects_enable="NO"                                      
 daily_status_include_submit_mailq="NO"
 daily_submit_queuerun="NO"
@@ -35,6 +34,3 @@ 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/pkg-plist b/mail/postfix1/pkg-plist
index c102595ef4bf..5b6c3c55d5b6 100644
--- a/mail/postfix1/pkg-plist
+++ b/mail/postfix1/pkg-plist
@@ -32,7 +32,6 @@ etc/postfix/sample-lmtp.cf
 etc/postfix/sample-local.cf
 etc/postfix/sample-main.cf
 etc/postfix/sample-master.cf
-etc/postfix/sample-mime.cf
 etc/postfix/sample-misc.cf
 etc/postfix/sample-pcre-access.cf
 etc/postfix/sample-pcre-body.cf
@@ -62,7 +61,6 @@ libexec/postfix/master
 libexec/postfix/nqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
-libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
 libexec/postfix/showq
@@ -88,7 +86,6 @@ bin/newaliases
 bin/mailq
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
 %%PORTDOCS%%share/doc/postfix/DB_README
 %%PORTDOCS%%share/doc/postfix/DEBUG_README
 %%PORTDOCS%%share/doc/postfix/ETRN_README
@@ -96,16 +93,13 @@ bin/mailq
 %%PORTDOCS%%share/doc/postfix/INSTALL
 %%PORTDOCS%%share/doc/postfix/LDAP_README
 %%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
 %%PORTDOCS%%share/doc/postfix/LMTP_README
 %%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
 %%PORTDOCS%%share/doc/postfix/MYSQL_README
 %%PORTDOCS%%share/doc/postfix/NFS_README
 %%PORTDOCS%%share/doc/postfix/PACKAGE_README
 %%PORTDOCS%%share/doc/postfix/PCRE_README
 %%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
 %%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
 %%PORTDOCS%%share/doc/postfix/SASL_README
 %%PORTDOCS%%share/doc/postfix/ULTRIX_README
@@ -153,7 +147,6 @@ bin/mailq
 %%PORTDOCS%%share/doc/postfix/postmap.1.html
 %%PORTDOCS%%share/doc/postfix/postqueue.1.html
 %%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
 %%PORTDOCS%%share/doc/postfix/qmgr.8.html
 %%PORTDOCS%%share/doc/postfix/qmqpd.8.html
 %%PORTDOCS%%share/doc/postfix/queuing.html
diff --git a/mail/postfix1/scripts/configure.postfix b/mail/postfix1/scripts/configure.postfix
index a86f1b590cba..a4df9aca1a88 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.37 2003-07-07 08:28:33 osa Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.38 2003-07-31 12:19:53 nectar Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -9,6 +9,8 @@ tempfile=`mktemp -t checklist`
 
 if [ "${POSTFIX_OPTIONS}" ]; then
 	set ${POSTFIX_OPTIONS}
+else
+	set PCRE
 fi
 
 for i; do
@@ -19,23 +21,15 @@ if [ -z "${BATCH}" ]; then
 	/usr/bin/dialog --title "Postfix configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
-TLS		"SSL and TLS" "$status_TLS" \
-IPv6		"IPv6 support" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
+PCRE		"Perl Compatible Regular Expressions" "$status_PCRE" \
+SASL		"Cyrus SASL (Simple Authentication and Security Layer)" "$status_SASL" \
 DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 MySQL		"MySQL map lookups" "$status_MySQL" \
-PgSQL		"PostgreSQL v7.3 map lookups" "$status_PgSQL" \
-PgSQL72		"PostgreSQL v7.2 map lookups" "$status_PgSQL72" \
-OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
-OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
-OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
+PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
+OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
+TLS		"Secure Sockets Layer and Transport Layer Security" "$status_TLS" \
+IPv6		"IPv6 support (not KAME official)" "$status_IPv6" \
 2> $tempfile
 
 	retval=$?
@@ -64,88 +58,49 @@ echo "PREFIX=	${PREFIX}"
 SUB_TLS="@comment "
 SUB_TEST="@comment "
 
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-                SASL)
-                        echo "LIB_DEPENDS+=     sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-                        echo "POSTFIX_CCARGS+=  -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-                        echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-                        echo "SASL_SUFFIX=      +sasl"
-                        if [ -f ${PREFIX}/lib/libsasl.a ]; then
-                                if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
-                                        echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                        echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                                fi
-                        fi
-                        SUB_SASL=""
-                        ;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${PREFIX}/lib/libsasl2.a ]; then
-				if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then
+for i; do
+	case $i in
+		PCRE)
+			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
+			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
+			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lpcre"
+			echo "PCRE_SUFFIX=	+pcre"
+			SUB_PCRE=""
+			;;
+		SASL)
+			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
+			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
+			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
+			echo "SASL_SUFFIX=	+sasl"
+			if [ -f ${PREFIX}/lib/libsasl.a ]; then 
+				if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 				fi
+			else
+				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			fi
+			echo ".if exists(/usr/lib/libkrb.a)"
+			echo "POSTFIX_AUXLIBS+=	-lkrb -ldes -lcom_err"
+			echo ".endif"
 			SUB_SASL=""
 			;;
-		SASLKRB)
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.14-2.0.12-0.9.7b/pfixtls.diff"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
+			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=""
 			;;
 		DB3)
-			if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
 			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			DB3_SELECTED="YES"
-			;;
-		DB40)
-			if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			DB40_SELECTED="YES"
-			;;
-		DB41)
-			if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			DB41_SELECTED="YES"
+			echo "DB3_SUFFIX=	+db3"
 			;;
 		MySQL)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
@@ -158,79 +113,46 @@ while [ "$1" ]; do
 			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
 			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
 			echo "PGSQL_SUFFIX=	+pgsql"
-			;;
-		PgSQL72)
-			echo "POSTGRESQL_PORT?=	databases/postgresql72"
-			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
 			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
+			echo "PATCHFILES+=	postfix-pg.postfix-1.1.8.patch"
 			echo "PATCH_DIST_STRIP= -p1"
-			echo "PGSQL_SUFFIX=	+pgsql"
 			;;
-		OpenLDAP12)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
+		OpenLDAP)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap12"
-			;;
-		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap20"
-			;;
-		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
- 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
- 			echo "OPENLDAP_SUFFIX=	+openldap21"
+			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
 		Test)
 			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
 		IPv6)
-			if [ X$SUB_TLS = "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
+			if [ `uname -m` != "i386" ]; then
+				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			fi
-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			IPv6SELECTED=YES
-			;;
-		IPv6TLS)
-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
+			if [ -z $SUB_TLS ]; then
+				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			fi
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls+ipv6"
-			SUB_TLS=""
+			echo "PATCH_SITES+=	http://www.cyber-magic.org/~taka/misc/"
+			echo "PATCHFILES+=	postfix-1.1.11+ipv6.patch.gz"
+			echo "PATCH_DIST_STRIP= -p1"
+			echo "IPv6_SUFFIX=	+ipv6"
+			echo ""
+			;;
+	        "")
 			;;
 		*)
-			echo "Unknown option(s): $*" > /dev/stderr
+			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
-	shift
 done
 
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
@@ -240,4 +162,4 @@ echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
 # we ask the configure questions) doesn't pick up the extensions, but
 # any subsequent build will.  so "make; make install" will build twice.
 # don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"
+#echo "PKGNAMESUFFIX=	\${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"