[pkgsrc/trunk]: pkgsrc/mail/postfix Support building STARTTLS support into Po...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/552dbc180a84
branches:  trunk
changeset: 479210:552dbc180a84
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 07 16:56:53 2004 +0000

description:
Support building STARTTLS support into Postfix without IPv6.

diffstat:

 mail/postfix/Makefile    |   9 +++++----
 mail/postfix/PLIST.inet6 |   2 ++
 mail/postfix/PLIST.tls   |   3 +--
 mail/postfix/distinfo    |   4 +++-
 mail/postfix/options.mk  |  29 ++++++++++++++++++++++-------
 5 files changed, 33 insertions(+), 14 deletions(-)

diffs (103 lines):

diff -r ee0a58b60632 -r 552dbc180a84 mail/postfix/Makefile
--- a/mail/postfix/Makefile     Sat Aug 07 15:58:59 2004 +0000
+++ b/mail/postfix/Makefile     Sat Aug 07 16:56:53 2004 +0000
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.148 2004/08/07 07:58:32 jlam Exp $
+# $NetBSD: Makefile,v 1.149 2004/08/07 16:56:53 jlam Exp $
 
 DISTNAME=      postfix-2.1.4
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 DIST_SUBDIR=   postfix
 
-PATCHFILES+=           postfix-2.1.1-canonical_classes-with_docs.diff
-PATCH_SITES+=          ftp://ftp.gw.com/pub/people/kim/patches/
-PATCH_DIST_STRIP=      -p1
+CLASS_PATCH=           postfix-2.1.1-canonical_classes-with_docs.diff
+PATCHFILES+=           ${CLASS_PATCH}
+SITES_${CLASS_PATCH}=  ftp://ftp.gw.com/pub/people/kim/patches/
+PATCH_DIST_STRIP.${CLASS_PATCH}=       -p1
 
 MAINTAINER=    martti%NetBSD.org@localhost
 HOMEPAGE=      http://www.postfix.org/
diff -r ee0a58b60632 -r 552dbc180a84 mail/postfix/PLIST.inet6
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/postfix/PLIST.inet6  Sat Aug 07 16:56:53 2004 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.inet6,v 1.1 2004/08/07 16:56:53 jlam Exp $
+share/doc/postfix/IPV6_README
diff -r ee0a58b60632 -r 552dbc180a84 mail/postfix/PLIST.tls
--- a/mail/postfix/PLIST.tls    Sat Aug 07 15:58:59 2004 +0000
+++ b/mail/postfix/PLIST.tls    Sat Aug 07 16:56:53 2004 +0000
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST.tls,v 1.4 2004/06/21 16:13:23 martti Exp $
+@comment $NetBSD: PLIST.tls,v 1.5 2004/08/07 16:56:53 jlam Exp $
 libexec/postfix/tlsmgr
 man/man8/tlsmgr.8
-share/doc/postfix/IPV6_README
diff -r ee0a58b60632 -r 552dbc180a84 mail/postfix/distinfo
--- a/mail/postfix/distinfo     Sat Aug 07 15:58:59 2004 +0000
+++ b/mail/postfix/distinfo     Sat Aug 07 16:56:53 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.72 2004/08/07 07:58:32 jlam Exp $
+$NetBSD: distinfo,v 1.73 2004/08/07 16:56:53 jlam Exp $
 
 SHA1 (postfix/postfix-2.1.4.tar.gz) = 64dbd7b053df4ccf2191d4200b272be06e1592a8
 Size (postfix/postfix-2.1.4.tar.gz) = 1970068 bytes
@@ -6,6 +6,8 @@
 Size (postfix/postfix-2.1.1-canonical_classes-with_docs.diff) = 13110 bytes
 SHA1 (postfix/tls+ipv6-1.25-pf-2.1.4.patch.gz) = af90da3976643f3e0f7cfb2491be090d55f40a6a
 Size (postfix/tls+ipv6-1.25-pf-2.1.4.patch.gz) = 256600 bytes
+SHA1 (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = 313d572bcd960e3cafd78ac9ee4b87bdc1f02fc8
+Size (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = 239141 bytes
 SHA1 (patch-aa) = 279b54f19289b56a423214716386c5aab79a57d5
 SHA1 (patch-ag) = 292b3b5d87f4688930fd654edfc5cb83ca8a2652
 SHA1 (patch-ai) = e7284d9b3d7b83def7994269867e443fc0394d40
diff -r ee0a58b60632 -r 552dbc180a84 mail/postfix/options.mk
--- a/mail/postfix/options.mk   Sat Aug 07 15:58:59 2004 +0000
+++ b/mail/postfix/options.mk   Sat Aug 07 16:56:53 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/08/07 07:58:32 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2004/08/07 16:56:53 jlam Exp $
 
 # Global and legacy options
 #
@@ -56,17 +56,32 @@
 ###
 ### 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.1.4.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
+
+.if !empty(PKG_OPTIONS:Mtls)
 .  include "../../security/openssl/buildlink3.mk"
-PATCHFILES+=           tls+ipv6-1.25-pf-2.1.4.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