[pkgsrc/trunk]: pkgsrc Mark devel/tre and textproc/glimpse as conflicting sin...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b9e1205f066e
branches:  trunk
changeset: 398710:b9e1205f066e
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Mon Sep 07 11:18:49 2009 +0000

description:
Mark devel/tre and textproc/glimpse as conflicting since both install
${PREFIX}/bin/agrep (approx. grep utility).

diffstat:

 devel/tre/Makefile        |  6 +++++-
 textproc/glimpse/Makefile |  6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r 98a9923c0a6d -r b9e1205f066e devel/tre/Makefile
--- a/devel/tre/Makefile        Mon Sep 07 11:04:40 2009 +0000
+++ b/devel/tre/Makefile        Mon Sep 07 11:18:49 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2009/08/17 20:58:26 agc Exp $
+# $NetBSD: Makefile,v 1.14 2009/09/07 11:18:49 ghen Exp $
 
 DISTNAME=      tre-0.7.6
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://laurikari.net/tre/
 
@@ -9,6 +10,9 @@
 COMMENT=       Lightweight and robust POSIX compliant regexp matching library
 LICENSE=       modified-bsd
 
+# both install bin/agrep (approx. grep)
+CONFLICTS+=    glimpse-[0-9]*
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         YES
diff -r 98a9923c0a6d -r b9e1205f066e textproc/glimpse/Makefile
--- a/textproc/glimpse/Makefile Mon Sep 07 11:04:40 2009 +0000
+++ b/textproc/glimpse/Makefile Mon Sep 07 11:18:49 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2009/06/30 00:07:23 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2009/09/07 11:18:50 ghen Exp $
 
 DISTNAME=      glimpse-4.18.5
+PKGREVISION=   1
 CATEGORIES=    textproc databases
 MASTER_SITES=  http://webglimpse.net/trial/
 
@@ -13,6 +14,9 @@
 NO_SRC_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 
+# both install bin/agrep (approx. grep)
+CONFLICTS+=    tre>=0.7.5nb6
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 MAKE_JOBS_SAFE=                no