From a4bc89b3b16fd4a8ff9201d27901b95445bcba0c Mon Sep 17 00:00:00 2001
From: seb <seb@pkgsrc.org>
Date: Thu, 7 Feb 2002 10:52:11 +0000
Subject: Fix conflict with devel/id-utils package's gid command: the GNU id
 command is now installed as $PREFIX/bin/gnuid and not as $PREFIX/bin/gid.
 Bump PKGREVISION along the way. This resolves PR pkg/13906.

---
 sysutils/sh-utils/Makefile | 4 +++-
 sysutils/sh-utils/PLIST    | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/sh-utils/Makefile b/sysutils/sh-utils/Makefile
index 2e1372ee407..0a0099a2355 100644
--- a/sysutils/sh-utils/Makefile
+++ b/sysutils/sh-utils/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2001/12/28 07:35:30 tron Exp $
+# $NetBSD: Makefile,v 1.7 2002/02/07 10:52:11 seb Exp $
 
 DISTNAME=		sh-utils-2.0
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_GNU:=sh-utils/}
 
@@ -14,6 +15,7 @@ USE_GMAKE=		YES
 USE_GTEXINFO=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--program-prefix=g
+CONFIGURE_ARGS+=	--program-transform-name='s,^gid,gnuid,'
 CONFIGURE_ENV+=		ac_cv_func_uname=no
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sh-utils/PLIST b/sysutils/sh-utils/PLIST
index 802a6d9ee87..23bb55089ae 100644
--- a/sysutils/sh-utils/PLIST
+++ b/sysutils/sh-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:46 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/07 10:52:11 seb Exp $
 bin/gbasename
 bin/gchroot
 bin/gdate
@@ -11,10 +11,10 @@ bin/gfalse
 bin/ggroups
 bin/ghostid
 bin/ghostname
-bin/gid
 bin/glogname
 bin/gnice
 bin/gnohup
+bin/gnuid
 bin/gpathchk
 bin/gpinky
 bin/gprintenv
@@ -45,10 +45,10 @@ man/man1/gfalse.1
 man/man1/ggroups.1
 man/man1/ghostid.1
 man/man1/ghostname.1
-man/man1/gid.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
-- 
cgit v1.2.3