Sat Mar 8 01:09:50 2008 UTC ()
Conflict with sysutils/mktemp iff ${GNU_PROGRAM_PREFIX} == ""


(tnn)
diff -r1.43 -r1.44 pkgsrc/sysutils/coreutils/Makefile
cvs diff -r1.43 -r1.44 pkgsrc/sysutils/coreutils/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/coreutils/Makefile 2008/03/08 01:06:52 1.43
+++ pkgsrc/sysutils/coreutils/Makefile 2008/03/08 01:09:50 1.44
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile,v 1.43 2008/03/08 01:06:52 tnn Exp $ 1# $NetBSD: Makefile,v 1.44 2008/03/08 01:09:50 tnn Exp $
2 2
3DISTNAME= coreutils-6.10 3DISTNAME= coreutils-6.10
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/} 5MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/}
6#EXTRACT_SUFX= .tar.bz2 6#EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= tech-pkg@NetBSD.org 8MAINTAINER= tech-pkg@NetBSD.org
9HOMEPAGE= http://www.gnu.org/software/coreutils/ 9HOMEPAGE= http://www.gnu.org/software/coreutils/
10COMMENT= GNU basic file, shell and text manipulation utilities 10COMMENT= GNU basic file, shell and text manipulation utilities
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13NOT_FOR_PLATFORM= NetBSD-2.0[D-H]-* 13NOT_FOR_PLATFORM= NetBSD-2.0[D-H]-*
14 14
15CONFLICTS= fileutils-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]* mktemp-[0-9]* 15CONFLICTS= fileutils-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*
16 16
17CFLAGS+= -g 17CFLAGS+= -g
18LDFLAGS+= -g 18LDFLAGS+= -g
19GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
20USE_TOOLS+= msgfmt msgmerge perl xgettext 20USE_TOOLS+= msgfmt msgmerge perl xgettext
21USE_PKGLOCALEDIR= YES 21USE_PKGLOCALEDIR= YES
22 22
23INFO_FILES= # PLIST 23INFO_FILES= # PLIST
24 24
25TEST_TARGET= check 25TEST_TARGET= check
26 26
27.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
28 28
@@ -52,26 +52,27 @@ CONFIGURE_ARGS+= --program-prefix=${GNU_ @@ -52,26 +52,27 @@ CONFIGURE_ARGS+= --program-prefix=${GNU_
52# if GNU_PROGRAM_PREFIX == 'g' 52# if GNU_PROGRAM_PREFIX == 'g'
53# devel/id-utils installs a 'gid' program, so conflict with it 53# devel/id-utils installs a 'gid' program, so conflict with it
54# databases/geneweb a 'gwc' program, so conflict with it 54# databases/geneweb a 'gwc' program, so conflict with it
55# graphics/graphviz installs a 'gpr' program, so conflict with it 55# graphics/graphviz installs a 'gpr' program, so conflict with it
56.if ${GNU_PROGRAM_PREFIX} == "g" 56.if ${GNU_PROGRAM_PREFIX} == "g"
57CONFLICTS+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2 57CONFLICTS+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2
58CONFLICTS+= geneweb-[0-9]* 58CONFLICTS+= geneweb-[0-9]*
59CONFLICTS+= graphviz<1.12 59CONFLICTS+= graphviz<1.12
60.endif 60.endif
61# print/teTeX-bin installed a 'readlink' program, so 61# print/teTeX-bin installed a 'readlink' program, so
62# conflict with it if GNU_PROGRAM_PREFIX == '' (no problem in teTeX3-bin) 62# conflict with it if GNU_PROGRAM_PREFIX == '' (no problem in teTeX3-bin)
63.if ${GNU_PROGRAM_PREFIX} == "" 63.if ${GNU_PROGRAM_PREFIX} == ""
64CONFLICTS+= teTeX-bin<3 64CONFLICTS+= teTeX-bin<3
 65CONFLICTS+= mktemp-[0-9]*
65.endif 66.endif
66 67
67PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} 68PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
68BUILD_DEFS+= GNU_PROGRAM_PREFIX 69BUILD_DEFS+= GNU_PROGRAM_PREFIX
69 70
70#CONFIGURE_ARGS+= --enable-install-program=su 71#CONFIGURE_ARGS+= --enable-install-program=su
71#.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \ 72#.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \
72# ${OPSYS} == "OpenBSD" 73# ${OPSYS} == "OpenBSD"
73#MAKE_FLAGS+= setuid_root_mode=a=rx 74#MAKE_FLAGS+= setuid_root_mode=a=rx
74#MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu 75#MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu
75#MESSAGE_SUBST+= OPSYS=${OPSYS:Q} 76#MESSAGE_SUBST+= OPSYS=${OPSYS:Q}
76#.endif 77#.endif
77 78