* Convert to staging

* Take maintainership

3 files changed, 88 insertions, 106 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 143234bfac89..bcc64ba2758b 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
 PKGNAMEPREFIX?=	p5-
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:apache,cpan
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	perl@FreeBSD.org
 COMMENT?=	A highly efficient mail filter for identifying spam
 
 LICENSE=	APACHE20
@@ -55,7 +55,6 @@ IPV6_DESC=		IPv6 sockets support
 SUB_FILES=	pkg-install
 SUB_LIST=	USER=${USERS} GROUP=${GROUPS} INSTALL="${INSTALL}"
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
@@ -138,8 +137,6 @@ RUN_DEPENDS+=	p5-IP-Country>=0:${PORTSDIR}/net/p5-IP-Country
 RUN_DEPENDS+=	dcc-dccd>=1.3.111:${PORTSDIR}/mail/dcc-dccd
 .endif
 
-.include "${FILESDIR}/manpages"
-
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 DATADIR=	${PREFIX}/share/spamassassin
 DOCS=		CREDITS Changes INSTALL NOTICE PACKAGING README TRADEMARK UPGRADE USAGE procmailrc.example
@@ -198,44 +195,26 @@ post-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libsslspamc.so)
 .endif
 
-pre-su-install:
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_PROGRAM} ${WRKSRC}/spamc/libspamc.so ${PREFIX}/lib/libspamc.so.0
-	@${LN} -sf libspamc.so.0 ${PREFIX}/lib/libspamc.so
+pre-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/spamc/libspamc.so ${STAGEDIR}${PREFIX}/lib/libspamc.so.0
+	@${LN} -sf libspamc.so.0 ${STAGEDIR}${PREFIX}/lib/libspamc.so
 .if ${PORT_OPTIONS:MSSL}
-	@${INSTALL_PROGRAM} ${WRKSRC}/spamc/libsslspamc.so ${PREFIX}/lib/libsslspamc.so.0
-	@${LN} -sf libsslspamc.so.0 ${PREFIX}/lib/libsslspamc.so
+	@${INSTALL_PROGRAM} ${WRKSRC}/spamc/libsslspamc.so ${STAGEDIR}${PREFIX}/lib/libsslspamc.so.0
+	@${LN} -sf libsslspamc.so.0 ${STAGEDIR}${PREFIX}/lib/libsslspamc.so
 .endif
-	@${INSTALL_DATA} ${WRKSRC}/spamc/libspamc.h ${PREFIX}/include
+	@${INSTALL_DATA} ${WRKSRC}/spamc/libspamc.h ${STAGEDIR}${PREFIX}/include
 
 post-install::
 .if ${PORT_OPTIONS:MSPAMC}
