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.
This commit is contained in:
parent
9e2d0cea51
commit
db48119bf5
1 changed files with 4 additions and 6 deletions
|
@ -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
|
DISTNAME= coreutils-5.0
|
||||||
|
PKGREVISION= 1
|
||||||
CATEGORIES= sysutils
|
CATEGORIES= sysutils
|
||||||
MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/}
|
MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/}
|
||||||
EXTRACT_SUFX= .tar.bz2
|
EXTRACT_SUFX= .tar.bz2
|
||||||
|
@ -12,8 +12,7 @@ COMMENT= GNU basic file, shell and text manipulation utilities
|
||||||
|
|
||||||
BUILD_USES_MSGFMT= YES
|
BUILD_USES_MSGFMT= YES
|
||||||
|
|
||||||
CONFLICTS= sh-utils-* fileutils-*
|
CONFLICTS= sh-utils-* fileutils-* textutils-*
|
||||||
CONFLICTS+= textutils-*
|
|
||||||
|
|
||||||
GNU_CONFIGURE= YES
|
GNU_CONFIGURE= YES
|
||||||
USE_BUILDLINK2= 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
|
# devel/id-utils installs a 'gid' program, so conflict with it if
|
||||||
# GNU_PROGRAM_PREFIX == 'g'
|
# GNU_PROGRAM_PREFIX == 'g'
|
||||||
. if ${GNU_PROGRAM_PREFIX} == "g"
|
. if ${GNU_PROGRAM_PREFIX} == "g"
|
||||||
CONFLICTS+= id-utils-[0-9]*
|
CONFLICTS+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2
|
||||||
CONFLICTS+= gnome-utils-*
|
|
||||||
. endif
|
. endif
|
||||||
.endif
|
.endif
|
||||||
PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
|
PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
|
||||||
|
|
Loading…
Reference in a new issue