- honour GNU_PROGRAM_PREFIX.

- USE_PKGLOCALEDIR.
- bump PKGREVISION.

2 files changed, 91 insertions, 83 deletions

diff --git a/sysutils/sh-utils/Makefile b/sysutils/sh-utils/Makefile
index 616c1365c0b..d705ddb8865 100644
--- a/sysutils/sh-utils/Makefile
+++ b/sysutils/sh-utils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/07/24 19:45:28 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/02/13 17:38:58 grant Exp $
 
 DISTNAME=		sh-utils-2.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_GNU:=sh-utils/}
 
@@ -9,11 +9,19 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/shellutils/shellutils.html
 COMMENT=		GNU shell utilities
 
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_PERL5=		build
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--program-prefix=g
-CONFIGURE_ARGS+=	--program-transform-name='s,^gid,gnuid,'
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(GNU_PROGRAM_PREFIX)
+CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX}
+PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+BUILD_DEFS+=		GNU_PROGRAM_PREFIX
+.endif
 CONFIGURE_ENV+=		ac_cv_func_uname=no
 
 .include "../../mk/texinfo.mk"
diff --git a/sysutils/sh-utils/PLIST b/sysutils/sh-utils/PLIST
index b66cb0348e3..fc9212b767f 100644
--- a/sysutils/sh-utils/PLIST
+++ b/sysutils/sh-utils/PLIST
@@ -1,82 +1,82 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:41 seb Exp $
-bin/gbasename
-bin/gchroot
-bin/gdate
-bin/gdirname
-bin/gecho
-bin/genv
-bin/gexpr
-bin/gfactor
-bin/gfalse
-bin/ggroups
-bin/ghostid
-bin/ghostname
-bin/glogname
-bin/gnice
-bin/gnohup
-bin/gnuid
-bin/gpathchk
-bin/gpinky
-bin/gprintenv
-bin/gprintf
-bin/gpwd
-bin/gseq
-bin/gsleep
-bin/gstty
-bin/gtee
-bin/gtest
-bin/gtrue
-bin/gtty
-bin/gusers
-bin/gwho
-bin/gwhoami
-bin/gyes
+@comment $NetBSD: PLIST,v 1.4 2003/02/13 17:38:58 grant Exp $
+bin/${GNU_PROGRAM_PREFIX}basename
+bin/${GNU_PROGRAM_PREFIX}chroot
+bin/${GNU_PROGRAM_PREFIX}date
+bin/${GNU_PROGRAM_PREFIX}dirname
+bin/${GNU_PROGRAM_PREFIX}echo
+bin/${GNU_PROGRAM_PREFIX}env
+bin/${GNU_PROGRAM_PREFIX}expr
+bin/${GNU_PROGRAM_PREFIX}factor
+bin/${GNU_PROGRAM_PREFIX}false
+bin/${GNU_PROGRAM_PREFIX}groups
+bin/${GNU_PROGRAM_PREFIX}hostid
+bin/${GNU_PROGRAM_PREFIX}hostname
+bin/${GNU_PROGRAM_PREFIX}logname
+bin/${GNU_PROGRAM_PREFIX}nice
+bin/${GNU_PROGRAM_PREFIX}nohup
+bin/${GNU_PROGRAM_PREFIX}id
+bin/${GNU_PROGRAM_PREFIX}pathchk
+bin/${GNU_PROGRAM_PREFIX}pinky
+bin/${GNU_PROGRAM_PREFIX}printenv
+bin/${GNU_PROGRAM_PREFIX}printf
+bin/${GNU_PROGRAM_PREFIX}pwd
+bin/${GNU_PROGRAM_PREFIX}seq
+bin/${GNU_PROGRAM_PREFIX}sleep
+bin/${GNU_PROGRAM_PREFIX}stty
+bin/${GNU_PROGRAM_PREFIX}tee
+bin/${GNU_PROGRAM_PREFIX}test
+bin/${GNU_PROGRAM_PREFIX}true
+bin/${GNU_PROGRAM_PREFIX}tty
+bin/${GNU_PROGRAM_PREFIX}users
+bin/${GNU_PROGRAM_PREFIX}who
+bin/${GNU_PROGRAM_PREFIX}whoami
+bin/${GNU_PROGRAM_PREFIX}yes
 @unexec ${INSTALL_INFO} --delete %D/info/sh-utils.info %D/info/dir
 info/sh-utils.info
 @exec ${INSTALL_INFO} %D/info/sh-utils.info %D/info/dir
