spamassassin: update to use latest rules file and install .asc file again

This makes the package break later in 'make install' when it finds out
that updates.spamassassin.org does not exist.

Bump PKGREVISION.

3 files changed, 17 insertions, 18 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index e6b762e5b21..3dece5ba682 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.146 2022/06/28 11:34:34 wiz Exp $
+# $NetBSD: Makefile,v 1.147 2022/08/16 14:21:48 wiz Exp $
 
 VERSION=	3.4.6
 DISTNAME=	Mail-SpamAssassin-${VERSION}
 PKGNAME=	spamassassin-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:=spamassassin/source/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=	${RULESARCHIVE}
-#DISTFILES+=	${RULESARCHIVEASC}
+DISTFILES+=	${RULESARCHIVEASC}
 #DISTFILES+=	${RULESARCHIVESHA}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -23,12 +23,12 @@ SMF_METHODS=	spamassassin
 
 # The RULESARCHIVE path is taken from the link on the Download page
 # reachable from $HOMEPAGE.
-RULESARCHIVE=		Mail-SpamAssassin-rules-3.4.4.r1873061.tgz
-#RULESARCHIVEASC=	${RULESARCHIVE}.asc
+RULESARCHIVE=		Mail-SpamAssassin-rules-3.4.6.r1888502.tgz
+RULESARCHIVEASC=	${RULESARCHIVE}.asc
 #RULESARCHIVESHA=	${RULESARCHIVE}.sha1
 FILES_SUBST+=		RULESARCHIVE=${RULESDIR}/${RULESARCHIVE}
 PLIST_SUBST+=		RULESARCHIVE=${RULESARCHIVE:Q}
-#PLIST_SUBST+=		RULESARCHIVEASC=${RULESARCHIVEASC: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
@@ -154,12 +154,7 @@ SUBST_SED.sa3+=		-e s!/usr/lib!${PREFIX}/lib!g
 SUBST_SED.sa3+=		-e s!/etc/mail/spamassassin!${PKG_SYSCONFDIR}!g
 
 .if (${OPSYS} == "NetBSD") || (${OPSYS} == "DragonFly")
-#  the 'spamd' RCD_SCRIPT behaves differently if we run NetBSD 1.6 or later
-.  if (${OPSYS} == "NetBSD") && !empty(OS_VERSION:M1.[0-5]*)
-INTERPRETER_SUPPORT=	NO
-.  else
 INTERPRETER_SUPPORT=	YES
-.  endif
 .endif
 
 # These variables are substituted in netbsd-rc-script.sh.
@@ -210,8 +205,8 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVE}	\
 		${DESTDIR}${RULESDIR}
-#	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVEASC}	\
-#		${DESTDIR}${RULESDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVEASC}	\
+		${DESTDIR}${RULESDIR}
 #	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVESHA}	\
 #		${DESTDIR}${RULESDIR}
 
diff --git a/mail/spamassassin/PLIST b/mail/spamassassin/PLIST
index b73c07b7a7e..00be83ed68a 100644
--- a/mail/spamassassin/PLIST
+++ b/mail/spamassassin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2015/09/09 19:13:48 christos Exp $
+@comment $NetBSD: PLIST,v 1.24 2022/08/16 14:21:48 wiz Exp $
 @comment Most of this PLIST is auto-generated; see Makefile.
 share/examples/spamassassin/local.cf
 share/examples/spamassassin/netbsd_lists.cf
@@ -7,3 +7,4 @@ share/spamassassin/languages
 share/spamassassin/sa-update-pubkey.txt
 share/spamassassin/user_prefs.template
 share/spamassassin/${RULESARCHIVE}
+share/spamassassin/${RULESARCHIVE}.asc
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 49b4e5ea378..b4501896842 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.79 2021/10/26 10:54:30 nia Exp $
+$NetBSD: distinfo,v 1.80 2022/08/16 14:21:48 wiz Exp $
 
 BLAKE2s (Mail-SpamAssassin-3.4.6.tar.gz) = d330863c4775e9dfc3ffb8158e3b145a3e43ff9122e686a074be7c2d1a2cb65d
 SHA512 (Mail-SpamAssassin-3.4.6.tar.gz) = 7910852f04463a7363a2fc3b70a35adadf5714552e57c5b8ca57beaa534ee18d9f06526cdbcf8bcd5781e5ca778f98d2f84ef2efd1872fa550cfe1689440364a
 Size (Mail-SpamAssassin-3.4.6.tar.gz) = 6572574 bytes
-BLAKE2s (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = a45930ab88019b844fe7128da7742fa5c6bf68c4d6a02543f10af103575cf525
-SHA512 (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = cc2f6949db4662cdcaf5dcef922e69d18320a591deb7fb98c1fb729d91d37f5164052ab6cd2e294657334874fbfc0cccdefc750910e0453cb8da0b3f263b3ede
-Size (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = 315930 bytes
+BLAKE2s (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 5ac6070924cf3093fda442bf1cbc059ea3dd98df0d9eea7eaad45eea6f7a177e
+SHA512 (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 29167c2ab50de26954181ad53395d4270b8b15b7d3bb13d6c62aa2f13ed3bb7a54adcda944bbd4c8d0cf4fe918a2eb0f542ef420af2bd96a121cb3d9b55dd572
+Size (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 369768 bytes
+BLAKE2s (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc) = e1c0171d935698f2f3241a45ae16e34d990727ba8c0d6195e658eb77e4959b04
+SHA512 (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc) = 97066dfe751aa067b14368ebd0388666522257945bd0fd37d921371682209be6bd658199ca817bb0dd345c4ddb1cebe02015ca9ca3a33f167d68b7d029a07b0c
+Size (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc) = 833 bytes
 SHA1 (patch-Makefile.PL) = bcf48afe3adce57fbe4ff0de583ca23bf5177aab
 SHA1 (patch-README) = 5d2aaecc4791e4f76df1078c17036cc23a39a8d0
 SHA1 (patch-ae) = e6e83c1de1002b8db647779d17740e67103b69d8