pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail Add conflicts between "libspf_alt" and "libspf2" ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d2bbe80925f3
branches:  trunk
changeset: 549084:d2bbe80925f3
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Oct 27 10:24:09 2008 +0000

description:
Add conflicts between "libspf_alt" and "libspf2" which e.g. both install
a program called "bin/spfquery". Bump package revisions of both packages.

diffstat:

 mail/libspf-alt/Makefile |  6 ++++--
 mail/libspf2/Makefile    |  5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 9edb6c28a21b -r d2bbe80925f3 mail/libspf-alt/Makefile
--- a/mail/libspf-alt/Makefile  Mon Oct 27 04:54:00 2008 +0000
+++ b/mail/libspf-alt/Makefile  Mon Oct 27 10:24:09 2008 +0000
@@ -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 @@
 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 -r 9edb6c28a21b -r d2bbe80925f3 mail/libspf2/Makefile
--- a/mail/libspf2/Makefile     Mon Oct 27 04:54:00 2008 +0000
+++ b/mail/libspf2/Makefile     Mon Oct 27 10:24:09 2008 +0000
@@ -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 @@
 GNU_CONFIGURE= YES
 USE_LIBTOOL=   YES
 
+CONFLICTS+=    libspf_alt-*
+
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index