2 files changed, 21 insertions, 30 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index d23fc55cb3b0..707daceeda73 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		spamassassin
 PORTVERSION=	3.4.0
-PORTREVISION?=	9		# also bump japanese/spamassassin
+PORTREVISION?=	10		# also bump japanese/spamassassin
 CATEGORIES?=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
@@ -171,10 +171,9 @@ pre-su-install:
 
 post-install::
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spamc
-	@${MKDIR} ${STAGEDIR}/var/lib/spamassassin ${STAGEDIR}${DBDIR}/spamassassin
-	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/sql ${STAGEDIR}${DOCSDIR}/ldap
+	@${MKDIR} ${STAGEDIR}/var/lib/spamassassin ${STAGEDIR}${DBDIR}/spamassassin ${STAGEDIR}/var/run/spamd
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/sql/* ${STAGEDIR}${DOCSDIR}/sql
-	${INSTALL_DATA} ${WRKSRC}/ldap/* ${STAGEDIR}${DOCSDIR}/ldap
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "sql ldap" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.post.mk>
diff --git a/mail/spamassassin/pkg-plist b/mail/spamassassin/pkg-plist
index 46269d28c46a..065dc27c0f04 100644
--- a/mail/spamassassin/pkg-plist
+++ b/mail/spamassassin/pkg-plist
@@ -1,4 +1,4 @@
-@stopdaemon sa-spamd
+@unexec if service sa-spamd status | grep -q "spamd is running"; then service sa-spamd stop; fi
 bin/sa-awl
 bin/sa-check_spamd
 bin/sa-compile
@@ -8,25 +8,13 @@ bin/spamassassin
 bin/spamc
 bin/spamd
 @unexec rm -rf %D/%%ETCDIR%%/sa-update-keys 2>&1 >/dev/null || true
-%%ETCDIR%%/local.cf.sample
-@unexec if cmp -s %B/init.pre.sample %B/init.pre; then rm -f %B/init.pre; fi
-%%ETCDIR%%/init.pre.sample
-@exec [ -f %B/init.pre ] || cp %B/%f %B/init.pre
-@unexec if cmp -s %B/v310.pre.sample %B/v310.pre; then rm -f %B/v310.pre; fi
-%%ETCDIR%%/v310.pre.sample
-@exec [ -f %B/v310.pre ] || cp %B/%f %B/v310.pre
-@unexec if cmp -s %B/v312.pre.sample %B/v312.pre; then rm -f %B/v312.pre; fi
-%%ETCDIR%%/v312.pre.sample
-@exec [ -f %B/v312.pre ] || cp %B/%f %B/v312.pre
-@unexec if cmp -s %B/v320.pre.sample %B/v320.pre; then rm -f %B/v320.pre; fi
-%%ETCDIR%%/v320.pre.sample
-@exec [ -f %B/v320.pre ] || cp %B/%f %B/v320.pre
-@unexec if cmp -s %B/v330.pre.sample %B/v330.pre; then rm -f %B/v330.pre;fi
-%%ETCDIR%%/v330.pre.sample
-@exec [ -f %B/v330.pre ] || cp %B/%f %B/v330.pre
-@unexec if cmp -s %B/v340.pre.sample %B/v340.pre; then rm -f %B/v340.pre;fi
-%%ETCDIR%%/v340.pre.sample
-@exec [ -f %B/v341.pre ] || cp %B/%f %B/v340.pre
+@sample %%ETCDIR%%/local.cf.sample
+@sample %%ETCDIR%%/init.pre.sample
+@sample %%ETCDIR%%/v310.pre.sample
+@sample %%ETCDIR%%/v312.pre.sample
+@sample %%ETCDIR%%/v320.pre.sample
+@sample %%ETCDIR%%/v330.pre.sample
+@sample %%ETCDIR%%/v340.pre.sample
 include/libspamc.h
 lib/libspamc.so
 lib/libspamc.so.0
@@ -229,17 +217,21 @@ man/man1/spamd.1.gz
 @dirrmtry %%SITE_PERL%%/Mail
 @dirrmtry %%ETCDIR%%
 @dirrmtry etc/mail
+
 @unexec rm -rf /var/lib/spamassassin/2* 2>&1 >/dev/null || true
-@unexec rmdir /var/lib/spamassassin 2>&1 >/dev/null || true
-@unexec rmdir /var/lib 2>&1 >/dev/null || true
-@unexec rmdir /var/db/spamassassin 2>&1 >/dev/null || true
+@dirrmtry /var/lib/spamassassin
+@dirrmtry /var/lib
+@dirrmtry /var/db/spamassassin
 
 @unexec [ -d /var/db/spamassassin ] && echo "If you are no longer using SpamAssassin, remove /var/db/spamassassin"
 @unexec pw usershow "%%USER%%" 2>/dev/null 1>&2 && echo "To delete %%USER%% permanently, 'rmuser %%USER%%'"
 @unexec pw usershow "%%USER%%" 2>/dev/null 1>&2 && [ -d /var/spool/spamd ] && echo "    Note that this will remove /var/spool/spamd"
 
-@exec install -d -o %%USER%% -g %%GROUP%% /var/run/spamd
-@unexec rm -rf /var/run/spamd 2>&1 >/dev/null || true
+@owner %%USER%%
+@group %%GROUP%%
+@dirrmtry /var/run/spamd
+@group
+@owner
 
 @exec if [ "%%UPDATE_ON_INSTALL%%" = "yes" ]; then echo "====> Downloading SpamAssassin rulesets"; %%PREFIX%%/bin/spamassassin -x -L --lint; %%PREFIX%%/bin/sa-update || true; fi
 @exec if [ "%%UPDATE_ON_INSTALL%%" = "yes" ]; then echo "====> Compiling SpamAssassin rulesets"; %%PREFIX%%/bin/spamassassin -x -L --lint; %%PREFIX%%/bin/sa-compile || true; fi