diff options
| author | wiz <wiz@pkgsrc.org> | 2003-04-10 18:42:29 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2003-04-10 18:42:29 +0000 |
| commit | 77129f3dd7371ad712e87ca1dc766c145efc2154 (patch) | |
| tree | 60267473314a70182eda043751863bd6306281ec | |
| parent | 08801f2a5db224ffe43ed9d57e5e9e7a2a95e4aa (diff) | |
| download | pkgsrc-77129f3dd7371ad712e87ca1dc766c145efc2154.tar.gz | |
coreutils and gnome-utils currently conflict because both install guname.
| -rw-r--r-- | misc/gnome-utils/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/coreutils/Makefile | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile index bd52928d80f..2295c567eba 100644 --- a/misc/gnome-utils/Makefile +++ b/misc/gnome-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2003/02/18 14:56:00 jmmv Exp $ +# $NetBSD: Makefile,v 1.56 2003/04/10 18:42:30 wiz Exp $ DISTNAME= gnome-utils-1.4.1.2 PKGREVISION= 1 @@ -13,6 +13,8 @@ COMMENT= Set of useful GNOME utilities and applications BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison BUILD_DEPENDS+= xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools +CONFLICTS= coreutils-[0-9]* + USE_GMAKE= YES USE_X11BASE= YES USE_BUILDLINK2= YES diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index d735c65d0ee..a89deadf487 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/04/10 13:18:36 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2003/04/10 18:42:29 wiz Exp $ # DISTNAME= coreutils-5.0 @@ -27,6 +27,7 @@ CONFIGURE_ARGS= --program-prefix=${GNU_PROGRAM_PREFIX} # GNU_PROGRAM_PREFIX == 'g' . if ${GNU_PROGRAM_PREFIX} == "g" CONFLICTS+= id-utils-[0-9]* +CONFLICTS+= gnome-utils-* . endif .endif PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} |