- Update to 2.9.0

- Update COMMENT
- Add LICENSE
- Fix *_DEPENDS
- Use CONFLICTS_INSTALL instead of CONFLICTS
- Use PORTDOCS macro
- Use bsd.port.mk instead of bsd.port.pre.mk + bsd.port.post.mk
- Sort PLIST
- Use CPAN as primary WWW
- Take maintainership

Changes:	http://search.cpan.org/dist/Mail-SPF/CHANGES

5 files changed, 49 insertions, 88 deletions

diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile
index c648dbf3064e..0f0a3d5699ef 100644
--- a/mail/p5-Mail-SPF/Makefile
+++ b/mail/p5-Mail-SPF/Makefile
@@ -2,30 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	Mail-SPF
-PORTVERSION=	2.007
-PORTREVISION=	3
+PORTVERSION=	2.9.0
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Reference implementation of the RFC 4408 SPF protocol
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Object-oriented implementation of Sender Policy Framework
 
-RUN_DEPENDS=	p5-Net-DNS-Resolver-Programmable>=0.002.1:${PORTSDIR}/dns/p5-Net-DNS-Resolver-Programmable \
-		p5-Net-DNS>=0.58:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-version>0:${PORTSDIR}/devel/p5-version \
-		p5-Error>0:${PORTSDIR}/lang/p5-Error \
+LICENSE=	BSD
+
+BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error \
+		p5-Net-DNS>=0.62:${PORTSDIR}/dns/p5-Net-DNS \
+		p5-Net-DNS-Resolver-Programmable>=0.003:${PORTSDIR}/dns/p5-Net-DNS-Resolver-Programmable \
 		p5-NetAddr-IP>=4:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
 		p5-URI>=1.13:${PORTSDIR}/net/p5-URI
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
 
-CONFLICTS=	p5-Mail-SPF-Query-[0-9]*
+CONFLICTS_INSTALL=	p5-Mail-SPF-Query-[0-9]*
+
+OPTIONS_DEFINE=	DOCS
 
-USES=		perl5
-USE_PERL5=	modbuild
 CONFIGURE_ARGS=	--install_path sbin=${PREFIX}/sbin
+NO_STAGE=	yes
+USE_PERL5=	modbuild
+USES=		perl5
 
+DOCSDIR=	${PREFIX}/share/doc/p5-Mail-SPF
 MAN1=		spfquery.pl.1
 MAN3=		Mail::SPF.3 Mail::SPF::Mech::PTR.3 Mail::SPF::Mech.3 \
 		Mail::SPF::SenderIPAddrMech.3 Mail::SPF::MacroString.3 \
@@ -37,22 +42,19 @@ MAN3=		Mail::SPF.3 Mail::SPF::Mech::PTR.3 Mail::SPF::Mech.3 \
 		Mail::SPF::v2::Record.3 Mail::SPF::Mod::Redirect.3 \
 		Mail::SPF::Base.3 Mail::SPF::Mech::All.3 Mail::SPF::Term.3 \
 		Mail::SPF::v1::Record.3 Mail::SPF::Mech::Exists.3
+PORTDOCS=	CHANGES README TODO
 
-OPTIONS_DEFINE=	DOCS
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-DOCSDIR=	${PREFIX}/share/doc/p5-Mail-SPF
-DOCS=		CHANGES INSTALL LICENSE README TODO
+.include <bsd.port.options.mk>
 
