diff options
| author | tron <tron> | 2008-10-27 10:24:09 +0000 |
|---|---|---|
| committer | tron <tron> | 2008-10-27 10:24:09 +0000 |
| commit | efacdec6091efffc5a15413d20d2e7eade38485a (patch) | |
| tree | cd2939f366052e3ddcc67ef1cdf71a900ec96ca7 /mail | |
| parent | 5c6931e5bbcb3369973ff74e029a20edfce2f2b1 (diff) | |
| download | pkgsrc-efacdec6091efffc5a15413d20d2e7eade38485a.tar.gz | |
Add conflicts between "libspf_alt" and "libspf2" which e.g. both install
a program called "bin/spfquery". Bump package revisions of both packages.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/libspf-alt/Makefile | 6 | ||||
| -rw-r--r-- | mail/libspf2/Makefile | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile index ec86b6c3041..fd6e4732757 100644 --- a/mail/libspf-alt/Makefile +++ b/mail/libspf-alt/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2008/07/14 12:56:07 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2008/10/27 10:24:09 tron Exp $ DISTNAME= libspf_alt-0.4.0 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= mail MASTER_SITES= http://libspf2.org/ @@ -16,6 +16,8 @@ BUILDLINK_API_DEPENDS.bind+= bind>=9.2.3nb3 GNU_CONFIGURE= YES CONFIGURE_ARGS+=--with-bind=${BUILDLINK_PREFIX.bind} +CONFLICTS+= libspf2-* + .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/resolv.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile index c29ebf3da79..accda955186 100644 --- a/mail/libspf2/Makefile +++ b/mail/libspf2/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2008/10/24 23:35:09 adrianp Exp $ +# $NetBSD: Makefile,v 1.4 2008/10/27 10:24:09 tron Exp $ DISTNAME= libspf2-1.2.8 +PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.libspf2.org/spf/ @@ -13,4 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= YES USE_LIBTOOL= YES +CONFLICTS+= libspf_alt-* + .include "../../mk/bsd.pkg.mk" |