-	@${STRIP_CMD} ${PREFIX}/bin/spamc
-.endif
-	@[ -f ${ETCDIR}/init.pre ] || \
-		${INSTALL_DATA} ${ETCDIR}/init.pre.sample \
-			${ETCDIR}/init.pre
-	@[ -f ${ETCDIR}/v310.pre ] || \
-		${INSTALL_DATA} ${ETCDIR}/v310.pre.sample \
-			${ETCDIR}/v310.pre
-	@[ -f ${ETCDIR}/v312.pre ] || \
-		${INSTALL_DATA} ${ETCDIR}/v312.pre.sample \
-			${ETCDIR}/v312.pre
-	@[ -f ${ETCDIR}/v320.pre ] || \
-		${INSTALL_DATA} ${ETCDIR}/v320.pre.sample \
-			${ETCDIR}/v320.pre
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@[ -f ${ETCDIR}/v330.pre ] || \
-		${INSTALL_DATA} ${ETCDIR}/v330.pre.sample \
-			${ETCDIR}/v330.pre
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spamc
+.endif
 
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/sql ${DOCSDIR}/ldap
-	@${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-	@${INSTALL_DATA} ${DOCSSQL:S|^|${WRKSRC}/sql/|} ${DOCSDIR}/sql
-	@${INSTALL_DATA} ${DOCSLDAP:S|^|${WRKSRC}/ldap/|} ${DOCSDIR}/ldap
-
+	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/sql ${STAGEDIR}${DOCSDIR}/ldap
+	@${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${DOCSSQL:S|^|${WRKSRC}/sql/|} ${STAGEDIR}${DOCSDIR}/sql
+	@${INSTALL_DATA} ${DOCSLDAP:S|^|${WRKSRC}/ldap/|} ${STAGEDIR}${DOCSDIR}/ldap
 .endif
-	@${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/mail/p5-Mail-SpamAssassin/files/manpages b/mail/p5-Mail-SpamAssassin/files/manpages
deleted file mode 100644
index cff33c9c99ec..000000000000
--- a/mail/p5-Mail-SpamAssassin/files/manpages
+++ /dev/null
@@ -1,71 +0,0 @@
-# $FreeBSD$
-MAN3+=		Mail::SpamAssassin.3 \
-		Mail::SpamAssassin::AICache.3 \
-		Mail::SpamAssassin::ArchiveIterator.3 \
-		Mail::SpamAssassin::AsyncLoop.3 \
-		Mail::SpamAssassin::AutoWhitelist.3 \
-		Mail::SpamAssassin::Bayes.3 \
-		Mail::SpamAssassin::BayesStore.3 \
-		Mail::SpamAssassin::BayesStore::BDB.3 \
-		Mail::SpamAssassin::BayesStore::MySQL.3 \
-		Mail::SpamAssassin::BayesStore::PgSQL.3 \
-		Mail::SpamAssassin::BayesStore::SQL.3 \
-		Mail::SpamAssassin::Client.3 \
-		Mail::SpamAssassin::Conf.3 \
-		Mail::SpamAssassin::Conf::LDAP.3 \
-		Mail::SpamAssassin::Conf::Parser.3 \
-		Mail::SpamAssassin::Conf::SQL.3 \
-		Mail::SpamAssassin::DnsResolver.3 \
-		Mail::SpamAssassin::Logger.3 \
-		Mail::SpamAssassin::Logger::File.3 \
-		Mail::SpamAssassin::Logger::Stderr.3 \
-		Mail::SpamAssassin::Logger::Syslog.3 \
-		Mail::SpamAssassin::Message.3 \
-		Mail::SpamAssassin::Message::Metadata.3 \
-		Mail::SpamAssassin::Message::Node.3 \
-		Mail::SpamAssassin::PerMsgLearner.3 \
-		Mail::SpamAssassin::PerMsgStatus.3 \
-		Mail::SpamAssassin::PersistentAddrList.3 \
-		Mail::SpamAssassin::Plugin.3 \
-		Mail::SpamAssassin::Plugin::ASN.3 \
-		Mail::SpamAssassin::Plugin::AWL.3 \
-		Mail::SpamAssassin::Plugin::AccessDB.3 \
-		Mail::SpamAssassin::Plugin::AntiVirus.3 \
-		Mail::SpamAssassin::Plugin::AutoLearnThreshold.3 \
-		Mail::SpamAssassin::Plugin::Bayes.3 \
-		Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor.3 \
-		Mail::SpamAssassin::Plugin::Check.3 \
-		Mail::SpamAssassin::Plugin::DCC.3 \
-		Mail::SpamAssassin::Plugin::DKIM.3 \
-		Mail::SpamAssassin::Plugin::Hashcash.3 \
-		Mail::SpamAssassin::Plugin::MIMEHeader.3 \
-		Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3 \
-		Mail::SpamAssassin::Plugin::PhishTag.3 \
-		Mail::SpamAssassin::Plugin::Pyzor.3 \
-		Mail::SpamAssassin::Plugin::Razor2.3 \
-		Mail::SpamAssassin::Plugin::RelayCountry.3 \
-		Mail::SpamAssassin::Plugin::ReplaceTags.3 \
-		Mail::SpamAssassin::Plugin::Reuse.3 \
-		Mail::SpamAssassin::Plugin::Rule2XSBody.3 \
-		Mail::SpamAssassin::Plugin::SPF.3 \
-		Mail::SpamAssassin::Plugin::Shortcircuit.3 \
-		Mail::SpamAssassin::Plugin::SpamCop.3 \
-		Mail::SpamAssassin::Plugin::Test.3 \
-		Mail::SpamAssassin::Plugin::TextCat.3 \
-		Mail::SpamAssassin::Plugin::URIDNSBL.3 \
-		Mail::SpamAssassin::Plugin::URIDetail.3 \
-		Mail::SpamAssassin::Plugin::VBounce.3 \
-		Mail::SpamAssassin::Plugin::WhiteListSubject.3 \
-		Mail::SpamAssassin::PluginHandler.3 \
-		Mail::SpamAssassin::SQLBasedAddrList.3 \
-		Mail::SpamAssassin::SubProcBackChannel.3 \
-		Mail::SpamAssassin::Timeout.3 \
-		Mail::SpamAssassin::Util.3 \
-		Mail::SpamAssassin::Util::DependencyInfo.3 \
-		Mail::SpamAssassin::Util::Progress.3 \
-		Mail::SpamAssassin::Util::RegistrarBoundaries.3 \
-		spamassassin-run.3
-
-MAN1+=		spamd.1 spamassassin.1 spamc.1 sa-learn.1 sa-update.1 \
-		spamassassin-run.1 sa-compile.1 sa-awl.1
-
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist
index fa3ed6bc8c1a..56321c7fd1fd 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin/pkg-plist
@@ -29,6 +29,80 @@ lib/libspamc.so
 lib/libspamc.so.0
 %%SSL%%lib/libsslspamc.so
 %%SSL%%lib/libsslspamc.so.0
+%%PERL5_MAN3%%/Mail::SpamAssassin.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::AICache.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::ArchiveIterator.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::AsyncLoop.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::AutoWhitelist.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Bayes.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::BDB.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::MySQL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::PgSQL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::SQL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Client.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Conf.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Conf::LDAP.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Conf::Parser.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Conf::SQL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::DnsResolver.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Logger.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Logger::File.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Logger::Stderr.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Logger::Syslog.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Message.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Message::Metadata.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Message::Node.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::PerMsgLearner.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::PerMsgStatus.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::PersistentAddrList.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::ASN.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AWL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AccessDB.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AntiVirus.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AutoLearnThreshold.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Bayes.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Check.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DCC.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DKIM.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Hashcash.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::MIMEHeader.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::PhishTag.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Pyzor.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Razor2.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::RelayCountry.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::ReplaceTags.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Reuse.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Rule2XSBody.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::SPF.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Shortcircuit.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::SpamCop.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Test.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::TextCat.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::URIDNSBL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::URIDetail.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::VBounce.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::WhiteListSubject.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::PluginHandler.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::SQLBasedAddrList.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::SubProcBackChannel.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Timeout.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Util.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Util::DependencyInfo.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Util::Progress.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Util::RegistrarBoundaries.3.gz
+%%PERL5_MAN3%%/spamassassin-run.3.gz
+man/man1/sa-awl.1.gz
+man/man1/sa-compile.1.gz
+man/man1/sa-learn.1.gz
+man/man1/sa-update.1.gz
+man/man1/spamassassin-run.1.gz
+man/man1/spamassassin.1.gz
+man/man1/spamc.1.gz
+man/man1/spamd.1.gz
 %%SITE_PERL%%/Mail/SpamAssassin.pm
 %%SITE_PERL%%/Mail/SpamAssassin/AICache.pm
 %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm