svn commit: r321065 - in head/mail: libspf2 p5-Mail-SPF p5-Mail-SPF/files
Stefan Walter
stefan at FreeBSD.org
Sun Jun 16 18:16:17 UTC 2013
Author: stefan
Date: Sun Jun 16 18:16:16 2013
New Revision: 321065
URL: http://svnweb.freebsd.org/changeset/ports/321065
Log:
- 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
Added:
head/mail/p5-Mail-SPF/files/patch-spfquery-suffix
- copied unchanged from r318188, head/mail/p5-Mail-SPF/files/extra-patch-spfquery-suffix
Deleted:
head/mail/p5-Mail-SPF/files/extra-patch-no-spfquery
head/mail/p5-Mail-SPF/files/extra-patch-spfquery-suffix
Modified:
head/mail/libspf2/Makefile
head/mail/p5-Mail-SPF/Makefile
head/mail/p5-Mail-SPF/pkg-plist
Modified: head/mail/libspf2/Makefile
==============================================================================
--- head/mail/libspf2/Makefile Sun Jun 16 18:06:18 2013 (r321064)
+++ head/mail/libspf2/Makefile Sun Jun 16 18:16:16 2013 (r321065)
@@ -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 Imp
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
Modified: head/mail/p5-Mail-SPF/Makefile
==============================================================================
--- head/mail/p5-Mail-SPF/Makefile Sun Jun 16 18:06:18 2013 (r321064)
+++ head/mail/p5-Mail-SPF/Makefile Sun Jun 16 18:16:16 2013 (r321065)
@@ -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.
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}
Copied: head/mail/p5-Mail-SPF/files/patch-spfquery-suffix (from r318188, head/mail/p5-Mail-SPF/files/extra-patch-spfquery-suffix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/p5-Mail-SPF/files/patch-spfquery-suffix Sun Jun 16 18:16:16 2013 (r321065, copy of r318188, head/mail/p5-Mail-SPF/files/extra-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!
+ -----------------------------
Modified: head/mail/p5-Mail-SPF/pkg-plist
==============================================================================
--- head/mail/p5-Mail-SPF/pkg-plist Sun Jun 16 18:06:18 2013 (r321064)
+++ head/mail/p5-Mail-SPF/pkg-plist Sun Jun 16 18:16:16 2013 (r321065)
@@ -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
More information about the svn-ports-head
mailing list