- Let mail/p5-Mail-SPF always install spfquery as spfquery.pl unconditionally to

  avoid conflict with mail/libspf2.
- Unregister conflict between mail/p5-Mail-SPF and mail/libspf2.

PR:		157107

5 files changed, 6 insertions, 57 deletions

diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile
index e12e6164d704..e793141e8ac2 100644
--- a/mail/libspf2/Makefile
+++ b/mail/libspf2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libspf2
 PORTVERSION=	1.2.10
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.libspf2.org/spf/ \
 		LOCAL/sunpoet
@@ -13,7 +14,7 @@ COMMENT=	Sender Rewriting Scheme 2 C Implementation
 LICENSE=	BSD LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-CONFLICTS=	${PORTNAME}-1.0.* p5-Mail-SPF-[0-9]* p5-Mail-SPF-Query-[0-9]*
+CONFLICTS=	${PORTNAME}-1.0.* p5-Mail-SPF-Query-[0-9]*
 
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile
index 62d296514c32..f79aa25f22e0 100644
--- a/mail/p5-Mail-SPF/Makefile
+++ b/mail/p5-Mail-SPF/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Mail-SPF
 PORTVERSION=	2.007
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -25,6 +25,7 @@ CONFLICTS=	p5-Mail-SPF-Query-[0-9]*
 PERL_MODBUILD=	yes
 CONFIGURE_ARGS=	--install_path sbin=${PREFIX}/sbin
 
+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 \
@@ -36,35 +37,15 @@ MAN3=		Mail::SPF.3 Mail::SPF::Mech::PTR.3 Mail::SPF::Mech.3 \
 		Mail::SPF::Base.3 Mail::SPF::Mech::All.3 Mail::SPF::Term.3 \
 		Mail::SPF::v1::Record.3 Mail::SPF::Mech::Exists.3
 
-OPTIONS_DEFINE=	SPFQUERY SPFQUERY_SUFFIX DOCS
-SPFQUERY_DESC=	Install spfquery command-line tool
-SPFQUERY_SUFFIX_DESC=Add .pl suffix to spfquery
-OPTIONS_DEFAULT=SPFQUERY SPFQUERY_SUFFIX
+OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 DOCSDIR=	${PREFIX}/share/doc/p5-Mail-SPF
 DOCS=		CHANGES INSTALL LICENSE README TODO
 
-.if ${PORT_OPTIONS:MSPFQUERY}
-PLIST_SUB+=	SPFQUERY=""
-
-.if ${PORT_OPTIONS:MSPFQUERY_SUFFIX}
-PLIST_SUB+=	SPFQUERY_SUFFIX=".pl"
-MAN1+=		spfquery.pl.1
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-spfquery-suffix
 post-extract:
 	${MV} ${WRKSRC}/bin/spfquery ${WRKSRC}/bin/spfquery.pl
-.else
-PLIST_SUB+=	SPFQUERY_SUFFIX=""
-MAN1+=		spfquery.1
-CONFLICTS+=	libspf2-[0-9]*
-.endif
-
-.else
-PLIST_SUB+=	SPFQUERY="@comment "
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-no-spfquery
-.endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/mail/p5-Mail-SPF/files/extra-patch-no-spfquery b/mail/p5-Mail-SPF/files/extra-patch-no-spfquery
deleted file mode 100644
index e2abc6438f44..000000000000
--- a/mail/p5-Mail-SPF/files/extra-patch-no-spfquery
+++ /dev/null
@@ -1,33 +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:27:19.000000000 +0200
-@@ -66,7 +66,6 @@
-                         => 'v0.002.1',
-     },
-     script_files    => [
--        'bin/spfquery'
-     ],
-     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:26:56.000000000 +0200
-@@ -1,4 +1,3 @@
--bin/spfquery
- 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:27:05.000000000 +0200
-@@ -12,9 +12,8 @@
- This release of Mail::SPF fully conforms to RFC 4408 and passes the 2008.08
- release of the official test-suite <http://www.openspf.org/Test_Suite>.
- 
--The Mail::SPF source package includes the following additional tools:
-+The Mail::SPF source package includes the following additional tool:
- 
--  * spfquery:  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/files/extra-patch-spfquery-suffix b/mail/p5-Mail-SPF/files/patch-spfquery-suffix
index 1355b738b101..1355b738b101 100644
--- a/mail/p5-Mail-SPF/files/extra-patch-spfquery-suffix
+++ b/mail/p5-Mail-SPF/files/patch-spfquery-suffix
diff --git a/mail/p5-Mail-SPF/pkg-plist b/mail/p5-Mail-SPF/pkg-plist
index 0f4a436f01d8..844a9652cda9 100644
--- a/mail/p5-Mail-SPF/pkg-plist
+++ b/mail/p5-Mail-SPF/pkg-plist
@@ -1,4 +1,4 @@
-%%SPFQUERY%%bin/spfquery%%SPFQUERY_SUFFIX%%
+bin/spfquery.pl
 sbin/spfd
 %%SITE_PERL%%/Mail/SPF.pm
 %%SITE_PERL%%/Mail/SPF/MacroString.pm