Wed Aug 12 13:36:06 2009 UTC ()
Conflicts with gnuls (misc/gnuls), as noted by Mihkel Ader in PR 41876.
Bump revision.


(asau)
diff -r1.48 -r1.49 pkgsrc/sysutils/coreutils/Makefile
cvs diff -r1.48 -r1.49 pkgsrc/sysutils/coreutils/Makefile (switch to unified diff)

--- pkgsrc/sysutils/coreutils/Makefile 2009/05/17 23:11:21 1.48
+++ pkgsrc/sysutils/coreutils/Makefile 2009/08/12 13:36:06 1.49
@@ -1,43 +1,43 @@ @@ -1,43 +1,43 @@
1# $NetBSD: Makefile,v 1.48 2009/05/17 23:11:21 dholland Exp $ 1# $NetBSD: Makefile,v 1.49 2009/08/12 13:36:06 asau Exp $
2 2
3.include "../../sysutils/coreutils/Makefile.common" 3.include "../../sysutils/coreutils/Makefile.common"
4 4
5PKGREVISION= 1 5PKGREVISION= 2
6 6
7CONFLICTS= fileutils-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]* 7CONFLICTS= fileutils-[0-9]* gnuls-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*
8 8
9# if GNU_PROGRAM_PREFIX == 'g' 9# if GNU_PROGRAM_PREFIX == 'g'
10# devel/id-utils installs a 'gid' program, so conflict with it 10# devel/id-utils installs a 'gid' program, so conflict with it
11# databases/geneweb a 'gwc' program, so conflict with it 11# databases/geneweb a 'gwc' program, so conflict with it
12# graphics/graphviz installs a 'gpr' program, so conflict with it 12# graphics/graphviz installs a 'gpr' program, so conflict with it
13.if ${GNU_PROGRAM_PREFIX} == "g" 13.if ${GNU_PROGRAM_PREFIX} == "g"
14CONFLICTS+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2 14CONFLICTS+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2
15CONFLICTS+= geneweb-[0-9]* 15CONFLICTS+= geneweb-[0-9]*
16CONFLICTS+= graphviz<1.12 16CONFLICTS+= graphviz<1.12
17.endif 17.endif
18# print/teTeX-bin installed a 'readlink' program, so 18# print/teTeX-bin installed a 'readlink' program, so
19# conflict with it if GNU_PROGRAM_PREFIX == '' (no problem in teTeX3-bin) 19# conflict with it if GNU_PROGRAM_PREFIX == '' (no problem in teTeX3-bin)
20.if empty(GNU_PROGRAM_PREFIX) 20.if empty(GNU_PROGRAM_PREFIX)
21CONFLICTS+= teTeX-bin<3 21CONFLICTS+= teTeX-bin<3
22CONFLICTS+= mktemp-[0-9]* 22CONFLICTS+= mktemp-[0-9]*
23.endif 23.endif
24 24
25INFO_FILES= yes 25INFO_FILES= yes
26 26
27# Exclude programs from PLIST which aren't built on a platform. 27# Exclude programs from PLIST which aren't built on a platform.
28PLIST_VARS+= hostid 28PLIST_VARS+= hostid
29.if ${OPSYS} != "Interix" 29.if ${OPSYS} != "Interix"
30PLIST.hostid= yes 30PLIST.hostid= yes
31.endif 31.endif
32 32
33#CONFIGURE_ARGS+= --enable-install-program=su 33#CONFIGURE_ARGS+= --enable-install-program=su
34#.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \ 34#.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \
35# ${OPSYS} == "OpenBSD" 35# ${OPSYS} == "OpenBSD"
36#MAKE_FLAGS+= setuid_root_mode=a=rx 36#MAKE_FLAGS+= setuid_root_mode=a=rx
37#MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu 37#MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu
38#MESSAGE_SUBST+= OPSYS=${OPSYS:Q} 38#MESSAGE_SUBST+= OPSYS=${OPSYS:Q}
39#.endif 39#.endif
40 40
41.include "../../converters/libiconv/buildlink3.mk" 41.include "../../converters/libiconv/buildlink3.mk"
42.include "../../devel/gettext-lib/buildlink3.mk" 42.include "../../devel/gettext-lib/buildlink3.mk"
43.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"