Attachment 115338 Details for Bug 157107 – p5-Mail-SPF.patch

[patch] p5-Mail-SPF.patch

p5-Mail-SPF.patch (text/x-diff; charset=us-ascii), 6.14 KB, created by Stefan Walter on 2013-05-14 19:41:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Walter

Created: 2013-05-14 19:41:30 UTC

Size: 6.14 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 318175)
>+++ Makefile	(working copy)
>@@ -3,13 +3,13 @@
> 
> PORTNAME=	Mail-SPF
> PORTVERSION=	2.007
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	mail perl5
> MASTER_SITES=	CPAN
> PKGNAMEPREFIX=	p5-
> DISTNAME=	${PORTNAME}-v${PORTVERSION}
> 
>-MAINTAINER=	gmc@sonologic.nl
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Reference implementation of the RFC 4408 SPF protocol
> 
> RUN_DEPENDS=	p5-Net-DNS-Resolver-Programmable>=0.002.1:${PORTSDIR}/dns/p5-Net-DNS-Resolver-Programmable \
>@@ -20,12 +20,11 @@
> 		p5-URI>=1.13:${PORTSDIR}/net/p5-URI
> BUILD_DEPENDS:=	${RUN_DEPENDS}
> 
>-CONFLICTS=	libspf2-[0-9]* p5-Mail-SPF-Query-[0-9]*
>+CONFLICTS=	p5-Mail-SPF-Query-[0-9]*
> 
> PERL_MODBUILD=	yes
> CONFIGURE_ARGS=	--install_path sbin=${PREFIX}/sbin
> 
>-MAN1=		spfquery.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 \
>@@ -37,13 +36,38 @@
> 		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
>+
> .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 !defined(NOPORTDOCS)
>+.if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${DOCSDIR}
> 	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
> .endif
>Index: files/extra-patch-no-spfquery
>===================================================================
>--- files/extra-patch-no-spfquery	(revision 0)
>+++ files/extra-patch-no-spfquery	(working copy)
>@@ -0,0 +1,33 @@
>+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!
>
>Property changes on: files/extra-patch-no-spfquery
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/extra-patch-spfquery-suffix
>===================================================================
>--- files/extra-patch-spfquery-suffix	(revision 0)
>+++ files/extra-patch-spfquery-suffix	(working copy)
>@@ -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!
>+ -----------------------------
>
>Property changes on: files/extra-patch-spfquery-suffix
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 318175)
>+++ pkg-descr	(working copy)
>@@ -9,4 +9,4 @@
>   * spfquery:  A command-line tool for performing SPF checks.
>   * spfd:      A daemon for services that perform SPF checks frequently.
> 
>-WWW:	http://www.openspf.org/
>+WWW: http://www.openspf.org/
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 318175)
>+++ pkg-plist	(working copy)
>@@ -1,4 +1,4 @@
>-bin/spfquery
>+%%SPFQUERY%%bin/spfquery%%SPFQUERY_SUFFIX%%
> sbin/spfd
> %%SITE_PERL%%/Mail/SPF.pm
> %%SITE_PERL%%/Mail/SPF/MacroString.pm

Actions: View | Diff

Attachments on bug 157107: 115334 | 115335 | 115336 | 115337 | 115338