diff options
| author | tron <tron> | 2014-10-12 08:17:50 +0000 |
|---|---|---|
| committer | tron <tron> | 2014-10-12 08:17:50 +0000 |
| commit | ee2e34adc06a6c00d2d872088297d354dcccb48f (patch) | |
| tree | 159d58ca52afee7dbf619cbbebe24f7ec5a4d734 /mail | |
| parent | 64abeaa7905517d995efff63efc2a047f7fda6fc (diff) | |
| download | pkgsrc-ee2e34adc06a6c00d2d872088297d354dcccb48f.tar.gz | |
Remove conflict between "libspf-alt" respectively "libspf2" and
"p5-Mail-SPF". The first two packages install "bin/spfd" while the
latter install "sbin/spfd".
Problem pointed out by Petar Bogdanovic in PR pkg/49271.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/libspf-alt/Makefile | 5 | ||||
| -rw-r--r-- | mail/libspf2/Makefile | 4 | ||||
| -rw-r--r-- | mail/p5-Mail-SPF/Makefile | 9 |
3 files changed, 6 insertions, 12 deletions
diff --git a/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile index a5644652855..b55e96c7604 100644 --- a/mail/libspf-alt/Makefile +++ b/mail/libspf-alt/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2013/04/06 14:22:40 rodent Exp $ +# $NetBSD: Makefile,v 1.25 2014/10/12 08:17:50 tron Exp $ DISTNAME= libspf_alt-0.4.0 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= mail MASTER_SITES= http://libspf2.org/spf/ @@ -14,7 +14,6 @@ USE_LIBTOOL= yes CONFIGURE_ARGS+= --with-bind=${BUILDLINK_PREFIX.libbind} CONFLICTS+= libspf2-[0-9]* -CONFLICTS+= p5-Mail-SPF-[0-9]* .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/resolv.buildlink3.mk" diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile index 74c9158be55..2cf885701ad 100644 --- a/mail/libspf2/Makefile +++ b/mail/libspf2/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2013/07/06 11:09:26 tron Exp $ +# $NetBSD: Makefile,v 1.12 2014/10/12 08:17:50 tron Exp $ DISTNAME= libspf2-1.2.10 +PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.libspf2.org/spf/ @@ -13,6 +14,5 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES CONFLICTS+= libspf_alt-[0-9]* -CONFLICTS+= p5-Mail-SPF-[0-9]* .include "../../mk/bsd.pkg.mk" diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile index ad338e7484a..ffa33e33ef3 100644 --- a/mail/p5-Mail-SPF/Makefile +++ b/mail/p5-Mail-SPF/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2014/10/09 14:06:40 wiz Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/10/12 08:17:50 tron Exp $ DISTNAME= Mail-SPF-v2.007 PKGNAME= p5-${DISTNAME:S/-v/-/} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/} @@ -12,10 +11,6 @@ HOMEPAGE= http://search.cpan.org/dist/Mail-SPF/ COMMENT= Perl implementation of the Sender Policy Framework LICENSE= modified-bsd -# sbin/spfd -CONFLICTS+= libspf2-[0-9]* -CONFLICTS+= libspf-alt-[0-9]* - BUILD_DEPENDS+= p5-Net-DNS-Resolver-Programmable-[0-9]*:../../net/p5-Net-DNS-Resolver-Programmable BUILD_DEPENDS+= {perl>=5.6.2,p5-Test-Simple>=0.10}:../../devel/p5-Test-Simple |