git: c016d4a862d3 - main - mail/spamassassin-dqs: update to 1.4.0

From: Larry Rosenman <ler_at_FreeBSD.org>
Date: Tue, 03 Jan 2023 17:00:41 UTC
The branch main has been updated by ler:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c016d4a862d35a05d155bed5e59b7f3f4bc9540a

commit c016d4a862d35a05d155bed5e59b7f3f4bc9540a
Author:     Larry Rosenman <ler@FreeBSD.org>
AuthorDate: 2023-01-03 16:59:26 +0000
Commit:     Larry Rosenman <ler@FreeBSD.org>
CommitDate: 2023-01-03 17:00:35 +0000

    mail/spamassassin-dqs:  update to 1.4.0
    
    - support mail/spamassassin 4.0.0+
    
    Note: this commit will NOT support spamassassin < 4.0.0
---
 mail/spamassassin-dqs/Makefile             | 12 +++++-------
 mail/spamassassin-dqs/distinfo             |  6 +++---
 mail/spamassassin-dqs/files/pkg-message.in |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/mail/spamassassin-dqs/Makefile b/mail/spamassassin-dqs/Makefile
index 5b342b253dbb..ccd10ca4c386 100644
--- a/mail/spamassassin-dqs/Makefile
+++ b/mail/spamassassin-dqs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		spamassassin-dqs
 DISTVERSIONPREFIX=	v
-DISTVERSION=		1.2.2
+DISTVERSION=		1.4.0
 CATEGORIES=		mail
 
 MAINTAINER=	ler@FreeBSD.org
@@ -36,15 +36,13 @@ post-patch:
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail/spamassassin
-	${INSTALL_DATA} ${WRKSRC}/sh.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/sh.cf.sample
-	${INSTALL_DATA} ${WRKSRC}/sh.pre ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
-	${INSTALL_DATA} ${WRKSRC}/SH.pm ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
-	${INSTALL_DATA} ${WRKSRC}/sh_scores.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
+	${INSTALL_DATA} ${WRKSRC}/4.0.0+/sh.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/sh.cf.sample
+	${INSTALL_DATA} ${WRKSRC}/4.0.0+/sh_scores.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN}  ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
 
 do-install-HBL-on:
-	${INSTALL_DATA} ${WRKSRC}/sh_hbl.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/sh_hbl.cf.sample
-	${INSTALL_DATA} ${WRKSRC}/sh_hbl_scores.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
+	${INSTALL_DATA} ${WRKSRC}/4.0.0+/sh_hbl.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/sh_hbl.cf.sample
+	${INSTALL_DATA} ${WRKSRC}/4.0.0+/sh_hbl_scores.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
 
 .include <bsd.port.mk>
diff --git a/mail/spamassassin-dqs/distinfo b/mail/spamassassin-dqs/distinfo
index 8cb1ad9bef77..ac00075fd37a 100644
--- a/mail/spamassassin-dqs/distinfo
+++ b/mail/spamassassin-dqs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650575392
-SHA256 (spamhaus-spamassassin-dqs-v1.2.2_GH0.tar.gz) = 209b33877122965ae2323884270a3d2f24b6838fabbeb87db150f4a132f6f561
-SIZE (spamhaus-spamassassin-dqs-v1.2.2_GH0.tar.gz) = 22304
+TIMESTAMP = 1672764743
+SHA256 (spamhaus-spamassassin-dqs-v1.4.0_GH0.tar.gz) = 7a0e912d0eb4e24f3f07657e12d8fdd9785e1a36951deb19ddae3a020c2e0312
+SIZE (spamhaus-spamassassin-dqs-v1.4.0_GH0.tar.gz) = 25532
diff --git a/mail/spamassassin-dqs/files/pkg-message.in b/mail/spamassassin-dqs/files/pkg-message.in
index 215dc7226956..986d9ed90817 100644
--- a/mail/spamassassin-dqs/files/pkg-message.in
+++ b/mail/spamassassin-dqs/files/pkg-message.in
@@ -39,7 +39,7 @@ sed -e 's/your_DQS_key/<your key from above>/g' sh_hbl.cf.sample >sh_hbl.cf
 and restart spamassassin
 EOM
    type: upgrade
-   maximum_version: "1.2.2"
+   maximum_version: "1.4.0"
 }
 ]