as in sysutils/duplicity, add a "gnupg2" option which makes that

gnupg2 is used rather than gnupg1 (off per default)

4 files changed, 45 insertions, 5 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 713c541d572..4fc0a906102 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2013/05/31 12:41:21 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2013/07/24 16:17:02 drochner Exp $
 
 DISTNAME=	Mail-SpamAssassin-3.3.2
 PKGNAME=	spamassassin-3.3.2
@@ -29,7 +29,6 @@ PLIST_SUBST+=   RULESARCHIVE=${RULESARCHIVE:Q}
 PLIST_SUBST+=   RULESARCHIVEASC=${RULESARCHIVEASC:Q}
 PLIST_SUBST+=   RULESARCHIVESHA=${RULESARCHIVESHA:Q}
 
-DEPENDS+=	gnupg-[0-9]*:../../security/gnupg
 DEPENDS+=	p5-Archive-Tar>=1.23:../../archivers/p5-Archive-Tar
 DEPENDS+=	p5-DB_File-[0-9]*:../../databases/p5-DB_File
 DEPENDS+=	p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 989b039be38..1b67531417e 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2013/02/25 18:41:45 gdt Exp $
+$NetBSD: distinfo,v 1.59 2013/07/24 16:17:02 drochner Exp $
 
 SHA1 (Mail-SpamAssassin-3.3.2.tar.gz) = de954f69e190496eff4a796a9bab61747f03072b
 RMD160 (Mail-SpamAssassin-3.3.2.tar.gz) = 78e22ba6ba62a48fb7d24c40170124881b975fd9
@@ -17,3 +17,4 @@ SHA1 (patch-ab) = 84ebc0f611365c00205a85cb84970772a0931ef8
 SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
 SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
 SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424
+SHA1 (patch-ba) = 1842e3fc17b3d23309336e542635eeacb67461e8
diff --git a/mail/spamassassin/options.mk b/mail/spamassassin/options.mk
index 7bd35435a4f..c04b9d497b2 100644
--- a/mail/spamassassin/options.mk
+++ b/mail/spamassassin/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.10 2012/06/12 15:45:59 wiz Exp $
+# $NetBSD: options.mk,v 1.11 2013/07/24 16:17:02 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.spamassassin
-PKG_SUPPORTED_OPTIONS=	inet6 ssl
+PKG_SUPPORTED_OPTIONS=	inet6 ssl gnupg2
 
 #
 # Default options
@@ -49,3 +49,18 @@ MAKE_PARAMS+=		ENABLE_SSL=no
 .if !empty(PKG_OPTIONS:Minet6)
 DEPENDS+=		p5-IO-Socket-INET6-[0-9]*:../../net/p5-IO-Socket-INET6
 .endif
+
+#
+# use gnupg2 instead of gnupg1
+#
+.if !empty(PKG_OPTIONS:Mgnupg2)
+DEPENDS+=       gnupg2-[0-9]*:../../security/gnupg2
+GPGPATH=        ${LOCALBASE}/bin/gpg2
+.else
+DEPENDS+=       gnupg>=1.0.0:../../security/gnupg
+GPGPATH=        ${LOCALBASE}/bin/gpg
+.endif
+SUBST_CLASSES+=		gpgpath
+SUBST_STAGE.gpgpath=	pre-configure
+SUBST_FILES.gpgpath=	sa-update.raw
+SUBST_VARS.gpgpath=	GPGPATH
diff --git a/mail/spamassassin/patches/patch-ba b/mail/spamassassin/patches/patch-ba
new file mode 100644
index 00000000000..d9997e47d42
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ba
@@ -0,0 +1,25 @@
+$NetBSD: patch-ba,v 1.4 2013/07/24 16:17:02 drochner Exp $
+
+prepare for SUBST
+
+--- sa-update.raw.orig	2011-06-06 23:59:19.000000000 +0000
++++ sa-update.raw
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w -T
++#!/usr/pkg/bin/perl -w -T
+ 
+ # <@LICENSE>
+ # Licensed to the Apache Software Foundation (ASF) under one or more
+@@ -281,10 +281,10 @@ my $GPGPath;
+ if ($GPG_ENABLED || $opt{'import'}) {
+   # find GPG in the PATH
+   # bug 4958: for *NIX it's "gpg", in Windows it's "gpg.exe"
+-  $GPGPath = 'gpg' . $Config{_exe};
++  $GPGPath = '@GPGPATH@' . $Config{_exe};
+   dbg("gpg: Searching for '$GPGPath'");
+ 
+-  if ($GPGPath = Mail::SpamAssassin::Util::find_executable_in_env_path($GPGPath)) {
++  if (-f $GPGPath) {
+     dbg("gpg: found $GPGPath");
+ 
+     # bug 5030: if GPGPath has a space, put it in quotes