CVS commit: pkgsrc/mail

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 29 12:11:35 UTC 2017

Modified Files:
        pkgsrc/mail/spamassassin: options.mk
Removed Files:
        pkgsrc/mail/thunderbird-enigmail: options.mk

Log Message:
Remove references to gnupg21 in preparation for its removal.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/spamassassin/options.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/mail/thunderbird-enigmail/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.13 pkgsrc/mail/spamassassin/options.mk:1.14
--- pkgsrc/mail/spamassassin/options.mk:1.13    Sun Jul  9 22:12:12 2017
+++ pkgsrc/mail/spamassassin/options.mk Tue Aug 29 12:11:35 2017
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.13 2017/07/09 22:12:12 schmonz Exp $
+# $NetBSD: options.mk,v 1.14 2017/08/29 12:11:35 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.spamassassin
-PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg2 gnupg21
+PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg2
 
 #
 # Default options
@@ -53,10 +53,7 @@ DEPENDS+=            p5-IO-Socket-INET6-[0-9]*:../
 #
 # use gnupg2 instead of gnupg1
 #
-.if !empty(PKG_OPTIONS:Mgnupg21)
-DEPENDS+=      gnupg21-[0-9]*:../../security/gnupg21
-GPGPATH=       ${PREFIX}/bin/gpg2
-.elif !empty(PKG_OPTIONS:Mgnupg2)
+.if !empty(PKG_OPTIONS:Mgnupg2)
 DEPENDS+=       gnupg2-[0-9]*:../../security/gnupg2
 GPGPATH=        ${PREFIX}/bin/gpg2
 .else