Don't build and install the "guname" program. It didn't work anyway (at

least under NetBSD) and caused a conflict with the "core-utils" package.
Bump package revision to reflect change.

3 files changed, 7 insertions, 37 deletions

diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 2295c567eba..c68a36d3536 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2003/04/10 18:42:30 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2003/04/11 11:34:37 tron Exp $
 
 DISTNAME=		gnome-utils-1.4.1.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		misc x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/1.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,7 +13,7 @@ COMMENT=		Set of useful GNOME utilities and applications
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 BUILD_DEPENDS+=		xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools
 
-CONFLICTS=		coreutils-[0-9]*
+CONFLICTS=		coreutils<=5.0
 
 USE_GMAKE=		YES
 USE_X11BASE=		YES
diff --git a/misc/gnome-utils/PLIST b/misc/gnome-utils/PLIST
index fca982ac106..21f109e1b4a 100644
--- a/misc/gnome-utils/PLIST
+++ b/misc/gnome-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/02/18 14:56:00 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/04/11 11:34:38 tron Exp $
 bin/gcalc
 bin/gcharmap
 bin/gcolorsel
@@ -10,7 +10,6 @@ bin/gless
 bin/gnome-exe-handler
 bin/gsearchtool
 bin/gshutdown
-bin/guname
 bin/gw
 bin/logview
 bin/meat-grinder
@@ -30,7 +29,6 @@ man/man1/gfontsel.1
 man/man1/gless.1
 man/man1/gnome-exe-handler.1
 man/man1/gsearchtool.1
-man/man1/guname.1
 man/man1/gw.1
 man/man1/logview.1
 man/man1/meat-grinder.1
@@ -53,7 +51,6 @@ share/gcolorsel/glade/view-color-grid-properties.glade
 share/gcolorsel/glade/view-color-list-properties.glade
 share/gnome/apps/System/gdiskfree.desktop
 share/gnome/apps/System/gshutdown.desktop
-share/gnome/apps/System/guname.desktop
 share/gnome/apps/System/gw.desktop
 share/gnome/apps/System/logview.desktop
 share/gnome/apps/Utilities/GDict.desktop
@@ -492,30 +489,6 @@ share/gnome/help/gshutdown_util/es/license.sgml
 share/gnome/help/gshutdown_util/es/ln10.html
 share/gnome/help/gshutdown_util/es/topic.dat
 share/gnome/help/gshutdown_util/es/usage.html
-share/gnome/help/guname/C/authors.html
-share/gnome/help/guname/C/docbook.css
-share/gnome/help/guname/C/figures/guname-cpuinfo.png
-share/gnome/help/guname/C/figures/guname-diskinfo.png
-share/gnome/help/guname/C/figures/guname-main.png
-share/gnome/help/guname/C/figures/guname-memoryinfo.png
-share/gnome/help/guname/C/guname.sgml
-share/gnome/help/guname/C/index.html
-share/gnome/help/guname/C/license.html
-share/gnome/help/guname/C/ln7.html
-share/gnome/help/guname/C/stylesheet-images/caution.gif
-share/gnome/help/guname/C/stylesheet-images/home.gif
-share/gnome/help/guname/C/stylesheet-images/important.gif
-share/gnome/help/guname/C/stylesheet-images/next.gif
-share/gnome/help/guname/C/stylesheet-images/note.gif
-share/gnome/help/guname/C/stylesheet-images/prev.gif
-share/gnome/help/guname/C/stylesheet-images/tip.gif
-share/gnome/help/guname/C/stylesheet-images/toc-blank.gif
-share/gnome/help/guname/C/stylesheet-images/toc-minus.gif
-share/gnome/help/guname/C/stylesheet-images/toc-plus.gif
-share/gnome/help/guname/C/stylesheet-images/up.gif
-share/gnome/help/guname/C/stylesheet-images/warning.gif
-share/gnome/help/guname/C/topic.dat
-share/gnome/help/guname/C/usage.html
 share/gnome/help/gw/C/authors.html
 share/gnome/help/gw/C/docbook.css
 share/gnome/help/gw/C/figures/gw-main.png
@@ -697,7 +670,6 @@ share/omf/gnome-utils/gsearchtool-es.omf
 share/omf/gnome-utils/gsearchtool-it.omf
 share/omf/gnome-utils/gshutdown-C.omf
 share/omf/gnome-utils/gshutdown-es.omf
-share/omf/gnome-utils/guname-C.omf
 share/omf/gnome-utils/gw-C.omf
 share/omf/gnome-utils/logview-C.omf
 share/omf/gnome-utils/meat-grinder-C.omf
@@ -742,10 +714,6 @@ share/stripchart/stripchart.params
 @dirrm share/gnome/help/gw/C/figures
 @dirrm share/gnome/help/gw/C
 @dirrm share/gnome/help/gw
-@dirrm share/gnome/help/guname/C/stylesheet-images
-@dirrm share/gnome/help/guname/C/figures
-@dirrm share/gnome/help/guname/C
-@dirrm share/gnome/help/guname
 @exec ${MKDIR} %D/share/gnome/help/gshutdown_util/es/stylesheet-images
 @dirrm share/gnome/help/gshutdown_util/es/stylesheet-images
 @dirrm share/gnome/help/gshutdown_util/es/figures
diff --git a/misc/gnome-utils/distinfo b/misc/gnome-utils/distinfo
index e35a69f6114..dba56751429 100644
--- a/misc/gnome-utils/distinfo
+++ b/misc/gnome-utils/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.8 2003/01/12 06:49:37 rh Exp $
+$NetBSD: distinfo,v 1.9 2003/04/11 11:34:38 tron Exp $
 
 SHA1 (gnome-utils-1.4.1.2.tar.bz2) = ae8148a7402d94c948ee41e1921a055906c62c67
 Size (gnome-utils-1.4.1.2.tar.bz2) = 3280620 bytes
 SHA1 (patch-aa) = 27b24e4d80033c285cebde37e263583c4a9905af
 SHA1 (patch-ab) = cf12496463e31f48c75caab18ffe4a93db8d5781
 SHA1 (patch-ac) = 89e7f71e812cf67f39d446a163a798f5d25ea819
+SHA1 (patch-ad) = aaed60f2713262638a250af6cef8f97535196b0f
+SHA1 (patch-ae) = af95a7b1cf0b95a4dc35b7c1c957dc6a1b73669f
 SHA1 (patch-af) = 60d22abb2c4c1813d51d90116901b543cf1be99a
 SHA1 (patch-ag) = 96d31d113f8aa5ca3e881768e2395052d8c01fe6
 SHA1 (patch-ah) = 9d4ceb307deb5123ac77330c5e9f94771ad88300