Revert commit 323487 since renaming spfquery.pl to spfquery causes a

conflict with mail/libspf2

5 files changed, 44 insertions, 12 deletions

diff --git a/UPDATING b/UPDATING
index 3d3569d27fa0..8e8e2fe1023d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,13 +5,6 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
-20130723:
-  AFFECTS: users of mail/p5-Mail-SPF
-  AUTHOR: skreuzer@FreeBSD.org
-
-  With the update to 2.9.0 of mail/p5-Mail-SPF, the executable
-  bin/spfquery.pl has been renamed to bin/spfquery
-
 20130720:
   AFFECTS: users of japanese/mozc-server and japanese/mozc-el
   AUTHOR: hrs@FreeBSD.org
diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile
index 457e392d15ea..f79aa25f22e0 100644
--- a/mail/p5-Mail-SPF/Makefile
+++ b/mail/p5-Mail-SPF/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	Mail-SPF
-PORTVERSION=	2.9.0
+PORTVERSION=	2.007
+PORTREVISION=	3
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -24,7 +25,7 @@ CONFLICTS=	p5-Mail-SPF-Query-[0-9]*
 PERL_MODBUILD=	yes
 CONFIGURE_ARGS=	--install_path sbin=${PREFIX}/sbin
 
-MAN1=		spfquery.1
+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 \
 		Mail::SPF::Mech::IP4.3 Mail::SPF::Mech::A.3 \
@@ -43,6 +44,9 @@ OPTIONS_DEFINE=	DOCS
 DOCSDIR=	${PREFIX}/share/doc/p5-Mail-SPF
 DOCS=		CHANGES INSTALL LICENSE README TODO
 
+post-extract:
+	${MV} ${WRKSRC}/bin/spfquery ${WRKSRC}/bin/spfquery.pl
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
diff --git a/mail/p5-Mail-SPF/distinfo b/mail/p5-Mail-SPF/distinfo
index 3137bf91df98..40013c7c26fc 100644
--- a/mail/p5-Mail-SPF/distinfo
+++ b/mail/p5-Mail-SPF/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Mail-SPF-v2.9.0.tar.gz) = 61cb5915f1c7acc7a931ffc1bfc1291bdfac555e2a46eb2391b995ea9ecb6162
-SIZE (Mail-SPF-v2.9.0.tar.gz) = 103834
+SHA256 (Mail-SPF-v2.007.tar.gz) = d8886e6a5b300946434284a6527bbb68ed98d27d3582c8e475e338facb96c50b
+SIZE (Mail-SPF-v2.007.tar.gz) = 101722
diff --git a/mail/p5-Mail-SPF/files/patch-spfquery-suffix b/mail/p5-Mail-SPF/files/patch-spfquery-suffix
new file mode 100644
index 000000000000..1355b738b101
--- /dev/null
+++ b/mail/p5-Mail-SPF/files/patch-spfquery-suffix
@@ -0,0 +1,35 @@
+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-plist b/mail/p5-Mail-SPF/pkg-plist
index e9e86ada2c2e..844a9652cda9 100644
--- a/mail/p5-Mail-SPF/pkg-plist
+++ b/mail/p5-Mail-SPF/pkg-plist
@@ -1,4 +1,4 @@
-bin/spfquery
+bin/spfquery.pl
 sbin/spfd
 %%SITE_PERL%%/Mail/SPF.pm
 %%SITE_PERL%%/Mail/SPF/MacroString.pm