Mirror changes to the mail/postfix package: add (commented out) support for

building STARTTLS support without IPv6.

3 files changed, 28 insertions, 9 deletions

diff --git a/mail/postfix-current/PLIST.inet6 b/mail/postfix-current/PLIST.inet6
new file mode 100644
index 00000000000..b2285b97ed7
--- /dev/null
+++ b/mail/postfix-current/PLIST.inet6
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.inet6,v 1.1 2004/08/07 17:08:26 jlam Exp $
+share/doc/postfix/IPV6_README
diff --git a/mail/postfix-current/PLIST.tls b/mail/postfix-current/PLIST.tls
index 7aa3af17056..193af99804e 100644
--- a/mail/postfix-current/PLIST.tls
+++ b/mail/postfix-current/PLIST.tls
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST.tls,v 1.2 2004/07/02 08:03:04 martti Exp $
+@comment $NetBSD: PLIST.tls,v 1.3 2004/08/07 17:08:26 jlam Exp $
 libexec/postfix/tlsmgr
 man/man8/tlsmgr.8
-share/doc/postfix/IPV6_README
diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk
index aa32df30fce..34ac11c0556 100644
--- a/mail/postfix-current/options.mk
+++ b/mail/postfix-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/08/07 08:11:26 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2004/08/07 17:08:26 jlam Exp $
 
 # Global and legacy options
 #
@@ -57,17 +57,35 @@ PKG_SUPPORTED_OPTIONS=	ldap mysql mysql4 pcre pgsql sasl
 # ###
 # ### IPv6 and STARTTLS support (http://www.ipnet6.org/postfix/)
 # ###
-# .if !empty(PKG_OPTIONS:Minet6) || !empty(PKG_OPTIONS:Mtls)
+# .if !empty(PKG_OPTIONS:Minet6)
+# .  if empty(PKG_OPTIONS:Mtls)
+# PKG_OPTIONS+=		tls
+# .  endif
+# IPV6TLS_PATCH=		tls+ipv6-1.25-pf-2.2-20040616.patch.gz
+# PATCHFILES+=		${IPV6TLS_PATCH}
+# SITES_${IPV6TLS_PATCH}=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/
+# PATCH_DIST_STRIP.${IPV6TLS_PATCH}=	-p1
+# PLIST_SRC+=		${PKGDIR}/PLIST.inet6
+# .endif
+#
+# ###
+# ### STARTTLS support (http://mirrors.loonybin.net/postfix_tls/)
+# ###
+# .if !empty(PKG_OPTIONS:Mtls)
 # .  include "../../security/openssl/buildlink3.mk"
-# PATCHFILES+=		tls+ipv6-1.25-pf-2.2-20040616.patch.gz
-# PATCH_SITES+=		ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/
-# PATCH_DIST_STRIP=	-p1
-# 
+# .  if empty(PKG_OPTIONS:Minet6)
+# TLS_PATCH=		pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz
+# PATCHFILES+=		${TLS_PATCH}
+# SITES_${TLS_PATCH}=	http://mirrors.loonybin.net/postfix_tls/	\
+# 			ftp://mirrors.loonybin.net/pub/postfix_tls/	\
+# 			ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/
+# PATCH_DIST_CAT.${TLS_PATCH}=	${TAR} -zxOf ${TLS_PATCH} "*/pfixtls.diff"
+# PATCH_DIST_STRIP.${TLS_PATCH}=	-p1
+# .  endif
 # CCARGS+=	-DHAS_SSL
 # AUXLIBS+=	-L${BUILDLINK_PREFIX.openssl}/lib			\
 # 		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib	\
 # 		-lssl -lcrypto
-# 
 # PLIST_SRC+=	${PKGDIR}/PLIST.tls
 # MESSAGE_SRC+=	${PKGDIR}/MESSAGE.tls
 # .endif