CVS commit: pkgsrc/mail/spamassassin

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 29 08:00:46 UTC 2026

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

Log Message:
spamassassin: fix path to gpg binaries

>From Marc Baudoin

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 pkgsrc/mail/spamassassin/Makefile
cvs rdiff -u -r1.16 -r1.17 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.155 pkgsrc/mail/spamassassin/Makefile:1.156
--- pkgsrc/mail/spamassassin/Makefile:1.155     Sat Aug 30 19:30:50 2025
+++ pkgsrc/mail/spamassassin/Makefile   Thu Jan 29 08:00:46 2026
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.155 2025/08/30 19:30:50 gdt Exp $
+# $NetBSD: Makefile,v 1.156 2026/01/29 08:00:46 wiz Exp $
 
 VERSION=       4.0.2
 DISTNAME=      Mail-SpamAssassin-${VERSION}
 PKGNAME=       spamassassin-${VERSION}
+PKGREVISION=   1
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:=spamassassin/source/}
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}

Index: pkgsrc/mail/spamassassin/options.mk
diff -u pkgsrc/mail/spamassassin/options.mk:1.16 pkgsrc/mail/spamassassin/options.mk:1.17
--- pkgsrc/mail/spamassassin/options.mk:1.16    Sat Nov  2 16:25:28 2019
+++ pkgsrc/mail/spamassassin/options.mk Thu Jan 29 08:00:46 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2019/11/02 16:25:28 rillig Exp $
+# $NetBSD: options.mk,v 1.17 2026/01/29 08:00:46 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.spamassassin
 PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg1
@@ -55,10 +55,10 @@ DEPENDS+=           p5-IO-Socket-INET6-[0-9]*:../
 #
 .if empty(PKG_OPTIONS:Mgnupg1)
 DEPENDS+=              gnupg2-[0-9]*:../../security/gnupg2
-GPGPATH=               ${PREFIX}/bin/gpg2
+GPGPATH=               ${PREFIX}/bin/gpg
 .else
 DEPENDS+=              gnupg>=1.0.0:../../security/gnupg
-GPGPATH=               ${PREFIX}/bin/gpg
+GPGPATH=               ${PREFIX}/bin/gpg1
 .endif
 SUBST_CLASSES+=                gpgpath
 SUBST_STAGE.gpgpath=   pre-configure