[patch] mail/p5-Mail-SpamAssassin : install overwrites existing config file v310.pre

[Petr Rehor]

>Submitter-Id:	current-users
>Originator:	Petr Rehor
>Organization:	
>Confidential:	no 
>Synopsis:	[patch] mail/p5-Mail-SpamAssassin : install overwrites existing config file v310.pre
>Severity:	serious
>Priority:	medium
>Category:	ports
>Class:		update
>Release:	FreeBSD 6.0-RELEASE-c3 i386
>Environment:
System: FreeBSD charon.rx.cz 6.0-RELEASE-c3 FreeBSD 6.0-RELEASE-c3 #0: Tue Nov 8 20:44:39 UTC 2005 root at marvin.rx.cz:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Any customised v310.pre is silently zapped and replaced with the default on a
port upgrade.
>How-To-Repeat:
	
>Fix:


--- p5-Mail-SpamAssassin.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.85
diff -u -r1.85 Makefile
--- Makefile	4 Jan 2006 06:35:11 -0000	1.85
+++ Makefile	6 Jan 2006 08:05:40 -0000
@@ -165,6 +165,7 @@
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 	@${REINPLACE_CMD} -e 's#B_CONFDIR)/local.cf#B_CONFDIR)/local.cf.sample#g' \
 		-e 's#B_CONFDIR)/init.pre#B_CONFDIR)/init.pre.sample#g' \
+		-e 's#B_CONFDIR)/v310.pre#B_CONFDIR)/v310.pre.sample#g' \
 		-e 's/require DBI/0/' \
 		${WRKSRC}/Makefile.PL
 .if defined(WITH_RAZOR)
@@ -189,6 +190,9 @@
 	@[ -f ${PREFIX}/etc/mail/spamassassin/init.pre ] || \
 		${CP} ${PREFIX}/etc/mail/spamassassin/init.pre.sample \
 			${PREFIX}/etc/mail/spamassassin/init.pre
+	@[ -f ${PREFIX}/etc/mail/spamassassin/v310.pre ] || \
+		${CP} ${PREFIX}/etc/mail/spamassassin/v310.pre.sample \
+			${PREFIX}/etc/mail/spamassassin/v310.pre
 .if defined(WITH_TOOLS)
 	@${MKDIR} ${DATADIR}/tools
 	@for f in ${WRKSRC}/tools/*; do \
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/p5-Mail-SpamAssassin/pkg-plist,v
retrieving revision 1.31
diff -u -r1.31 pkg-plist
--- pkg-plist	17 Sep 2005 15:05:19 -0000	1.31
+++ pkg-plist	6 Jan 2006 08:07:13 -0000
@@ -8,7 +8,9 @@
 @unexec if cmp -s %B/init.pre.sample %B/init.pre; then rm -f %B/init.pre; fi
 etc/mail/spamassassin/init.pre.sample
 @exec [ -f %B/init.pre ] || cp %B/%f %B/init.pre
-etc/mail/spamassassin/v310.pre
+ at unexec if cmp -s %B/v310.pre.sample %B/v310.pre; then rm -f %B/v310.pre; fi
+etc/mail/spamassassin/v310.pre.sample
+ at exec [ -f %B/v310.pre ] || cp %B/%f %B/v310.pre
 etc/rc.d/sa-spamd.sh
 %%SITE_PERL%%/Mail/SpamAssassin.pm
 %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm
--- p5-Mail-SpamAssassin.diff ends here ---