[pkgsrc/trunk]: pkgsrc/sysutils/coreutils Remove GNU_PROGRAM_PREFIX variable ...

[cheusov <cheusov%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/af3783a567a0
branches:  trunk
changeset: 604355:af3783a567a0
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Tue May 29 18:14:13 2012 +0000

description:
Remove GNU_PROGRAM_PREFIX variable (discussed in pkgsrc-users@).
All utilities are installed with a prefix 'g'. Symlinks with original
names are created in ${PREFIX}/gnu/bin.

While here fix some pkglint warnings.

++pkgrevision

diffstat:

 sysutils/coreutils/Makefile        |   34 +-
 sysutils/coreutils/Makefile.common |    9 +-
 sysutils/coreutils/PLIST           |  507 ++++++++++++++++++++++--------------
 3 files changed, 331 insertions(+), 219 deletions(-)

diffs (truncated from 604 to 300 lines):

diff -r 20ec47312052 -r af3783a567a0 sysutils/coreutils/Makefile
--- a/sysutils/coreutils/Makefile       Tue May 29 16:41:26 2012 +0000
+++ b/sysutils/coreutils/Makefile       Tue May 29 18:14:13 2012 +0000
@@ -1,24 +1,17 @@
-# $NetBSD: Makefile,v 1.53 2012/04/17 17:47:19 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2012/05/29 18:14:13 cheusov Exp $
 
 .include "../../sysutils/coreutils/Makefile.common"
 
+PKGREVISION=   1
+
 CONFLICTS=     fileutils-[0-9]* gnuls-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*
 
-# if GNU_PROGRAM_PREFIX == 'g'
 # 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
-.if ${GNU_PROGRAM_PREFIX} == "g"
 CONFLICTS+=            id-utils-[0-9]* gnome-utils<1.4.1.2nb2
 CONFLICTS+=            geneweb-[0-9]*
 CONFLICTS+=            graphviz<1.12
-.endif
-# print/teTeX-bin installed a 'readlink' program, so
-# conflict with it if GNU_PROGRAM_PREFIX == '' (no problem in teTeX3-bin)
-.if empty(GNU_PROGRAM_PREFIX)
-CONFLICTS+=            teTeX-bin<3
-CONFLICTS+=            mktemp-[0-9]*
-.endif
 
 INFO_FILES=            yes
 
@@ -35,6 +28,27 @@
 PLIST.stdbuf=          yes
 .endif
 
+PROGS= [ base64 basename cat chcon chgrp chmod chown chroot cksum comm \
+       cp csplit cut date dd df dir dircolors dirname du hostid echo env \
+       expand expr factor false fmt fold groups head id install join kill \
+       link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl \
+       nohup nproc od paste pathchk pinky pr printenv printf ptx pwd \
+       readlink rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum \
+       sha512sum shred shuf sleep sort split stat stdbuf stty sum sync tac \
+       tail tee test timeout touch tr true truncate tsort tty uname \
+       unexpand uniq unlink uptime users vdir wc who whoami yes
+
+INSTALLATION_DIRS+=    gnu/bin
+
+post-install:
+       set -e; \
+       cd ${DESTDIR}${PREFIX}/gnu/bin; \
+       for p in ${PROGS}; do \
+          if ${TEST} -x "../../bin/g$${p}"; then \
+             ln -f -s "../../bin/g$${p}" "$${p}"; \
+          fi; \
+       done
+
 #CONFIGURE_ARGS+=      --enable-install-program=su
 #.if ${OPSYS} == "NetBSD" ||  ${OPSYS} == "FreeBSD" || \
 #  ${OPSYS} == "OpenBSD"
diff -r 20ec47312052 -r af3783a567a0 sysutils/coreutils/Makefile.common
--- a/sysutils/coreutils/Makefile.common        Tue May 29 16:41:26 2012 +0000
+++ b/sysutils/coreutils/Makefile.common        Tue May 29 18:14:13 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2011/10/03 16:17:08 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.4 2012/05/29 18:14:13 cheusov Exp $
 # used by sysutils/coreutils/Makefile
 # used by misc/gnuls/Makefile
 
@@ -30,7 +30,7 @@
 .endif
 
 .if !empty(MACHINE_PLATFORM:MDarwin-[9].*-*)
-CONFIGURE_ENV+=                 ac_cv_header_sys_acl_h=no jm_cv_func_svid_putenv=yes
+CONFIGURE_ENV+=                ac_cv_header_sys_acl_h=no jm_cv_func_svid_putenv=yes
 .endif
 
 # XXX - this hack is bound to cause fallout on some platform at some point.
@@ -40,10 +40,7 @@
 .endif
 CONFIGURE_ENV+=                MKDIR_P=${MKDIR:Q}
 
-CONFIGURE_ARGS+=       --program-prefix=${GNU_PROGRAM_PREFIX:Q}
-
-PLIST_SUBST+=          GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
-BUILD_DEFS+=           GNU_PROGRAM_PREFIX
+CONFIGURE_ARGS+=       --program-prefix=g
 
 #CONFIGURE_ARGS+=      --enable-install-program=su
 #.if ${OPSYS} == "NetBSD" ||  ${OPSYS} == "FreeBSD" || \
diff -r 20ec47312052 -r af3783a567a0 sysutils/coreutils/PLIST
--- a/sysutils/coreutils/PLIST  Tue May 29 16:41:26 2012 +0000
+++ b/sysutils/coreutils/PLIST  Tue May 29 18:14:13 2012 +0000
@@ -1,207 +1,308 @@
-@comment $NetBSD: PLIST,v 1.14 2012/03/09 13:31:29 fhajny Exp $
-bin/${GNU_PROGRAM_PREFIX}[
-bin/${GNU_PROGRAM_PREFIX}base64
-bin/${GNU_PROGRAM_PREFIX}basename
-bin/${GNU_PROGRAM_PREFIX}cat
-bin/${GNU_PROGRAM_PREFIX}chcon
-bin/${GNU_PROGRAM_PREFIX}chgrp
-bin/${GNU_PROGRAM_PREFIX}chmod
-bin/${GNU_PROGRAM_PREFIX}chown
-bin/${GNU_PROGRAM_PREFIX}chroot
-bin/${GNU_PROGRAM_PREFIX}cksum
-bin/${GNU_PROGRAM_PREFIX}comm
-bin/${GNU_PROGRAM_PREFIX}cp
-bin/${GNU_PROGRAM_PREFIX}csplit
-bin/${GNU_PROGRAM_PREFIX}cut
-bin/${GNU_PROGRAM_PREFIX}date
-bin/${GNU_PROGRAM_PREFIX}dd
-bin/${GNU_PROGRAM_PREFIX}df
-bin/${GNU_PROGRAM_PREFIX}dir
-bin/${GNU_PROGRAM_PREFIX}dircolors
-bin/${GNU_PROGRAM_PREFIX}dirname
-bin/${GNU_PROGRAM_PREFIX}du
-bin/${GNU_PROGRAM_PREFIX}echo
-bin/${GNU_PROGRAM_PREFIX}env
-bin/${GNU_PROGRAM_PREFIX}expand
-bin/${GNU_PROGRAM_PREFIX}expr
-bin/${GNU_PROGRAM_PREFIX}factor
-bin/${GNU_PROGRAM_PREFIX}false
-bin/${GNU_PROGRAM_PREFIX}fmt
-bin/${GNU_PROGRAM_PREFIX}fold
-bin/${GNU_PROGRAM_PREFIX}groups
-bin/${GNU_PROGRAM_PREFIX}head
-${PLIST.hostid}bin/${GNU_PROGRAM_PREFIX}hostid
-bin/${GNU_PROGRAM_PREFIX}id
-bin/${GNU_PROGRAM_PREFIX}install
-bin/${GNU_PROGRAM_PREFIX}join
-bin/${GNU_PROGRAM_PREFIX}kill
-bin/${GNU_PROGRAM_PREFIX}link
-bin/${GNU_PROGRAM_PREFIX}ln
-bin/${GNU_PROGRAM_PREFIX}logname
-bin/${GNU_PROGRAM_PREFIX}ls
-bin/${GNU_PROGRAM_PREFIX}md5sum
-bin/${GNU_PROGRAM_PREFIX}mkdir
-bin/${GNU_PROGRAM_PREFIX}mkfifo
-bin/${GNU_PROGRAM_PREFIX}mknod
-bin/${GNU_PROGRAM_PREFIX}mktemp
-bin/${GNU_PROGRAM_PREFIX}mv
-bin/${GNU_PROGRAM_PREFIX}nice
-bin/${GNU_PROGRAM_PREFIX}nl
-bin/${GNU_PROGRAM_PREFIX}nohup
-bin/${GNU_PROGRAM_PREFIX}nproc
-bin/${GNU_PROGRAM_PREFIX}od
-bin/${GNU_PROGRAM_PREFIX}paste
-bin/${GNU_PROGRAM_PREFIX}pathchk
-bin/${GNU_PROGRAM_PREFIX}pinky
-bin/${GNU_PROGRAM_PREFIX}pr
-bin/${GNU_PROGRAM_PREFIX}printenv
-bin/${GNU_PROGRAM_PREFIX}printf
-bin/${GNU_PROGRAM_PREFIX}ptx
-bin/${GNU_PROGRAM_PREFIX}pwd
-bin/${GNU_PROGRAM_PREFIX}readlink
-bin/${GNU_PROGRAM_PREFIX}rm
-bin/${GNU_PROGRAM_PREFIX}rmdir
-bin/${GNU_PROGRAM_PREFIX}runcon
-bin/${GNU_PROGRAM_PREFIX}seq
-bin/${GNU_PROGRAM_PREFIX}sha1sum
-bin/${GNU_PROGRAM_PREFIX}sha224sum
-bin/${GNU_PROGRAM_PREFIX}sha256sum
-bin/${GNU_PROGRAM_PREFIX}sha384sum
-bin/${GNU_PROGRAM_PREFIX}sha512sum
-bin/${GNU_PROGRAM_PREFIX}shred
-bin/${GNU_PROGRAM_PREFIX}shuf
-bin/${GNU_PROGRAM_PREFIX}sleep
-bin/${GNU_PROGRAM_PREFIX}sort
-bin/${GNU_PROGRAM_PREFIX}split
-bin/${GNU_PROGRAM_PREFIX}stat
-${PLIST.stdbuf}bin/${GNU_PROGRAM_PREFIX}stdbuf
-bin/${GNU_PROGRAM_PREFIX}stty
-bin/${GNU_PROGRAM_PREFIX}sum
-bin/${GNU_PROGRAM_PREFIX}sync
-bin/${GNU_PROGRAM_PREFIX}tac
-bin/${GNU_PROGRAM_PREFIX}tail
-bin/${GNU_PROGRAM_PREFIX}tee
-bin/${GNU_PROGRAM_PREFIX}test
-bin/${GNU_PROGRAM_PREFIX}timeout
-bin/${GNU_PROGRAM_PREFIX}touch
-bin/${GNU_PROGRAM_PREFIX}tr
-bin/${GNU_PROGRAM_PREFIX}truncate
-bin/${GNU_PROGRAM_PREFIX}true
-bin/${GNU_PROGRAM_PREFIX}tsort
-bin/${GNU_PROGRAM_PREFIX}tty
-bin/${GNU_PROGRAM_PREFIX}uname
-bin/${GNU_PROGRAM_PREFIX}unexpand
-bin/${GNU_PROGRAM_PREFIX}uniq
-bin/${GNU_PROGRAM_PREFIX}unlink
-bin/${GNU_PROGRAM_PREFIX}uptime
-bin/${GNU_PROGRAM_PREFIX}users
-bin/${GNU_PROGRAM_PREFIX}vdir
-bin/${GNU_PROGRAM_PREFIX}wc
-bin/${GNU_PROGRAM_PREFIX}who
-bin/${GNU_PROGRAM_PREFIX}whoami
-bin/${GNU_PROGRAM_PREFIX}yes
+@comment $NetBSD: PLIST,v 1.15 2012/05/29 18:14:13 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
+gnu/bin/[
+gnu/bin/base64
+gnu/bin/basename