? sysutils/coreutils/files
Index: sysutils/coreutils/Makefile
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/sysutils/coreutils/Makefile,v
retrieving revision 1.60
diff -u -u -r1.60 Makefile
--- sysutils/coreutils/Makefile	31 May 2013 12:41:59 -0000	1.60
+++ sysutils/coreutils/Makefile	22 Dec 2013 12:11:37 -0000
@@ -11,7 +11,7 @@
 # devel/id-utils installs a 'gid' program, so conflict with it
 # databases/geneweb a 'gwc' program, so conflict with it
 # graphics/graphviz installs a 'gpr' program, so conflict with it
-CONFLICTS+=		id-utils-[0-9]* gnome-utils<1.4.1.2nb2
+CONFLICTS+=		gnome-utils<1.4.1.2nb2
 CONFLICTS+=		geneweb-[0-9]*
 CONFLICTS+=		graphviz<1.12
 
Index: sysutils/coreutils/Makefile.common
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/sysutils/coreutils/Makefile.common,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile.common
--- sysutils/coreutils/Makefile.common	23 Oct 2012 19:50:56 -0000	1.6
+++ sysutils/coreutils/Makefile.common	22 Dec 2013 12:11:37 -0000
@@ -22,6 +22,7 @@
 
 TEST_TARGET=		check
 
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Interix"
@@ -43,7 +44,8 @@
 .endif
 CONFIGURE_ENV+=		MKDIR_P=${MKDIR:Q}
 
-CONFIGURE_ARGS+=	--program-prefix=g
+PLIST_AWK+=	files/replace-gnu-prefix
+CONFIGURE_ARGS+=	--program-prefix=gnu-
 
 #CONFIGURE_ARGS+=	--enable-install-program=su
 #.if ${OPSYS} == "NetBSD" ||  ${OPSYS} == "FreeBSD" || \
Index: sysutils/coreutils/PLIST
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/sysutils/coreutils/PLIST,v
retrieving revision 1.16
diff -u -u -r1.16 PLIST
--- sysutils/coreutils/PLIST	2 Jun 2012 09:32:30 -0000	1.16
+++ sysutils/coreutils/PLIST	22 Dec 2013 12:11:37 -0000
@@ -1,105 +1,105 @@
 @comment $NetBSD: PLIST,v 1.16 2012/06/02 09:32:30 cheusov Exp $
