2 files changed, 75 insertions, 67 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 8046742f5659..9f0673032e99 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -17,19 +17,18 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	DougB@FreeBSD.org
 COMMENT=	A highly efficient mail filter for identifying spam
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
+		${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
 RUN_DEPENDS=	${BUILD_DEPENDS} \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		razor-client:${PORTSDIR}/mail/razor-agents
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-PODPARSER=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
-RUN_DEPENDS+=	${PODPARSER}
-BUILD_DEPENDS+=	${PODPARSER}
+RUN_DEPENDS+=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+BUILD_DEPENDS+=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
 .endif
 
 PERL_CONFIGURE=	yes
@@ -41,7 +40,10 @@ MAN3=		Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \
 		Mail::SpamAssassin::Conf.3 \
 		Mail::SpamAssassin::PersistentAddrList.3 \
 		Mail::SpamAssassin::PerMsgLearner.3 \
-		Mail::SpamAssassin::Bayes.3
+		Mail::SpamAssassin::Bayes.3 \
+		Mail::SpamAssassin::AutoWhitelist.3 \
+		Mail::SpamAssassin::ConfSourceSQL.3
+
 MAN1PREFIX=	${PREFIX}
 MAN1=		spamd.1 spamassassin.1 spamc.1 sa-learn.1
 
@@ -50,6 +52,11 @@ DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
+	@${MV} ${WRKSRC}/rules/local.cf ${WRKSRC}/rules/local.cf.sample
+	@${SED} -e 's#local.cf#local.cf.sample#g' \
+		${WRKSRC}/Makefile.PL > ${WRKSRC}/Makefile.PL.sed
+	@${MV} ${WRKSRC}/Makefile.PL.sed ${WRKSRC}/Makefile.PL
+
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/spamc
 	${INSTALL_SCRIPT} ${FILESDIR}/spamd.sh ${PREFIX}/etc/rc.d/spamd.sh-dist
@@ -62,6 +69,6 @@ post-install:
 	    spamd/README* sql/spamassassin.sql ${DOCSDIR}
 .endif
 
-	@${SED} -e 's#PREFIX#/usr/local#' pkg-message
+	@${SED} -e 's#PREFIX#${PREFIX}#' pkg-message
 
 .include <bsd.port.post.mk>
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist
index 62c309aefc32..6e472954a649 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin/pkg-plist
@@ -1,62 +1,42 @@
 bin/sa-learn
-bin/spamd
-bin/spamc
 bin/spamassassin
+bin/spamc
+bin/spamd
+etc/mail/spamassassin/local.cf.sample
 etc/rc.d/spamd.sh-dist
-etc/mail/spamassassin/local.cf
-@dirrm etc/mail/spamassassin
-@dirrm etc/mail
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Locker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/UnixLocker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Win32Locker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Conf.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Replier.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Bayes.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ConfSourceSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/DBBasedAddrList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PerMsgStatus.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Reporter.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/SHA1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/AuditMessage.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/HTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/MailingList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ArchiveIterator.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/CmdLearn.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PerMsgLearner.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMIME.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/BayesStore.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/NoMailAudit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/AutoWhitelist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PersistentAddrList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Dns.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PhraseFreqs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/TextCat.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMessage.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EvalTests.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Locales.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.sql
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/BUGS
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/COPYRIGHT
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/Changes
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/INSTALL
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/TRADEMARK
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/USAGE
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/procmailrc.example
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-nonspam.txt
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-spam.txt
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd-vpopmail
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/spamassassin.sql
-@dirrm %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin
+%%SITE_PERL%%/Mail/SpamAssassin.pm
+%%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm
+%%SITE_PERL%%/Mail/SpamAssassin/AuditMessage.pm
+%%SITE_PERL%%/Mail/SpamAssassin/AutoWhitelist.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Bayes.pm
+%%SITE_PERL%%/Mail/SpamAssassin/BayesStore.pm
+%%SITE_PERL%%/Mail/SpamAssassin/CmdLearn.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Conf.pm
+%%SITE_PERL%%/Mail/SpamAssassin/ConfSourceSQL.pm
+%%SITE_PERL%%/Mail/SpamAssassin/DBBasedAddrList.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Dns.pm
+%%SITE_PERL%%/Mail/SpamAssassin/EncappedMIME.pm
+%%SITE_PERL%%/Mail/SpamAssassin/EncappedMessage.pm
+%%SITE_PERL%%/Mail/SpamAssassin/EvalTests.pm
+%%SITE_PERL%%/Mail/SpamAssassin/HTML.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Locales.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Locker.pm
+%%SITE_PERL%%/Mail/SpamAssassin/MailingList.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Message.pm
+%%SITE_PERL%%/Mail/SpamAssassin/NoMailAudit.pm
+%%SITE_PERL%%/Mail/SpamAssassin/PerMsgLearner.pm
+%%SITE_PERL%%/Mail/SpamAssassin/PerMsgStatus.pm
+%%SITE_PERL%%/Mail/SpamAssassin/PersistentAddrList.pm
+%%SITE_PERL%%/Mail/SpamAssassin/PhraseFreqs.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Replier.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Reporter.pm
+%%SITE_PERL%%/Mail/SpamAssassin/SHA1.pm
+%%SITE_PERL%%/Mail/SpamAssassin/TextCat.pm
+%%SITE_PERL%%/Mail/SpamAssassin/UnixLocker.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Util.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Win32Locker.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
+lib/perllocal.pod-Mail-SpamAssassin
 share/spamassassin/10_misc.cf
 share/spamassassin/20_anti_ratware.cf
 share/spamassassin/20_body_tests.cf
@@ -80,7 +60,28 @@ share/spamassassin/30_text_it.cf
 share/spamassassin/30_text_pl.cf
 share/spamassassin/50_scores.cf
 share/spamassassin/60_whitelist.cf
-share/spamassassin/user_prefs.template
-share/spamassassin/triplets.txt
 share/spamassassin/languages
+share/spamassassin/triplets.txt
+share/spamassassin/user_prefs.template
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/Changes
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.spamd
+%%PORTDOCS%%%%DOCSDIR%%/README.spamd-vpopmail
+%%PORTDOCS%%%%DOCSDIR%%/README.sql
+%%PORTDOCS%%%%DOCSDIR%%/TRADEMARK
+%%PORTDOCS%%%%DOCSDIR%%/USAGE
+%%PORTDOCS%%%%DOCSDIR%%/procmailrc.example
+%%PORTDOCS%%%%DOCSDIR%%/sample-nonspam.txt
+%%PORTDOCS%%%%DOCSDIR%%/sample-spam.txt
+%%PORTDOCS%%%%DOCSDIR%%/spamassassin.sql
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Mail/SpamAssassin
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@unexec rmdir %D/etc/mail/spamassassin 2>/dev/null || true
+@unexec rmdir %D/etc/mail 2>/dev/null || true
 @dirrm share/spamassassin