diff options
author | rillig <rillig@pkgsrc.org> | 2019-11-02 16:25:17 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2019-11-02 16:25:17 +0000 |
commit | cb939586bb2b8b07300fb8a44168e16cd97ab2ed (patch) | |
tree | b151db1ab438a9ffd9c5397b6a4fe08f07b05049 /mail/spamassassin | |
parent | acea7f0682b89f8d0999e81a81341dfe21db49fc (diff) | |
download | pkgsrc-cb939586bb2b8b07300fb8a44168e16cd97ab2ed.tar.gz |
mail: align variable assignments
pkglint -Wall -F --only aligned -r
No manual corrections.
Diffstat (limited to 'mail/spamassassin')
-rw-r--r-- | mail/spamassassin/Makefile | 18 | ||||
-rw-r--r-- | mail/spamassassin/options.mk | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index e9c663deaac..817d15dfc62 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.135 2019/08/11 13:21:42 wiz Exp $ +# $NetBSD: Makefile,v 1.136 2019/11/02 16:25:28 rillig Exp $ DISTNAME= Mail-SpamAssassin-3.4.2 PKGNAME= spamassassin-3.4.2 @@ -20,13 +20,13 @@ LICENSE= apache-2.0 SMF_METHODS= spamassassin -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} +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} #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 @@ -173,7 +173,7 @@ SA_UPDATE_FETCH_CMD= ${TOOLS_PLATFORM.curl} SA_UPDATE_FETCH_PROG= fetch SA_UPDATE_FETCH_CMD= ${TOOLS_PLATFORM.fetch} .else -DEPENDS+= wget-[0-9]*:../../net/wget +DEPENDS+= wget-[0-9]*:../../net/wget SA_UPDATE_FETCH_PROG= wget SA_UPDATE_FETCH_CMD= ${PREFIX}/bin/wget diff --git a/mail/spamassassin/options.mk b/mail/spamassassin/options.mk index 28d5f5337a1..0fee0b7cf99 100644 --- a/mail/spamassassin/options.mk +++ b/mail/spamassassin/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.15 2019/01/26 18:23:05 abs Exp $ +# $NetBSD: options.mk,v 1.16 2019/11/02 16:25:28 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.spamassassin PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg1 @@ -54,11 +54,11 @@ DEPENDS+= p5-IO-Socket-INET6-[0-9]*:../../net/p5-IO-Socket-INET6 # use gnupg2 instead of gnupg1 # .if empty(PKG_OPTIONS:Mgnupg1) -DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2 -GPGPATH= ${PREFIX}/bin/gpg2 +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 |