diff options
| author | tron <tron> | 2001-10-12 21:20:37 +0000 |
|---|---|---|
| committer | tron <tron> | 2001-10-12 21:20:37 +0000 |
| commit | 3ee719517863b33151616d9177f3a7f8958cfa7a (patch) | |
| tree | 25fecdf6180dafdd3ff904d206cd748406420663 | |
| parent | 6e1bd1c7aae1353c3b402635e1a9a00e0878010b (diff) | |
| download | pkgsrc-3ee719517863b33151616d9177f3a7f8958cfa7a.tar.gz | |
Don't build and install the GNU "uname" to avoid conflicts with the
"gnome-utils" package if "xpkgwedge" is used.
| -rw-r--r-- | sysutils/sh-utils/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/sh-utils/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/sh-utils/patches/patch-ab | 13 | ||||
| -rw-r--r-- | sysutils/sh-utils/pkg/PLIST | 4 |
4 files changed, 18 insertions, 5 deletions
diff --git a/sysutils/sh-utils/Makefile b/sysutils/sh-utils/Makefile index 879a288096e..d07d04d9514 100644 --- a/sysutils/sh-utils/Makefile +++ b/sysutils/sh-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/05/31 09:55:26 dent Exp $ +# $NetBSD: Makefile,v 1.4 2001/10/12 21:20:37 tron Exp $ DISTNAME= sh-utils-2.0 CATEGORIES= sysutils @@ -11,5 +11,6 @@ COMMENT= GNU shell utilities USE_GTEXINFO= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --program-prefix=g +CONFIGURE_ENV+= ac_cv_func_uname=no .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/sh-utils/distinfo b/sysutils/sh-utils/distinfo index ed6d672c286..2526ec30d3a 100644 --- a/sysutils/sh-utils/distinfo +++ b/sysutils/sh-utils/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:29:07 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/10/12 21:20:37 tron Exp $ SHA1 (sh-utils-2.0.tar.gz) = a2970bb68eafc4b35f44e8121390adb44409067c Size (sh-utils-2.0.tar.gz) = 1243391 bytes SHA1 (patch-aa) = a025d8665c6e4d9ccb17166a318c01c19c808861 +SHA1 (patch-ab) = bc904b6f3f0c7a48ca0f91533f0544e5ae1b974a diff --git a/sysutils/sh-utils/patches/patch-ab b/sysutils/sh-utils/patches/patch-ab new file mode 100644 index 00000000000..7d8c7ff8c39 --- /dev/null +++ b/sysutils/sh-utils/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2001/10/12 21:20:37 tron Exp $ + +--- man/Makefile.in.orig Sat Aug 14 17:42:39 1999 ++++ man/Makefile.in Fri Oct 12 23:16:21 2001 +@@ -109,7 +109,7 @@ + expr.1 false.1 groups.1 hostname.1 id.1 logname.1 pathchk.1 \ + pinky.1 printenv.1 printf.1 pwd.1 sleep.1 tee.1 test.1 true.1 tty.1 \ + users.1 who.1 whoami.1 yes.1 \ +-hostid.1 nice.1 nohup.1 su.1 stty.1 uname.1 ++hostid.1 nice.1 nohup.1 su.1 stty.1 + + man_aux = $(man_MANS:.1=.x) + diff --git a/sysutils/sh-utils/pkg/PLIST b/sysutils/sh-utils/pkg/PLIST index 188c1b54b17..290324bf805 100644 --- a/sysutils/sh-utils/pkg/PLIST +++ b/sysutils/sh-utils/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/10/01 20:29:39 kim Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/10/12 21:20:38 tron Exp $ bin/gbasename bin/gchroot bin/gdate @@ -27,7 +27,6 @@ bin/gtee bin/gtest bin/gtrue bin/gtty -bin/guname bin/gusers bin/gwho bin/gwhoami @@ -62,7 +61,6 @@ man/man1/gtee.1 man/man1/gtest.1 man/man1/gtrue.1 man/man1/gtty.1 -man/man1/guname.1 man/man1/gusers.1 man/man1/gwho.1 man/man1/gwhoami.1 |