-bin/g[
-bin/gbase64
-bin/gbasename
-bin/gcat
-bin/gchcon
-bin/gchgrp
-bin/gchmod
-bin/gchown
-bin/gchroot
-bin/gcksum
-bin/gcomm
-bin/gcp
-bin/gcsplit
-bin/gcut
-bin/gdate
-bin/gdd
-bin/gdf
-bin/gdir
-bin/gdircolors
-bin/gdirname
-bin/gdu
-bin/gecho
-bin/genv
-bin/gexpand
-bin/gexpr
-bin/gfactor
-bin/gfalse
-bin/gfmt
-bin/gfold
-bin/ggroups
-bin/ghead
-${PLIST.hostid}bin/ghostid
-bin/gid
-bin/ginstall
-bin/gjoin
-bin/gkill
-bin/glink
-bin/gln
-bin/glogname
-bin/gls
-bin/gmd5sum
-bin/gmkdir
-bin/gmkfifo
-bin/gmknod
-bin/gmktemp
-bin/gmv
-bin/gnice
-bin/gnl
-bin/gnohup
-bin/gnproc
-bin/god
-bin/gpaste
-bin/gpathchk
-bin/gpinky
-bin/gpr
-bin/gprintenv
-bin/gprintf
-bin/gptx
-bin/gpwd
-bin/greadlink
-bin/grm
-bin/grmdir
-bin/gruncon
-bin/gseq
-bin/gsha1sum
-bin/gsha224sum
-bin/gsha256sum
-bin/gsha384sum
-bin/gsha512sum
-bin/gshred
-bin/gshuf
-bin/gsleep
-bin/gsort
-bin/gsplit
-bin/gstat
-${PLIST.stdbuf}bin/gstdbuf
-bin/gstty
-bin/gsum
-bin/gsync
-bin/gtac
-bin/gtail
-bin/gtee
-bin/gtest
-bin/gtimeout
-bin/gtouch
-bin/gtr
-bin/gtrue
-bin/gtruncate
-bin/gtsort
-bin/gtty
-bin/guname
-bin/gunexpand
-bin/guniq
-bin/gunlink
-bin/guptime
-bin/gusers
-bin/gvdir
-bin/gwc
-bin/gwho
-bin/gwhoami
-bin/gyes
+bin/${GNU_PREFIX}[
+bin/${GNU_PREFIX}base64
+bin/${GNU_PREFIX}basename
+bin/${GNU_PREFIX}cat
+bin/${GNU_PREFIX}chcon
+bin/${GNU_PREFIX}chgrp
+bin/${GNU_PREFIX}chmod
+bin/${GNU_PREFIX}chown
+bin/${GNU_PREFIX}chroot
+bin/${GNU_PREFIX}cksum
+bin/${GNU_PREFIX}comm
+bin/${GNU_PREFIX}cp
+bin/${GNU_PREFIX}csplit
+bin/${GNU_PREFIX}cut
+bin/${GNU_PREFIX}date
+bin/${GNU_PREFIX}dd
+bin/${GNU_PREFIX}df
+bin/${GNU_PREFIX}dir
+bin/${GNU_PREFIX}dircolors
+bin/${GNU_PREFIX}dirname
+bin/${GNU_PREFIX}du
+bin/${GNU_PREFIX}echo
+bin/${GNU_PREFIX}env
+bin/${GNU_PREFIX}expand
+bin/${GNU_PREFIX}expr
+bin/${GNU_PREFIX}factor
+bin/${GNU_PREFIX}false
+bin/${GNU_PREFIX}fmt
+bin/${GNU_PREFIX}fold
+bin/${GNU_PREFIX}groups
+bin/${GNU_PREFIX}head
+${PLIST.hostid}bin/${GNU_PREFIX}hostid
+bin/${GNU_PREFIX}id
+bin/${GNU_PREFIX}install
+bin/${GNU_PREFIX}join
+bin/${GNU_PREFIX}kill
+bin/${GNU_PREFIX}link
+bin/${GNU_PREFIX}ln
+bin/${GNU_PREFIX}logname
+bin/${GNU_PREFIX}ls
+bin/${GNU_PREFIX}md5sum
+bin/${GNU_PREFIX}mkdir
+bin/${GNU_PREFIX}mkfifo
+bin/${GNU_PREFIX}mknod
+bin/${GNU_PREFIX}mktemp
+bin/${GNU_PREFIX}mv
+bin/${GNU_PREFIX}nice
+bin/${GNU_PREFIX}nl
+bin/${GNU_PREFIX}nohup
+bin/${GNU_PREFIX}nproc
+bin/${GNU_PREFIX}od
+bin/${GNU_PREFIX}paste
+bin/${GNU_PREFIX}pathchk
+bin/${GNU_PREFIX}pinky
+bin/${GNU_PREFIX}pr
+bin/${GNU_PREFIX}printenv
+bin/${GNU_PREFIX}printf
+bin/${GNU_PREFIX}ptx
+bin/${GNU_PREFIX}pwd
+bin/${GNU_PREFIX}readlink
+bin/${GNU_PREFIX}rm
+bin/${GNU_PREFIX}rmdir
+bin/${GNU_PREFIX}runcon
+bin/${GNU_PREFIX}seq
+bin/${GNU_PREFIX}sha1sum
+bin/${GNU_PREFIX}sha224sum
+bin/${GNU_PREFIX}sha256sum
+bin/${GNU_PREFIX}sha384sum
+bin/${GNU_PREFIX}sha512sum
+bin/${GNU_PREFIX}shred
+bin/${GNU_PREFIX}shuf
+bin/${GNU_PREFIX}sleep
+bin/${GNU_PREFIX}sort
+bin/${GNU_PREFIX}split
+bin/${GNU_PREFIX}stat
+${PLIST.stdbuf}bin/${GNU_PREFIX}stdbuf
+bin/${GNU_PREFIX}stty
+bin/${GNU_PREFIX}sum
+bin/${GNU_PREFIX}sync
+bin/${GNU_PREFIX}tac
+bin/${GNU_PREFIX}tail
+bin/${GNU_PREFIX}tee
+bin/${GNU_PREFIX}test
+bin/${GNU_PREFIX}timeout
+bin/${GNU_PREFIX}touch
+bin/${GNU_PREFIX}tr
+bin/${GNU_PREFIX}true
+bin/${GNU_PREFIX}truncate
+bin/${GNU_PREFIX}tsort
+bin/${GNU_PREFIX}tty
+bin/${GNU_PREFIX}uname
+bin/${GNU_PREFIX}unexpand
+bin/${GNU_PREFIX}uniq
+bin/${GNU_PREFIX}unlink
+bin/${GNU_PREFIX}uptime
+bin/${GNU_PREFIX}users
+bin/${GNU_PREFIX}vdir
+bin/${GNU_PREFIX}wc
+bin/${GNU_PREFIX}who
+bin/${GNU_PREFIX}whoami
+bin/${GNU_PREFIX}yes
 gnu/bin/[
 gnu/bin/base64
 gnu/bin/basename
@@ -129,7 +129,7 @@
 gnu/bin/false
 gnu/bin/fmt
 gnu/bin/fold
-gnu/bin/groups
+gnu/bin/${GNU_PREFIX}roups
 gnu/bin/head
 ${PLIST.hostid}gnu/bin/hostid
 gnu/bin/id
@@ -229,7 +229,7 @@
 gnu/man/man1/false.1
 gnu/man/man1/fmt.1
 gnu/man/man1/fold.1
-gnu/man/man1/groups.1
+gnu/man/man1/${GNU_PREFIX}roups.1
 gnu/man/man1/head.1
 gnu/man/man1/hostid.1
 gnu/man/man1/id.1
@@ -302,107 +302,107 @@
 gnu/man/man1/whoami.1
 gnu/man/man1/yes.1
 info/coreutils.info
-${PLIST.stdbuf}libexec/coreutils/glibstdbuf.so
-man/man1/gbase64.1
-man/man1/gbasename.1
-man/man1/gcat.1
-man/man1/gchcon.1
-man/man1/gchgrp.1
-man/man1/gchmod.1
-man/man1/gchown.1
-man/man1/gchroot.1
-man/man1/gcksum.1
-man/man1/gcomm.1
-man/man1/gcp.1
-man/man1/gcsplit.1
-man/man1/gcut.1
-man/man1/gdate.1
-man/man1/gdd.1
-man/man1/gdf.1
-man/man1/gdir.1
-man/man1/gdircolors.1
-man/man1/gdirname.1
-man/man1/gdu.1
-man/man1/gecho.1
-man/man1/genv.1
-man/man1/gexpand.1
-man/man1/gexpr.1
-man/man1/gfactor.1
-man/man1/gfalse.1
-man/man1/gfmt.1
-man/man1/gfold.1
-man/man1/ggroups.1
-man/man1/ghead.1
-man/man1/ghostid.1
-man/man1/gid.1
-man/man1/ginstall.1
-man/man1/gjoin.1
-man/man1/gkill.1
-man/man1/glink.1
-man/man1/gln.1
-man/man1/glogname.1
-man/man1/gls.1
-man/man1/gmd5sum.1
-man/man1/gmkdir.1
-man/man1/gmkfifo.1
-man/man1/gmknod.1
-man/man1/gmktemp.1
-man/man1/gmv.1
-man/man1/gnice.1
-man/man1/gnl.1
-man/man1/gnohup.1
-man/man1/gnproc.1
-man/man1/god.1
-man/man1/gpaste.1
-man/man1/gpathchk.1
-man/man1/gpinky.1
-man/man1/gpr.1
-man/man1/gprintenv.1
-man/man1/gprintf.1
-man/man1/gptx.1
-man/man1/gpwd.1
-man/man1/greadlink.1
-man/man1/grm.1
-man/man1/grmdir.1
-man/man1/gruncon.1
-man/man1/gseq.1
-man/man1/gsha1sum.1
-man/man1/gsha224sum.1
-man/man1/gsha256sum.1
-man/man1/gsha384sum.1
-man/man1/gsha512sum.1
-man/man1/gshred.1
-man/man1/gshuf.1
-man/man1/gsleep.1
-man/man1/gsort.1
-man/man1/gsplit.1
-man/man1/gstat.1
-${PLIST.stdbuf}man/man1/gstdbuf.1
-man/man1/gstty.1
-man/man1/gsum.1
-man/man1/gsync.1
-man/man1/gtac.1
-man/man1/gtail.1
-man/man1/gtee.1
-man/man1/gtest.1
-man/man1/gtimeout.1
-man/man1/gtouch.1
-man/man1/gtr.1
-man/man1/gtrue.1
-man/man1/gtruncate.1
-man/man1/gtsort.1
-man/man1/gtty.1
-man/man1/guname.1
-man/man1/gunexpand.1
-man/man1/guniq.1
-man/man1/gunlink.1
-man/man1/guptime.1
-man/man1/gusers.1
-man/man1/gvdir.1
-man/man1/gwc.1
-man/man1/gwho.1
-man/man1/gwhoami.1
-man/man1/gyes.1
+${PLIST.stdbuf}libexec/coreutils/${GNU_PREFIX}libstdbuf.so
+man/man1/${GNU_PREFIX}base64.1
+man/man1/${GNU_PREFIX}basename.1
+man/man1/${GNU_PREFIX}cat.1
+man/man1/${GNU_PREFIX}chcon.1
+man/man1/${GNU_PREFIX}chgrp.1
+man/man1/${GNU_PREFIX}chmod.1
+man/man1/${GNU_PREFIX}chown.1
+man/man1/${GNU_PREFIX}chroot.1
+man/man1/${GNU_PREFIX}cksum.1
+man/man1/${GNU_PREFIX}comm.1
+man/man1/${GNU_PREFIX}cp.1
+man/man1/${GNU_PREFIX}csplit.1
+man/man1/${GNU_PREFIX}cut.1
+man/man1/${GNU_PREFIX}date.1
+man/man1/${GNU_PREFIX}dd.1
+man/man1/${GNU_PREFIX}df.1
+man/man1/${GNU_PREFIX}dir.1
+man/man1/${GNU_PREFIX}dircolors.1
+man/man1/${GNU_PREFIX}dirname.1
+man/man1/${GNU_PREFIX}du.1
+man/man1/${GNU_PREFIX}echo.1
+man/man1/${GNU_PREFIX}env.1
+man/man1/${GNU_PREFIX}expand.1
+man/man1/${GNU_PREFIX}expr.1
+man/man1/${GNU_PREFIX}factor.1
+man/man1/${GNU_PREFIX}false.1
+man/man1/${GNU_PREFIX}fmt.1
+man/man1/${GNU_PREFIX}fold.1
+man/man1/${GNU_PREFIX}groups.1
+man/man1/${GNU_PREFIX}head.1
+man/man1/${GNU_PREFIX}hostid.1
+man/man1/${GNU_PREFIX}id.1
+man/man1/${GNU_PREFIX}install.1
+man/man1/${GNU_PREFIX}join.1
+man/man1/${GNU_PREFIX}kill.1
+man/man1/${GNU_PREFIX}link.1
+man/man1/${GNU_PREFIX}ln.1
+man/man1/${GNU_PREFIX}logname.1
+man/man1/${GNU_PREFIX}ls.1
+man/man1/${GNU_PREFIX}md5sum.1
+man/man1/${GNU_PREFIX}mkdir.1
+man/man1/${GNU_PREFIX}mkfifo.1
+man/man1/${GNU_PREFIX}mknod.1
+man/man1/${GNU_PREFIX}mktemp.1
+man/man1/${GNU_PREFIX}mv.1
+man/man1/${GNU_PREFIX}nice.1
+man/man1/${GNU_PREFIX}nl.1
+man/man1/${GNU_PREFIX}nohup.1
+man/man1/${GNU_PREFIX}nproc.1
+man/man1/${GNU_PREFIX}od.1
+man/man1/${GNU_PREFIX}paste.1
+man/man1/${GNU_PREFIX}pathchk.1
+man/man1/${GNU_PREFIX}pinky.1
+man/man1/${GNU_PREFIX}pr.1
+man/man1/${GNU_PREFIX}printenv.1
+man/man1/${GNU_PREFIX}printf.1
+man/man1/${GNU_PREFIX}ptx.1
+man/man1/${GNU_PREFIX}pwd.1
+man/man1/${GNU_PREFIX}readlink.1
+man/man1/${GNU_PREFIX}rm.1
+man/man1/${GNU_PREFIX}rmdir.1
+man/man1/${GNU_PREFIX}runcon.1
+man/man1/${GNU_PREFIX}seq.1
+man/man1/${GNU_PREFIX}sha1sum.1
+man/man1/${GNU_PREFIX}sha224sum.1
+man/man1/${GNU_PREFIX}sha256sum.1
+man/man1/${GNU_PREFIX}sha384sum.1
+man/man1/${GNU_PREFIX}sha512sum.1
+man/man1/${GNU_PREFIX}shred.1
+man/man1/${GNU_PREFIX}shuf.1
+man/man1/${GNU_PREFIX}sleep.1
+man/man1/${GNU_PREFIX}sort.1
+man/man1/${GNU_PREFIX}split.1
+man/man1/${GNU_PREFIX}stat.1
+${PLIST.stdbuf}man/man1/${GNU_PREFIX}stdbuf.1
+man/man1/${GNU_PREFIX}stty.1
+man/man1/${GNU_PREFIX}sum.1
+man/man1/${GNU_PREFIX}sync.1
+man/man1/${GNU_PREFIX}tac.1
+man/man1/${GNU_PREFIX}tail.1
+man/man1/${GNU_PREFIX}tee.1
+man/man1/${GNU_PREFIX}test.1
+man/man1/${GNU_PREFIX}timeout.1
+man/man1/${GNU_PREFIX}touch.1
+man/man1/${GNU_PREFIX}tr.1
+man/man1/${GNU_PREFIX}true.1
+man/man1/${GNU_PREFIX}truncate.1
+man/man1/${GNU_PREFIX}tsort.1
+man/man1/${GNU_PREFIX}tty.1
+man/man1/${GNU_PREFIX}uname.1
+man/man1/${GNU_PREFIX}unexpand.1
+man/man1/${GNU_PREFIX}uniq.1
+man/man1/${GNU_PREFIX}unlink.1
+man/man1/${GNU_PREFIX}uptime.1
+man/man1/${GNU_PREFIX}users.1
+man/man1/${GNU_PREFIX}vdir.1
+man/man1/${GNU_PREFIX}wc.1
+man/man1/${GNU_PREFIX}who.1
+man/man1/${GNU_PREFIX}whoami.1
+man/man1/${GNU_PREFIX}yes.1
 share/locale/af/LC_MESSAGES/coreutils.mo
 share/locale/be/LC_MESSAGES/coreutils.mo
 share/locale/bg/LC_MESSAGES/coreutils.mo