diff options
| author | tron <tron> | 2003-04-11 11:36:03 +0000 |
|---|---|---|
| committer | tron <tron> | 2003-04-11 11:36:03 +0000 |
| commit | d3df579fbc5a70697fb12b6022bd679db879c358 (patch) | |
| tree | 4cbb14fb0193badfe4120dfb31c41d373ad1a7ea /sysutils | |
| parent | 45c510aa43f17987ff87f2b8b1daa770d0365cfc (diff) | |
| download | pkgsrc-d3df579fbc5a70697fb12b6022bd679db879c358.tar.gz | |
Don't conflict with the latest version of the "gnome-utils" package which
doesn't install the "guname" package any more. Bump package revision to
reflect change.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/coreutils/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index a89deadf487..7d52dad7e97 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2003/04/10 18:42:29 wiz Exp $ -# +# $NetBSD: Makefile,v 1.3 2003/04/11 11:36:03 tron Exp $ DISTNAME= coreutils-5.0 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/} EXTRACT_SUFX= .tar.bz2 @@ -12,8 +12,7 @@ COMMENT= GNU basic file, shell and text manipulation utilities BUILD_USES_MSGFMT= YES -CONFLICTS= sh-utils-* fileutils-* -CONFLICTS+= textutils-* +CONFLICTS= sh-utils-* fileutils-* textutils-* GNU_CONFIGURE= YES USE_BUILDLINK2= YES @@ -26,8 +25,7 @@ CONFIGURE_ARGS= --program-prefix=${GNU_PROGRAM_PREFIX} # devel/id-utils installs a 'gid' program, so conflict with it if # GNU_PROGRAM_PREFIX == 'g' . if ${GNU_PROGRAM_PREFIX} == "g" -CONFLICTS+= id-utils-[0-9]* -CONFLICTS+= gnome-utils-* +CONFLICTS+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2 . endif .endif PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} |