mail/spamassassin*: Keep sa-update-keys

sa-update-keys was removed in 2015 due to upstream bug #7208. The requestor asks that they be retained after deinstall to facilite updates. Reported by: ler
freebsd · Feb 7, 2024 · 528a08b · 528a08b
1 parent ba57771
commit 528a08b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/mail/spamassassin-devel/Makefile b/mail/spamassassin-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	spamassassin
 PORTVERSION=	${SA_COMMIT_DATE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	mail perl5
 PKGNAMESUFFIX=	-devel
 

diff --git a/mail/spamassassin-devel/files/pkg-message.in b/mail/spamassassin-devel/files/pkg-message.in
@@ -23,6 +23,9 @@ You should complete the following post-installation tasks:
 	5) Install mail/spamass-rules if you want some third-party
 	   spam-catching rulesets
 
+        6) Remove %%ETCDIR%%/sa-update-keys if this software is no
+           longer needed. 
+
 SECURITY NOTE:
 By default, spamd runs as root (the AS_ROOT option). If you wish
 to change this, add the following to /etc/rc.conf:

diff --git a/mail/spamassassin-devel/pkg-plist b/mail/spamassassin-devel/pkg-plist
@@ -6,7 +6,6 @@ bin/sa-update
 bin/spamassassin
 bin/spamc
 bin/spamd
-@preunexec rm -rf %D/%%ETCDIR%%/sa-update-keys 2>&1 >/dev/null || true
 @sample %%ETCDIR%%/init.pre.sample
 @sample %%ETCDIR%%/local.cf.sample
 @sample %%ETCDIR%%/v310.pre.sample

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	spamassassin
 PORTVERSION=	4.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES?=	mail perl5
 MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/source/ CPAN/Mail
 DISTNAME=	Mail-SpamAssassin-${PORTVERSION}

diff --git a/mail/spamassassin/files/pkg-message.in b/mail/spamassassin/files/pkg-message.in
@@ -23,6 +23,9 @@ You should complete the following post-installation tasks:
 	5) Install mail/spamass-rules if you want some third-party
 	   spam-catching rulesets
 
+        6) Remove %%ETCDIR%%/sa-update-keys if this software is no
+           longer needed.
+
 SECURITY NOTE:
 By default, spamd runs as root (the AS_ROOT option). If you wish
 to change this, add the following to /etc/rc.conf:

diff --git a/mail/spamassassin/pkg-plist b/mail/spamassassin/pkg-plist
@@ -6,7 +6,6 @@ bin/sa-update
 bin/spamassassin
 bin/spamc
 bin/spamd
-@preunexec rm -rf %D/%%ETCDIR%%/sa-update-keys 2>&1 >/dev/null || true
 @sample %%ETCDIR%%/init.pre.sample
 @sample %%ETCDIR%%/local.cf.sample
 @sample %%ETCDIR%%/v310.pre.sample