-man/man1/gbasename.1
-man/man1/gchroot.1
-man/man1/gdate.1
-man/man1/gdirname.1
-man/man1/gecho.1
-man/man1/genv.1
-man/man1/gexpr.1
-man/man1/gfalse.1
-man/man1/ggroups.1
-man/man1/ghostid.1
-man/man1/ghostname.1
-man/man1/glogname.1
-man/man1/gnice.1
-man/man1/gnohup.1
-man/man1/gnuid.1
-man/man1/gpathchk.1
-man/man1/gpinky.1
-man/man1/gprintenv.1
-man/man1/gprintf.1
-man/man1/gpwd.1
-man/man1/gsleep.1
-man/man1/gstty.1
-man/man1/gsu.1
-man/man1/gtee.1
-man/man1/gtest.1
-man/man1/gtrue.1
-man/man1/gtty.1
-man/man1/gusers.1
-man/man1/gwho.1
-man/man1/gwhoami.1
-man/man1/gyes.1
-share/locale/cs/LC_MESSAGES/sh-utils.mo
-share/locale/de/LC_MESSAGES/sh-utils.mo
-share/locale/el/LC_MESSAGES/sh-utils.mo
-share/locale/es/LC_MESSAGES/sh-utils.mo
-share/locale/fr/LC_MESSAGES/sh-utils.mo
-share/locale/it/LC_MESSAGES/sh-utils.mo
-share/locale/nl/LC_MESSAGES/sh-utils.mo
-share/locale/no/LC_MESSAGES/sh-utils.mo
-share/locale/pl/LC_MESSAGES/sh-utils.mo
-share/locale/pt/LC_MESSAGES/sh-utils.mo
-share/locale/pt_BR/LC_MESSAGES/sh-utils.mo
-share/locale/ru/LC_MESSAGES/sh-utils.mo
-share/locale/sk/LC_MESSAGES/sh-utils.mo
-share/locale/sv/LC_MESSAGES/sh-utils.mo
-share/locale/zh/LC_MESSAGES/sh-utils.mo
+man/man1/${GNU_PROGRAM_PREFIX}basename.1
+man/man1/${GNU_PROGRAM_PREFIX}chroot.1
+man/man1/${GNU_PROGRAM_PREFIX}date.1
+man/man1/${GNU_PROGRAM_PREFIX}dirname.1
+man/man1/${GNU_PROGRAM_PREFIX}echo.1
+man/man1/${GNU_PROGRAM_PREFIX}env.1
+man/man1/${GNU_PROGRAM_PREFIX}expr.1
+man/man1/${GNU_PROGRAM_PREFIX}false.1
+man/man1/${GNU_PROGRAM_PREFIX}groups.1
+man/man1/${GNU_PROGRAM_PREFIX}hostid.1
+man/man1/${GNU_PROGRAM_PREFIX}hostname.1
+man/man1/${GNU_PROGRAM_PREFIX}logname.1
+man/man1/${GNU_PROGRAM_PREFIX}nice.1
+man/man1/${GNU_PROGRAM_PREFIX}nohup.1
+man/man1/${GNU_PROGRAM_PREFIX}id.1
+man/man1/${GNU_PROGRAM_PREFIX}pathchk.1
+man/man1/${GNU_PROGRAM_PREFIX}pinky.1
+man/man1/${GNU_PROGRAM_PREFIX}printenv.1
+man/man1/${GNU_PROGRAM_PREFIX}printf.1
+man/man1/${GNU_PROGRAM_PREFIX}pwd.1
+man/man1/${GNU_PROGRAM_PREFIX}sleep.1
+man/man1/${GNU_PROGRAM_PREFIX}stty.1
+man/man1/${GNU_PROGRAM_PREFIX}su.1
+man/man1/${GNU_PROGRAM_PREFIX}tee.1
+man/man1/${GNU_PROGRAM_PREFIX}test.1
+man/man1/${GNU_PROGRAM_PREFIX}true.1
+man/man1/${GNU_PROGRAM_PREFIX}tty.1
+man/man1/${GNU_PROGRAM_PREFIX}users.1
+man/man1/${GNU_PROGRAM_PREFIX}who.1
+man/man1/${GNU_PROGRAM_PREFIX}whoami.1
+man/man1/${GNU_PROGRAM_PREFIX}yes.1
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sh-utils.mo
+${PKGLOCALEDIR}/locale/zh/LC_MESSAGES/sh-utils.mo