CVS commit: pkgsrc/mail/spamassassin

["Hans Rosenfeld" <hans%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hans
Date:           Fri Dec 16 15:47:35 UTC 2016

Modified Files:
        pkgsrc/mail/spamassassin: options.mk

Log Message:
Add option for security/gnupg21 support.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mail/spamassassin/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/spamassassin/options.mk
diff -u pkgsrc/mail/spamassassin/options.mk:1.11 pkgsrc/mail/spamassassin/options.mk:1.12
--- pkgsrc/mail/spamassassin/options.mk:1.11    Wed Jul 24 16:17:02 2013
+++ pkgsrc/mail/spamassassin/options.mk Fri Dec 16 15:47:35 2016
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.11 2013/07/24 16:17:02 drochner Exp $
+# $NetBSD: options.mk,v 1.12 2016/12/16 15:47:35 hans Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.spamassassin
-PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg2
+PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg2 gnupg21
 
 #
 # Default options
@@ -53,7 +53,10 @@ DEPENDS+=            p5-IO-Socket-INET6-[0-9]*:../
 #
 # use gnupg2 instead of gnupg1
 #
-.if !empty(PKG_OPTIONS:Mgnupg2)
+.if !empty(PKG_OPTIONS:Mgnupg21)
+DEPENDS+=      gnupg21-[0-9]*:../../security/gnupg21
+GPGPATH=       ${LOCALBASE}/bin/gpg2
+.elif !empty(PKG_OPTIONS:Mgnupg2)
 DEPENDS+=       gnupg2-[0-9]*:../../security/gnupg2
 GPGPATH=        ${LOCALBASE}/bin/gpg2
 .else