diff options
| author | ghen <ghen@pkgsrc.org> | 2009-09-07 11:18:49 +0000 |
|---|---|---|
| committer | ghen <ghen@pkgsrc.org> | 2009-09-07 11:18:49 +0000 |
| commit | ae50239d00e973f3d52a75f0b7a5fdba4917c5dc (patch) | |
| tree | cef2d985e436ae1746be5a648d9d43edc80b4b80 | |
| parent | 9cadcb1707f7a2a6eb8816633d9fba735977169b (diff) | |
| download | pkgsrc-ae50239d00e973f3d52a75f0b7a5fdba4917c5dc.tar.gz | |
Mark devel/tre and textproc/glimpse as conflicting since both install
${PREFIX}/bin/agrep (approx. grep utility).
| -rw-r--r-- | devel/tre/Makefile | 6 | ||||
| -rw-r--r-- | textproc/glimpse/Makefile | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/devel/tre/Makefile b/devel/tre/Makefile index df069674d07..55ee7ce51e2 100644 --- a/devel/tre/Makefile +++ b/devel/tre/Makefile @@ -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 @@ HOMEPAGE= http://laurikari.net/tre/ 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 --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile index 5cb94ac0984..e5330b44471 100644 --- a/textproc/glimpse/Makefile +++ b/textproc/glimpse/Makefile @@ -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 @@ RESTRICTED= Redistribution only on non-profit basis. 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 |