diff options
author | abs <abs@pkgsrc.org> | 2019-01-26 18:23:05 +0000 |
---|---|---|
committer | abs <abs@pkgsrc.org> | 2019-01-26 18:23:05 +0000 |
commit | f91467bfd09b48cd9c191a9fb405a87164895f92 (patch) | |
tree | 083cab87b420e26b819cbed38d8215f49dc3ec02 /mail | |
parent | b7205fb4a9ad6a6ba916407e83f7e317125de3a8 (diff) | |
download | pkgsrc-f91467bfd09b48cd9c191a9fb405a87164895f92.tar.gz |
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.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/spamassassin/Makefile | 13 | ||||
-rw-r--r-- | mail/spamassassin/options.mk | 14 |
2 files changed, 14 insertions, 13 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index c3663acf828..99caa06010e 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -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.4.2.r1840640.tgz #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_SYSCONFDIR}/${p} .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} diff --git a/mail/spamassassin/options.mk b/mail/spamassassin/options.mk index b399409e344..28d5f5337a1 100644 --- a/mail/spamassassin/options.mk +++ b/mail/spamassassin/options.mk @@ -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]*:../../net/p5-IO-Socket-INET6 # # 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 |