diff options
| author | obache <obache> | 2011-02-27 13:06:12 +0000 |
|---|---|---|
| committer | obache <obache> | 2011-02-27 13:06:12 +0000 |
| commit | 2f034261da6e19b52fbf37b9ddec80b3246fd1c9 (patch) | |
| tree | 819f37751a16ad57ccc13d942bea6a51ad810a51 /mail | |
| parent | 37bdfb757f09cfcda74a1a2c527b4558f8f770b9 (diff) | |
| download | pkgsrc-2f034261da6e19b52fbf37b9ddec80b3246fd1c9.tar.gz | |
Fixes CONFLICTS pattern and add new conflict with p5-Mail-SPF.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/libspf-alt/Makefile | 5 | ||||
| -rw-r--r-- | mail/libspf2/Makefile | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile index 2021a78e5b1..22793232af2 100644 --- a/mail/libspf-alt/Makefile +++ b/mail/libspf-alt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2011/02/27 12:48:05 obache Exp $ +# $NetBSD: Makefile,v 1.21 2011/02/27 13:06:12 obache Exp $ DISTNAME= libspf_alt-0.4.0 PKGREVISION= 4 @@ -14,7 +14,8 @@ PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= YES CONFIGURE_ARGS+=--with-bind=${BUILDLINK_PREFIX.libbind} -CONFLICTS+= libspf2-* +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 1c7b78cbc3f..6c7503229bd 100644 --- a/mail/libspf2/Makefile +++ b/mail/libspf2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2009/09/08 10:36:27 tron Exp $ +# $NetBSD: Makefile,v 1.8 2011/02/27 13:06:12 obache Exp $ DISTNAME= libspf2-1.2.9 PKGREVISION= 1 @@ -14,6 +14,7 @@ PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= YES USE_LIBTOOL= YES -CONFLICTS+= libspf_alt-* +CONFLICTS+= libspf_alt-[0-9]* +CONFLICTS+= p5-Mail-SPF-[0-9]* .include "../../mk/bsd.pkg.mk" |