-post-extract:
-	${MV} ${WRKSRC}/bin/spfquery ${WRKSRC}/bin/spfquery.pl
+post-patch:
+	@${MV} ${WRKSRC}/sbin/spfd ${WRKSRC}/sbin/spfd.pl
+	@${MV} ${WRKSRC}/bin/spfquery ${WRKSRC}/bin/spfquery.pl
+	@${REINPLACE_CMD} -e 's|spfd|&.pl|; s|spfquery|&.pl|' ${WRKSRC}/Build.PL ${WRKSRC}/MANIFEST ${WRKSRC}/README
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	${MKDIR} ${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/p5-Mail-SPF/distinfo b/mail/p5-Mail-SPF/distinfo
index 40013c7c26fc..3137bf91df98 100644
--- a/mail/p5-Mail-SPF/distinfo
+++ b/mail/p5-Mail-SPF/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Mail-SPF-v2.007.tar.gz) = d8886e6a5b300946434284a6527bbb68ed98d27d3582c8e475e338facb96c50b
-SIZE (Mail-SPF-v2.007.tar.gz) = 101722
+SHA256 (Mail-SPF-v2.9.0.tar.gz) = 61cb5915f1c7acc7a931ffc1bfc1291bdfac555e2a46eb2391b995ea9ecb6162
+SIZE (Mail-SPF-v2.9.0.tar.gz) = 103834
diff --git a/mail/p5-Mail-SPF/files/patch-spfquery-suffix b/mail/p5-Mail-SPF/files/patch-spfquery-suffix
deleted file mode 100644
index 1355b738b101..000000000000
--- a/mail/p5-Mail-SPF/files/patch-spfquery-suffix
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur orig/Build.PL Build.PL
---- orig/Build.PL      2009-10-31 23:16:14.000000000 +0100
-+++ Build.PL   2011-05-24 19:40:10.000000000 +0200
-@@ -66,7 +66,7 @@
-                         => 'v0.002.1',
-     },
-     script_files    => [
--        'bin/spfquery'
-+        'bin/spfquery.pl'
-     ],
-     install_path    => {
-         'sbin'          => '/usr/sbin'
-diff -Naur orig/MANIFEST MANIFEST
---- orig/MANIFEST      2009-10-31 23:16:14.000000000 +0100
-+++ MANIFEST   2011-05-24 19:40:36.000000000 +0200
-@@ -1,4 +1,4 @@
--bin/spfquery
-+bin/spfquery.pl
- Build.PL
- CHANGES
- debian/changelog
-diff -Naur orig/README README
---- orig/README        2009-10-31 23:16:14.000000000 +0100
-+++ README     2011-05-24 19:40:54.000000000 +0200
-@@ -14,8 +14,8 @@
- 
- The Mail::SPF source package includes the following additional tools:
- 
--  * spfquery:  A command-line tool for performing SPF checks.
--  * spfd:      A daemon for services that perform SPF checks frequently.
-+  * spfquery.pl: A command-line tool for performing SPF checks.
-+  * spfd:        A daemon for services that perform SPF checks frequently.
- 
- Mail::SPF is not your mother!
- -----------------------------
diff --git a/mail/p5-Mail-SPF/pkg-descr b/mail/p5-Mail-SPF/pkg-descr
index 02dea499933b..cd13ee60e8ff 100644
--- a/mail/p5-Mail-SPF/pkg-descr
+++ b/mail/p5-Mail-SPF/pkg-descr
@@ -5,8 +5,8 @@ This release of Mail::SPF fully conforms to RFC 4408 and passes the 2006.11
 release of the official test-suite <http://www.openspf.org/Test_Suite>.
 
 The Mail::SPF source package includes the following additional tools:
+- spfquery: A command-line tool for performing SPF checks.
+- spfd:     A daemon for services that perform SPF checks frequently.
 
-  * spfquery:  A command-line tool for performing SPF checks.
-  * spfd:      A daemon for services that perform SPF checks frequently.
-
+WWW: http://search.cpan.org/dist/Mail-SPF/
 WWW: http://www.openspf.org/
diff --git a/mail/p5-Mail-SPF/pkg-plist b/mail/p5-Mail-SPF/pkg-plist
index 844a9652cda9..f0af58e82cb8 100644
--- a/mail/p5-Mail-SPF/pkg-plist
+++ b/mail/p5-Mail-SPF/pkg-plist
@@ -1,39 +1,33 @@
 bin/spfquery.pl
-sbin/spfd
 %%SITE_PERL%%/Mail/SPF.pm
-%%SITE_PERL%%/Mail/SPF/MacroString.pm
-%%SITE_PERL%%/Mail/SPF/SenderIPAddrMech.pm
-%%SITE_PERL%%/Mail/SPF/Exception.pm
-%%SITE_PERL%%/Mail/SPF/Server.pm
-%%SITE_PERL%%/Mail/SPF/Util.pm
 %%SITE_PERL%%/Mail/SPF/Base.pm
-%%SITE_PERL%%/Mail/SPF/Term.pm
+%%SITE_PERL%%/Mail/SPF/Exception.pm
+%%SITE_PERL%%/Mail/SPF/MacroString.pm
 %%SITE_PERL%%/Mail/SPF/Mech.pm
-%%SITE_PERL%%/Mail/SPF/Record.pm
-%%SITE_PERL%%/Mail/SPF/Mod.pm
-%%SITE_PERL%%/Mail/SPF/Result.pm
-%%SITE_PERL%%/Mail/SPF/Request.pm
-%%SITE_PERL%%/Mail/SPF/v1/Record.pm
-%%SITE_PERL%%/Mail/SPF/Mech/All.pm
 %%SITE_PERL%%/Mail/SPF/Mech/A.pm
-%%SITE_PERL%%/Mail/SPF/Mech/IP6.pm
-%%SITE_PERL%%/Mail/SPF/Mech/MX.pm
-%%SITE_PERL%%/Mail/SPF/Mech/Include.pm
+%%SITE_PERL%%/Mail/SPF/Mech/All.pm
 %%SITE_PERL%%/Mail/SPF/Mech/Exists.pm
 %%SITE_PERL%%/Mail/SPF/Mech/IP4.pm
+%%SITE_PERL%%/Mail/SPF/Mech/IP6.pm
+%%SITE_PERL%%/Mail/SPF/Mech/Include.pm
+%%SITE_PERL%%/Mail/SPF/Mech/MX.pm
 %%SITE_PERL%%/Mail/SPF/Mech/PTR.pm
-%%SITE_PERL%%/Mail/SPF/Mod/Redirect.pm
+%%SITE_PERL%%/Mail/SPF/Mod.pm
 %%SITE_PERL%%/Mail/SPF/Mod/Exp.pm
+%%SITE_PERL%%/Mail/SPF/Mod/Redirect.pm
+%%SITE_PERL%%/Mail/SPF/Record.pm
+%%SITE_PERL%%/Mail/SPF/Request.pm
+%%SITE_PERL%%/Mail/SPF/Result.pm
+%%SITE_PERL%%/Mail/SPF/SenderIPAddrMech.pm
+%%SITE_PERL%%/Mail/SPF/Server.pm
+%%SITE_PERL%%/Mail/SPF/Term.pm
+%%SITE_PERL%%/Mail/SPF/Util.pm
+%%SITE_PERL%%/Mail/SPF/v1/Record.pm
 %%SITE_PERL%%/Mail/SPF/v2/Record.pm
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/
+sbin/spfd.pl
+@dirrmtry %%SITE_PERL%%/Mail/SPF/v2
 @dirrmtry %%SITE_PERL%%/Mail/SPF/v1
 @dirrmtry %%SITE_PERL%%/Mail/SPF/Mod
 @dirrmtry %%SITE_PERL%%/Mail/SPF/Mech
-@dirrmtry %%SITE_PERL%%/Mail/SPF/v2
 @dirrmtry %%SITE_PERL%%/Mail/SPF
 @dirrmtry %%SITE_PERL%%/Mail