Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/mail/mailscanner/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- Makefile	18 Jun 2011 16:35:08 -0000	1.96
+++ Makefile	25 Jun 2011 10:13:04 -0000
@@ -46,6 +46,10 @@
 
 CONFLICTS=	MailScanner-devel-[0-9]*
 
+CONF_FILES=	${DATADIR_REL}/reports \
+		libexec/MailScanner \
+		${ETCDIR_REL}
+
 PATCHLEVEL=	1
 
 USE_PERL5=	yes
@@ -201,9 +205,9 @@
 		">> Installing files in ${PREFIX}/libexec/MailScanner..."
 	@${MKDIR} -m ${BINMODE} ${PREFIX}/libexec/MailScanner
 	@cd ${WRKSRC}/lib && ${FIND} * -name "*-wrapper" -exec \
-		${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.sample \;
+		${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.pkgconf \;
 	@cd ${WRKSRC}/lib && ${FIND} * -name "*-autoupdate" -exec \
-		${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.sample \;
+		${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.pkgconf \;
 .for FILE in analyse_SpamAssassin_cache clean.SA.cache clean.quarantine \
 		mailscanner_create_locks processing_messages_alert Quick.Peek \
 		update_bad_phishing_emails update_phishing_sites \
@@ -219,7 +223,7 @@
 	@${MKDIR} -m ${BINMODE} ${PREFIX}/etc/MailScanner
 .for FILE in ${ETC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/etc/${FILE} \
-		${PREFIX}/etc/MailScanner/${FILE}.sample
+		${PREFIX}/etc/MailScanner/${FILE}.pkgconf
 .endfor
 	@${MKDIR} ${PREFIX}/etc/MailScanner/rules
 	@cd ${WRKSRC}/etc/rules \
@@ -227,12 +231,12 @@
 			${PREFIX}/etc/MailScanner/rules
 .for RULES in spam.whitelist.rules bounce.rules max.message.size.rules
 	@${INSTALL_DATA} ${WRKSRC}/etc/rules/${RULES} \
-		${PREFIX}/etc/MailScanner/rules/${RULES}.sample
+		${PREFIX}/etc/MailScanner/rules/${RULES}.pkgconf
 .endfor
 	@${MKDIR} -m ${BINMODE} ${PREFIX}/etc/MailScanner/mcp
 .for FILE in ${MCP_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/etc/mcp/${FILE} \
-		${PREFIX}/etc/MailScanner/mcp/${FILE}.sample
+		${PREFIX}/etc/MailScanner/mcp/${FILE}.pkgconf
 .endfor
 	@${MKDIR} ${PREFIX}/etc/MailScanner/conf.d
 	@${INSTALL_DATA} ${WRKSRC}/etc/conf.d/README \
@@ -245,7 +249,7 @@
 	@cd ${WRKSRC}/etc \
 	    && ${FIND} reports \( -type d -name "*.old" -prune \) \
 	    -o \( -type f ! \( -name "*.orig" -o -name "*.bak" \) \
-		-exec ${INSTALL_DATA} {} ${DATADIR}/{}.sample \; \)
+		-exec ${INSTALL_DATA} {} ${DATADIR}/{}.pkgconf \; \)
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/upgrade_MailScanner_conf ${DATADIR}
 	@${LN} -s ${DATADIR}/upgrade_MailScanner_conf \
 		${DATADIR}/upgrade_languages_conf
Index: pkg-plist
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/mail/mailscanner/pkg-plist,v
retrieving revision 1.43
diff -u -r1.43 pkg-plist
--- pkg-plist	18 Jun 2011 16:35:08 -0000	1.43
+++ pkg-plist	25 Jun 2011 10:13:57 -0000
@@ -1,24 +1,7 @@
 @comment $FreeBSD: ports/mail/mailscanner/pkg-plist,v 1.43 2011/06/18 16:35:08 crees Exp $
-%%ETCDIR%%/archives.filename.rules.conf.sample
-%%ETCDIR%%/archives.filetype.rules.conf.sample
-%%ETCDIR%%/country.domains.conf.sample
-%%ETCDIR%%/MailScanner.conf.sample
-%%ETCDIR%%/filename.rules.conf.sample
-%%ETCDIR%%/filetype.rules.conf.sample
 %%ETCDIR%%/conf.d/README
-%%ETCDIR%%/mcp/10_example.cf.sample
-%%ETCDIR%%/mcp/mcp.spam.assassin.prefs.conf.sample
-%%ETCDIR%%/mcp/v320.pre.sample
 %%ETCDIR%%/rules/EXAMPLES
 %%ETCDIR%%/rules/README
-%%ETCDIR%%/rules/bounce.rules.sample
-%%ETCDIR%%/rules/max.message.size.rules.sample
-%%ETCDIR%%/rules/spam.whitelist.rules.sample
-%%ETCDIR%%/phishing.bad.sites.conf.sample
-%%ETCDIR%%/phishing.safe.sites.conf.sample
-%%ETCDIR%%/spam.assassin.prefs.conf.sample
-%%ETCDIR%%/spam.lists.conf.sample
-%%ETCDIR%%/virus.scanners.conf.sample
 lib/MailScanner/MailScanner.pm
 lib/MailScanner/MailScanner/Antiword.pm
 lib/MailScanner/MailScanner/BinHex.pm
@@ -80,470 +63,8 @@
 libexec/MailScanner/update_virus_scanners.cron
 libexec/MailScanner/update_spamassassin
 libexec/MailScanner/update_spamassassin.cron
-libexec/MailScanner/antivir-autoupdate.sample
-libexec/MailScanner/antivir-wrapper.sample
-libexec/MailScanner/avast-wrapper.sample
-libexec/MailScanner/avastd-wrapper.sample
-libexec/MailScanner/avast-autoupdate.sample
-libexec/MailScanner/avg-autoupdate.sample
-libexec/MailScanner/avg-wrapper.sample
-libexec/MailScanner/bitdefender-autoupdate.sample
-libexec/MailScanner/bitdefender-wrapper.sample
-libexec/MailScanner/clamav-autoupdate.sample
-libexec/MailScanner/clamav-wrapper.sample
-libexec/MailScanner/command-wrapper.sample
-libexec/MailScanner/css-autoupdate.sample
-libexec/MailScanner/css-wrapper.sample
-libexec/MailScanner/drweb-wrapper.sample
-libexec/MailScanner/esets-wrapper.sample
-libexec/MailScanner/esets-autoupdate.sample
-libexec/MailScanner/etrust-autoupdate.sample
-libexec/MailScanner/etrust-wrapper.sample
-libexec/MailScanner/f-prot-autoupdate.sample
-libexec/MailScanner/f-prot-wrapper.sample
-libexec/MailScanner/f-prot-6-wrapper.sample
-libexec/MailScanner/f-prot-6-autoupdate.sample
-libexec/MailScanner/f-secure-autoupdate.sample
-libexec/MailScanner/f-secure-wrapper.sample
-libexec/MailScanner/generic-autoupdate.sample
-libexec/MailScanner/generic-wrapper.sample
-libexec/MailScanner/inoculan-autoupdate.sample
-libexec/MailScanner/inoculan-wrapper.sample
-libexec/MailScanner/inoculate-wrapper.sample
-libexec/MailScanner/kaspersky-autoupdate.sample
-libexec/MailScanner/kaspersky-wrapper.sample
-libexec/MailScanner/kavdaemonclient-wrapper.sample
-libexec/MailScanner/mcafee-autoupdate.sample
-libexec/MailScanner/mcafee-wrapper.sample
-libexec/MailScanner/mcafee6-autoupdate.sample
-libexec/MailScanner/mcafee6-wrapper.sample
-libexec/MailScanner/nod32-autoupdate.sample
-libexec/MailScanner/nod32-wrapper.sample
-libexec/MailScanner/norman-autoupdate.sample
-libexec/MailScanner/norman-wrapper.sample
-libexec/MailScanner/panda-wrapper.sample
-libexec/MailScanner/panda-autoupdate.sample
-libexec/MailScanner/rav-autoupdate.sample
-libexec/MailScanner/rav-wrapper.sample
-libexec/MailScanner/sophos-autoupdate.sample
-libexec/MailScanner/sophos-wrapper.sample
-libexec/MailScanner/symscanengine-autoupdate.sample
-libexec/MailScanner/symscanengine-wrapper.sample
-libexec/MailScanner/trend-autoupdate.sample
-libexec/MailScanner/trend-wrapper.sample
-libexec/MailScanner/vba32-autoupdate.sample
-libexec/MailScanner/vba32-wrapper.sample
-libexec/MailScanner/vexira-autoupdate.sample
-libexec/MailScanner/vexira-wrapper.sample
 sbin/mailscanner
 sbin/MailScanner
-%%DATADIR%%/reports/ca/rejection.report.txt.sample
-%%DATADIR%%/reports/ca/deleted.content.message.txt.sample
-%%DATADIR%%/reports/ca/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/ca/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/ca/disinfected.report.txt.sample
-%%DATADIR%%/reports/ca/inline.sig.html.sample
-%%DATADIR%%/reports/ca/inline.sig.txt.sample
-%%DATADIR%%/reports/ca/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/ca/inline.warning.html.sample
-%%DATADIR%%/reports/ca/inline.warning.txt.sample
-%%DATADIR%%/reports/ca/languages.conf.sample
-%%DATADIR%%/reports/ca/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/ca/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/ca/sender.content.report.txt.sample
-%%DATADIR%%/reports/ca/sender.error.report.txt.sample
-%%DATADIR%%/reports/ca/sender.filename.report.txt.sample
-%%DATADIR%%/reports/ca/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/ca/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/ca/sender.spam.report.txt.sample
-%%DATADIR%%/reports/ca/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/ca/sender.virus.report.txt.sample
-%%DATADIR%%/reports/ca/stored.content.message.txt.sample
-%%DATADIR%%/reports/ca/stored.filename.message.txt.sample
-%%DATADIR%%/reports/ca/stored.virus.message.txt.sample
-%%DATADIR%%/reports/ca/deleted.size.message.txt.sample
-%%DATADIR%%/reports/ca/sender.size.report.txt.sample
-%%DATADIR%%/reports/ca/stored.size.message.txt.sample
-%%DATADIR%%/reports/cy+en/deleted.content.message.txt.sample
-%%DATADIR%%/reports/cy+en/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/cy+en/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/cy+en/disinfected.report.txt.sample
-%%DATADIR%%/reports/cy+en/inline.sig.html.sample
-%%DATADIR%%/reports/cy+en/inline.sig.txt.sample
-%%DATADIR%%/reports/cy+en/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/cy+en/inline.warning.html.sample
-%%DATADIR%%/reports/cy+en/inline.warning.txt.sample
-%%DATADIR%%/reports/cy+en/languages.conf.sample
-%%DATADIR%%/reports/cy+en/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/cy+en/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.content.report.txt.sample
-%%DATADIR%%/reports/cy+en/rejection.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.error.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.filename.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.spam.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.virus.report.txt.sample
-%%DATADIR%%/reports/cy+en/stored.content.message.txt.sample
-%%DATADIR%%/reports/cy+en/stored.filename.message.txt.sample
-%%DATADIR%%/reports/cy+en/stored.virus.message.txt.sample
-%%DATADIR%%/reports/cy+en/deleted.size.message.txt.sample
-%%DATADIR%%/reports/cy+en/sender.size.report.txt.sample
-%%DATADIR%%/reports/cy+en/stored.size.message.txt.sample
-%%DATADIR%%/reports/cz/deleted.content.message.txt.sample
-%%DATADIR%%/reports/cz/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/cz/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/cz/disinfected.report.txt.sample
-%%DATADIR%%/reports/cz/inline.sig.html.sample
-%%DATADIR%%/reports/cz/inline.sig.txt.sample
-%%DATADIR%%/reports/cz/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/cz/inline.warning.html.sample
-%%DATADIR%%/reports/cz/inline.warning.txt.sample
-%%DATADIR%%/reports/cz/languages.conf.sample
-%%DATADIR%%/reports/cz/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/cz/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/cz/sender.content.report.txt.sample
-%%DATADIR%%/reports/cz/rejection.report.txt.sample
-%%DATADIR%%/reports/cz/sender.error.report.txt.sample
-%%DATADIR%%/reports/cz/sender.filename.report.txt.sample
-%%DATADIR%%/reports/cz/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/cz/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/cz/sender.spam.report.txt.sample
-%%DATADIR%%/reports/cz/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/cz/sender.virus.report.txt.sample
-%%DATADIR%%/reports/cz/stored.content.message.txt.sample
-%%DATADIR%%/reports/cz/stored.filename.message.txt.sample
-%%DATADIR%%/reports/cz/stored.virus.message.txt.sample
-%%DATADIR%%/reports/cz/deleted.size.message.txt.sample
-%%DATADIR%%/reports/cz/sender.size.report.txt.sample
-%%DATADIR%%/reports/cz/stored.size.message.txt.sample
-%%DATADIR%%/reports/de/README.1ST.sample
-%%DATADIR%%/reports/de/deleted.content.message.txt.sample
-%%DATADIR%%/reports/de/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/de/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/de/disinfected.report.txt.sample
-%%DATADIR%%/reports/de/inline.sig.html.sample
-%%DATADIR%%/reports/de/inline.sig.txt.sample
-%%DATADIR%%/reports/de/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/de/inline.warning.html.sample
-%%DATADIR%%/reports/de/inline.warning.txt.sample
-%%DATADIR%%/reports/de/languages.conf.sample
-%%DATADIR%%/reports/de/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/de/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/de/sender.content.report.txt.sample
-%%DATADIR%%/reports/de/rejection.report.txt.sample
-%%DATADIR%%/reports/de/sender.error.report.txt.sample
-%%DATADIR%%/reports/de/sender.filename.report.txt.sample
-%%DATADIR%%/reports/de/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/de/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/de/sender.spam.report.txt.sample
-%%DATADIR%%/reports/de/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/de/sender.virus.report.txt.sample
-%%DATADIR%%/reports/de/stored.content.message.txt.sample
-%%DATADIR%%/reports/de/stored.filename.message.txt.sample
-%%DATADIR%%/reports/de/stored.virus.message.txt.sample
-%%DATADIR%%/reports/de/deleted.size.message.txt.sample
-%%DATADIR%%/reports/de/sender.size.report.txt.sample
-%%DATADIR%%/reports/de/stored.size.message.txt.sample
-%%DATADIR%%/reports/dk/deleted.content.message.txt.sample
-%%DATADIR%%/reports/dk/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/dk/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/dk/disinfected.report.txt.sample
-%%DATADIR%%/reports/dk/inline.sig.html.sample
-%%DATADIR%%/reports/dk/inline.sig.txt.sample
-%%DATADIR%%/reports/dk/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/dk/inline.warning.html.sample
-%%DATADIR%%/reports/dk/inline.warning.txt.sample
-%%DATADIR%%/reports/dk/languages.conf.sample
-%%DATADIR%%/reports/dk/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/dk/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/dk/sender.content.report.txt.sample
-%%DATADIR%%/reports/dk/rejection.report.txt.sample
-%%DATADIR%%/reports/dk/sender.error.report.txt.sample
-%%DATADIR%%/reports/dk/sender.filename.report.txt.sample
-%%DATADIR%%/reports/dk/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/dk/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/dk/sender.spam.report.txt.sample
-%%DATADIR%%/reports/dk/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/dk/sender.virus.report.txt.sample
-%%DATADIR%%/reports/dk/stored.content.message.txt.sample
-%%DATADIR%%/reports/dk/stored.filename.message.txt.sample
-%%DATADIR%%/reports/dk/stored.virus.message.txt.sample
-%%DATADIR%%/reports/dk/deleted.size.message.txt.sample
-%%DATADIR%%/reports/dk/sender.size.report.txt.sample
-%%DATADIR%%/reports/dk/stored.size.message.txt.sample
-%%DATADIR%%/reports/en/deleted.content.message.txt.sample
-%%DATADIR%%/reports/en/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/en/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/en/disinfected.report.txt.sample
-%%DATADIR%%/reports/en/inline.sig.html.sample
-%%DATADIR%%/reports/en/inline.sig.txt.sample
-%%DATADIR%%/reports/en/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/en/inline.warning.html.sample
-%%DATADIR%%/reports/en/inline.warning.txt.sample
-%%DATADIR%%/reports/en/languages.conf.sample
-%%DATADIR%%/reports/en/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/en/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/en/sender.content.report.txt.sample
-%%DATADIR%%/reports/en/rejection.report.txt.sample
-%%DATADIR%%/reports/en/sender.error.report.txt.sample
-%%DATADIR%%/reports/en/sender.filename.report.txt.sample
-%%DATADIR%%/reports/en/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/en/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/en/sender.spam.report.txt.sample
-%%DATADIR%%/reports/en/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/en/sender.virus.report.txt.sample
-%%DATADIR%%/reports/en/stored.content.message.txt.sample
-%%DATADIR%%/reports/en/stored.filename.message.txt.sample
-%%DATADIR%%/reports/en/stored.virus.message.txt.sample
-%%DATADIR%%/reports/en/deleted.size.message.txt.sample
-%%DATADIR%%/reports/en/sender.size.report.txt.sample
-%%DATADIR%%/reports/en/stored.size.message.txt.sample
-%%DATADIR%%/reports/es/deleted.content.message.txt.sample
-%%DATADIR%%/reports/es/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/es/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/es/disinfected.report.txt.sample
-%%DATADIR%%/reports/es/inline.sig.html.sample
-%%DATADIR%%/reports/es/inline.sig.txt.sample
-%%DATADIR%%/reports/es/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/es/inline.warning.html.sample
-%%DATADIR%%/reports/es/inline.warning.txt.sample
-%%DATADIR%%/reports/es/languages.conf.sample
-%%DATADIR%%/reports/es/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/es/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/es/rejection.report.txt.sample
-%%DATADIR%%/reports/es/sender.content.report.txt.sample
-%%DATADIR%%/reports/es/sender.error.report.txt.sample
-%%DATADIR%%/reports/es/sender.filename.report.txt.sample
-%%DATADIR%%/reports/es/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/es/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/es/sender.spam.report.txt.sample
-%%DATADIR%%/reports/es/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/es/sender.virus.report.txt.sample
-%%DATADIR%%/reports/es/stored.content.message.txt.sample
-%%DATADIR%%/reports/es/stored.filename.message.txt.sample
-%%DATADIR%%/reports/es/stored.virus.message.txt.sample
-%%DATADIR%%/reports/es/deleted.size.message.txt.sample
-%%DATADIR%%/reports/es/sender.size.report.txt.sample
-%%DATADIR%%/reports/es/stored.size.message.txt.sample
-%%DATADIR%%/reports/fr/deleted.content.message.txt.sample
-%%DATADIR%%/reports/fr/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/fr/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/fr/disinfected.report.txt.sample
-%%DATADIR%%/reports/fr/inline.sig.html.sample
-%%DATADIR%%/reports/fr/inline.sig.txt.sample
-%%DATADIR%%/reports/fr/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/fr/inline.warning.html.sample
-%%DATADIR%%/reports/fr/inline.warning.txt.sample
-%%DATADIR%%/reports/fr/languages.conf.sample
-%%DATADIR%%/reports/fr/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/fr/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/fr/rejection.report.txt.sample
-%%DATADIR%%/reports/fr/sender.content.report.txt.sample
-%%DATADIR%%/reports/fr/sender.error.report.txt.sample
-%%DATADIR%%/reports/fr/sender.filename.report.txt.sample
-%%DATADIR%%/reports/fr/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/fr/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/fr/sender.spam.report.txt.sample
-%%DATADIR%%/reports/fr/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/fr/sender.virus.report.txt.sample
-%%DATADIR%%/reports/fr/stored.content.message.txt.sample
-%%DATADIR%%/reports/fr/stored.filename.message.txt.sample
-%%DATADIR%%/reports/fr/stored.virus.message.txt.sample
-%%DATADIR%%/reports/fr/deleted.size.message.txt.sample
-%%DATADIR%%/reports/fr/sender.size.report.txt.sample
-%%DATADIR%%/reports/fr/stored.size.message.txt.sample
-%%DATADIR%%/reports/hu/deleted.content.message.txt.sample
-%%DATADIR%%/reports/hu/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/hu/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/hu/disinfected.report.txt.sample
-%%DATADIR%%/reports/hu/inline.sig.html.sample
-%%DATADIR%%/reports/hu/inline.sig.txt.sample
-%%DATADIR%%/reports/hu/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/hu/inline.warning.html.sample
-%%DATADIR%%/reports/hu/inline.warning.txt.sample
-%%DATADIR%%/reports/hu/languages.conf.sample
-%%DATADIR%%/reports/hu/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/hu/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/hu/rejection.report.txt.sample
-%%DATADIR%%/reports/hu/sender.content.report.txt.sample
-%%DATADIR%%/reports/hu/sender.error.report.txt.sample
-%%DATADIR%%/reports/hu/sender.filename.report.txt.sample
-%%DATADIR%%/reports/hu/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/hu/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/hu/sender.spam.report.txt.sample
-%%DATADIR%%/reports/hu/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/hu/sender.virus.report.txt.sample
-%%DATADIR%%/reports/hu/stored.content.message.txt.sample
-%%DATADIR%%/reports/hu/stored.filename.message.txt.sample
-%%DATADIR%%/reports/hu/stored.virus.message.txt.sample
-%%DATADIR%%/reports/hu/deleted.size.message.txt.sample
-%%DATADIR%%/reports/hu/sender.size.report.txt.sample
-%%DATADIR%%/reports/hu/stored.size.message.txt.sample
-%%DATADIR%%/reports/it/deleted.content.message.txt.sample
-%%DATADIR%%/reports/it/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/it/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/it/disinfected.report.txt.sample
-%%DATADIR%%/reports/it/inline.sig.html.sample
-%%DATADIR%%/reports/it/inline.sig.txt.sample
-%%DATADIR%%/reports/it/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/it/inline.warning.html.sample
-%%DATADIR%%/reports/it/inline.warning.txt.sample
-%%DATADIR%%/reports/it/languages.conf.sample
-%%DATADIR%%/reports/it/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/it/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/it/rejection.report.txt.sample
-%%DATADIR%%/reports/it/sender.content.report.txt.sample
-%%DATADIR%%/reports/it/sender.error.report.txt.sample
-%%DATADIR%%/reports/it/sender.filename.report.txt.sample
-%%DATADIR%%/reports/it/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/it/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/it/sender.spam.report.txt.sample
-%%DATADIR%%/reports/it/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/it/sender.virus.report.txt.sample
-%%DATADIR%%/reports/it/stored.content.message.txt.sample
-%%DATADIR%%/reports/it/stored.filename.message.txt.sample
-%%DATADIR%%/reports/it/stored.virus.message.txt.sample
-%%DATADIR%%/reports/it/deleted.size.message.txt.sample
-%%DATADIR%%/reports/it/sender.size.report.txt.sample
-%%DATADIR%%/reports/it/stored.size.message.txt.sample
-%%DATADIR%%/reports/nl/deleted.content.message.txt.sample
-%%DATADIR%%/reports/nl/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/nl/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/nl/disinfected.report.txt.sample
-%%DATADIR%%/reports/nl/inline.sig.html.sample
-%%DATADIR%%/reports/nl/inline.sig.txt.sample
-%%DATADIR%%/reports/nl/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/nl/inline.warning.html.sample
-%%DATADIR%%/reports/nl/inline.warning.txt.sample
-%%DATADIR%%/reports/nl/languages.conf.sample
-%%DATADIR%%/reports/nl/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/nl/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/nl/rejection.report.txt.sample
-%%DATADIR%%/reports/nl/sender.content.report.txt.sample
-%%DATADIR%%/reports/nl/sender.error.report.txt.sample
-%%DATADIR%%/reports/nl/sender.filename.report.txt.sample
-%%DATADIR%%/reports/nl/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/nl/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/nl/sender.spam.report.txt.sample
-%%DATADIR%%/reports/nl/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/nl/sender.virus.report.txt.sample
-%%DATADIR%%/reports/nl/stored.content.message.txt.sample
-%%DATADIR%%/reports/nl/stored.filename.message.txt.sample
-%%DATADIR%%/reports/nl/stored.virus.message.txt.sample
-%%DATADIR%%/reports/nl/deleted.size.message.txt.sample
-%%DATADIR%%/reports/nl/sender.size.report.txt.sample
-%%DATADIR%%/reports/nl/stored.size.message.txt.sample
-%%DATADIR%%/reports/pt_br/deleted.content.message.txt.sample
-%%DATADIR%%/reports/pt_br/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/pt_br/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/pt_br/disinfected.report.txt.sample
-%%DATADIR%%/reports/pt_br/inline.sig.html.sample
-%%DATADIR%%/reports/pt_br/inline.sig.txt.sample
-%%DATADIR%%/reports/pt_br/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/pt_br/inline.warning.html.sample
-%%DATADIR%%/reports/pt_br/inline.warning.txt.sample
-%%DATADIR%%/reports/pt_br/languages.conf.sample
-%%DATADIR%%/reports/pt_br/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/pt_br/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/pt_br/rejection.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.content.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.error.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.filename.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.spam.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.virus.report.txt.sample
-%%DATADIR%%/reports/pt_br/stored.content.message.txt.sample
-%%DATADIR%%/reports/pt_br/stored.filename.message.txt.sample
-%%DATADIR%%/reports/pt_br/stored.virus.message.txt.sample
-%%DATADIR%%/reports/pt_br/deleted.size.message.txt.sample
-%%DATADIR%%/reports/pt_br/sender.size.report.txt.sample
-%%DATADIR%%/reports/pt_br/stored.size.message.txt.sample
-%%DATADIR%%/reports/ro/deleted.content.message.txt.sample
-%%DATADIR%%/reports/ro/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/ro/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/ro/disinfected.report.txt.sample
-%%DATADIR%%/reports/ro/inline.sig.html.sample
-%%DATADIR%%/reports/ro/inline.sig.txt.sample
-%%DATADIR%%/reports/ro/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/ro/inline.warning.html.sample
-%%DATADIR%%/reports/ro/inline.warning.txt.sample
-%%DATADIR%%/reports/ro/languages.conf.sample
-%%DATADIR%%/reports/ro/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/ro/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/ro/rejection.report.txt.sample
-%%DATADIR%%/reports/ro/sender.content.report.txt.sample
-%%DATADIR%%/reports/ro/sender.error.report.txt.sample
-%%DATADIR%%/reports/ro/sender.filename.report.txt.sample
-%%DATADIR%%/reports/ro/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/ro/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/ro/sender.spam.report.txt.sample
-%%DATADIR%%/reports/ro/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/ro/sender.virus.report.txt.sample
-%%DATADIR%%/reports/ro/stored.content.message.txt.sample
-%%DATADIR%%/reports/ro/stored.filename.message.txt.sample
-%%DATADIR%%/reports/ro/stored.virus.message.txt.sample
-%%DATADIR%%/reports/ro/deleted.size.message.txt.sample
-%%DATADIR%%/reports/ro/sender.size.report.txt.sample
-%%DATADIR%%/reports/ro/stored.size.message.txt.sample
-%%DATADIR%%/reports/se/README.sample
-%%DATADIR%%/reports/se/deleted.content.message.txt.sample
-%%DATADIR%%/reports/se/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/se/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/se/disinfected.report.txt.sample
-%%DATADIR%%/reports/se/inline.sig.html.sample
-%%DATADIR%%/reports/se/inline.sig.txt.sample
-%%DATADIR%%/reports/se/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/se/inline.warning.html.sample
-%%DATADIR%%/reports/se/inline.warning.txt.sample
-%%DATADIR%%/reports/se/languages.conf.sample
-%%DATADIR%%/reports/se/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/se/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/se/rejection.report.txt.sample
-%%DATADIR%%/reports/se/sender.content.report.txt.sample
-%%DATADIR%%/reports/se/sender.error.report.txt.sample
-%%DATADIR%%/reports/se/sender.filename.report.txt.sample
-%%DATADIR%%/reports/se/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/se/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/se/sender.spam.report.txt.sample
-%%DATADIR%%/reports/se/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/se/sender.virus.report.txt.sample
-%%DATADIR%%/reports/se/stored.content.message.txt.sample
-%%DATADIR%%/reports/se/stored.filename.message.txt.sample
-%%DATADIR%%/reports/se/stored.virus.message.txt.sample
-%%DATADIR%%/reports/se/deleted.size.message.txt.sample
-%%DATADIR%%/reports/se/sender.size.report.txt.sample
-%%DATADIR%%/reports/se/stored.size.message.txt.sample
-%%DATADIR%%/reports/sk/deleted.content.message.txt.sample
-%%DATADIR%%/reports/sk/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/sk/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/sk/disinfected.report.txt.sample
-%%DATADIR%%/reports/sk/inline.sig.html.sample
-%%DATADIR%%/reports/sk/inline.sig.txt.sample
-%%DATADIR%%/reports/sk/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/sk/inline.warning.html.sample
-%%DATADIR%%/reports/sk/inline.warning.txt.sample
-%%DATADIR%%/reports/sk/languages.conf.sample
-%%DATADIR%%/reports/sk/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/sk/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/sk/rejection.report.txt.sample
-%%DATADIR%%/reports/sk/sender.content.report.txt.sample
-%%DATADIR%%/reports/sk/sender.error.report.txt.sample
-%%DATADIR%%/reports/sk/sender.filename.report.txt.sample
-%%DATADIR%%/reports/sk/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/sk/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/sk/sender.spam.report.txt.sample
-%%DATADIR%%/reports/sk/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/sk/sender.virus.report.txt.sample
-%%DATADIR%%/reports/sk/stored.content.message.txt.sample
-%%DATADIR%%/reports/sk/stored.filename.message.txt.sample
-%%DATADIR%%/reports/sk/stored.virus.message.txt.sample
-%%DATADIR%%/reports/sk/deleted.size.message.txt.sample
-%%DATADIR%%/reports/sk/sender.size.report.txt.sample
-%%DATADIR%%/reports/sk/stored.size.message.txt.sample
 %%DATADIR%%/upgrade_MailScanner_conf
 %%DATADIR%%/upgrade_languages_conf
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
@@ -551,28 +72,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.FreeBSD
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/reports/sk
-@dirrm %%DATADIR%%/reports/se
-@dirrm %%DATADIR%%/reports/ro
-@dirrm %%DATADIR%%/reports/pt_br
-@dirrm %%DATADIR%%/reports/nl
-@dirrm %%DATADIR%%/reports/it
-@dirrm %%DATADIR%%/reports/hu
-@dirrm %%DATADIR%%/reports/fr
-@dirrm %%DATADIR%%/reports/es
-@dirrm %%DATADIR%%/reports/en
-@dirrm %%DATADIR%%/reports/dk
-@dirrm %%DATADIR%%/reports/de
-@dirrm %%DATADIR%%/reports/cz
-@dirrm %%DATADIR%%/reports/cy+en
-@dirrm %%DATADIR%%/reports/ca
-@dirrm %%DATADIR%%/reports
-@dirrm %%DATADIR%%
-@dirrm libexec/MailScanner
+@dirrmtry %%DATADIR%%
+@dirrmtry libexec/MailScanner
 @dirrm lib/MailScanner/MailScanner/CustomFunctions
 @dirrm lib/MailScanner/MailScanner
 @dirrm lib/MailScanner
-@dirrmtry %%ETCDIR%%/conf.d
-@dirrmtry %%ETCDIR%%/mcp
-@dirrmtry %%ETCDIR%%/rules
-@dirrmtry %%ETCDIR%%
Index: files/pkg-deinstall.in
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/mail/mailscanner/files/pkg-deinstall.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-deinstall.in
--- files/pkg-deinstall.in	18 Jun 2011 16:35:08 -0000	1.1
+++ files/pkg-deinstall.in	25 Jun 2011 10:19:57 -0000
@@ -68,12 +68,6 @@
 DEINSTALL)
 	[ -L ${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf ] \
 		&& rm -f ${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf
-	prune_lang_conf
-	prune_wrappers
-	prune_autoupdate
-	prune_rules
-	prune_mcp
-	prune_etc
 	exit 0
 	;;
 esac
Index: files/pkg-install.in
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/mail/mailscanner/files/pkg-install.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-install.in
--- files/pkg-install.in	18 Jun 2011 16:35:08 -0000	1.1
+++ files/pkg-install.in	24 Jun 2011 17:41:58 -0000
@@ -106,10 +106,8 @@
 	    && [ ! -r ${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf ] \
 	    && ${LN} -s ${PKG_PREFIX}/etc/MailScanner/spam.assassin.prefs.conf \
 		${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf
-	upgrade_lang_conf
 	[ -f ${PKG_PREFIX}/etc/MailScanner/MailScanner.conf ] \
 		&& upgrade_mailscanner_conf
-	initial_config
 	exit 0
 	;;
 esac