CVS commit: pkgsrc/mail/spamassassin

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Sat Jan 26 18:23:05 UTC 2019

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

Log Message:
Switch Mail-SpamAssassin-3.4.2 to default to gnupg2 instead of gnupg1

We're now at the point where gnupg2 makes more sense as a default.

Bump PKGREVISION

Also, some spaces to tabs.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 pkgsrc/mail/spamassassin/Makefile
cvs rdiff -u -r1.14 -r1.15 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/Makefile
diff -u pkgsrc/mail/spamassassin/Makefile:1.132 pkgsrc/mail/spamassassin/Makefile:1.133
--- pkgsrc/mail/spamassassin/Makefile:1.132     Thu Oct 18 19:54:32 2018
+++ pkgsrc/mail/spamassassin/Makefile   Sat Jan 26 18:23:05 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.132 2018/10/18 19:54:32 bsiegert Exp $
+# $NetBSD: Makefile,v 1.133 2019/01/26 18:23:05 abs Exp $
 
 DISTNAME=      Mail-SpamAssassin-3.4.2
 PKGNAME=       spamassassin-3.4.2
+PKGREVISION=   1
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:=spamassassin/source/}
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
@@ -23,9 +24,9 @@ RULESARCHIVE= Mail-SpamAssassin-rules-3.
 #RULESARCHIVEASC=${RULESARCHIVE}.asc
 #RULESARCHIVESHA=${RULESARCHIVE}.sha1
 FILES_SUBST+=  RULESARCHIVE=${RULESDIR}/${RULESARCHIVE}
-PLIST_SUBST+=   RULESARCHIVE=${RULESARCHIVE:Q}
-#PLIST_SUBST+=   RULESARCHIVEASC=${RULESARCHIVEASC:Q}
-#PLIST_SUBST+=   RULESARCHIVESHA=${RULESARCHIVESHA:Q}
+PLIST_SUBST+=  RULESARCHIVE=${RULESARCHIVE:Q}
+#PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q}
+#PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q}
 
 #DEPENDS+=     {perl>=5.9.3,p5-Archive-Tar>=1.23}:../../archivers/p5-Archive-Tar
 #DEPENDS+=     {perl>=5,p5-DB_File-[0-9]*}:../../databases/p5-DB_File
@@ -105,7 +106,7 @@ CONF_FILES+=                ${EGDIR}/${p}  ${PKG_SYSCO
 .endfor
 CONF_FILES+=           ${EGDIR}/local.cf  ${PKG_SYSCONFDIR}/local.cf   \
                        ${RULESDIR}/user_prefs.template                 \
-                         ${PKG_SYSCONFDIR}/user_prefs.template
+                         ${PKG_SYSCONFDIR}/user_prefs.template
 
 SA_INSTALLDIRS=                ${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/ldap
 SA_INSTALLDIRS+=       ${DOC_SUBDIR}/rules ${DOC_SUBDIR}/spamc
@@ -204,7 +205,7 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR}
-       ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVE}       \
+       ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVE}       \
                ${DESTDIR}${RULESDIR}
 #      ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVEASC}    \
 #              ${DESTDIR}${RULESDIR}

Index: pkgsrc/mail/spamassassin/options.mk
diff -u pkgsrc/mail/spamassassin/options.mk:1.14 pkgsrc/mail/spamassassin/options.mk:1.15
--- pkgsrc/mail/spamassassin/options.mk:1.14    Tue Aug 29 12:11:35 2017
+++ pkgsrc/mail/spamassassin/options.mk Sat Jan 26 18:23:05 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.14 2017/08/29 12:11:35 wiz Exp $
+# $NetBSD: options.mk,v 1.15 2019/01/26 18:23:05 abs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.spamassassin
-PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg2
+PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg1
 
 #
 # Default options
@@ -53,12 +53,12 @@ DEPENDS+=           p5-IO-Socket-INET6-[0-9]*:../
 #
 # use gnupg2 instead of gnupg1
 #
-.if !empty(PKG_OPTIONS:Mgnupg2)
-DEPENDS+=       gnupg2-[0-9]*:../../security/gnupg2
-GPGPATH=        ${PREFIX}/bin/gpg2
+.if empty(PKG_OPTIONS:Mgnupg1)
+DEPENDS+=      gnupg2-[0-9]*:../../security/gnupg2
+GPGPATH=       ${PREFIX}/bin/gpg2
 .else
-DEPENDS+=       gnupg>=1.0.0:../../security/gnupg
-GPGPATH=        ${PREFIX}/bin/gpg
+DEPENDS+=      gnupg>=1.0.0:../../security/gnupg
+GPGPATH=       ${PREFIX}/bin/gpg
 .endif
 SUBST_CLASSES+=                gpgpath
 SUBST_STAGE.gpgpath=   pre-configure