Update gnome-utils to 1.2.0. Changes include several new utilities,

extensive additions to the help system, and bug fixes.

6 files changed, 182 insertions, 37 deletions

diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 54a2e62567a..d54db16ce9b 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2000/03/16 22:21:21 tron Exp $
+# $NetBSD: Makefile,v 1.17 2000/06/01 16:10:52 rh Exp $
 
-DISTNAME=	gnome-utils-1.0.51
+DISTNAME=	gnome-utils-1.2.0
 CATEGORIES=	misc x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/gnome-utils/}
 
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.gnome.org/
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/bison:../../devel/bison
 DEPENDS+=	ncurses>=4.2:../../devel/ncurses
-DEPENDS+=	gnome-core>=1.0.55.1:../../x11/gnome-core
+DEPENDS+=	gnome-core>=1.2.0:../../x11/gnome-core
 
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
diff --git a/misc/gnome-utils/files/md5 b/misc/gnome-utils/files/md5
index e923ad089d0..53b9135db77 100644
--- a/misc/gnome-utils/files/md5
+++ b/misc/gnome-utils/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/03/16 22:21:23 tron Exp $
+$NetBSD: md5,v 1.5 2000/06/01 16:10:54 rh Exp $
 
-MD5 (gnome-utils-1.0.51.tar.gz) = 0de69cb5eaaf81bea3a98cc48e0266c6
+MD5 (gnome-utils-1.2.0.tar.gz) = ffee2281337d29b149612dc186299773
diff --git a/misc/gnome-utils/files/patch-sum b/misc/gnome-utils/files/patch-sum
index a591ca024e2..72ee1a00a83 100644
--- a/misc/gnome-utils/files/patch-sum
+++ b/misc/gnome-utils/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.2 1999/08/29 14:20:44 rh Exp $
+$NetBSD: patch-sum,v 1.3 2000/06/01 16:10:54 rh Exp $
 
 MD5 (patch-aa) = bfa1d85780d82c9cd7bc756fbc5c061d
-MD5 (patch-ab) = a341e8ea7e5bea1c53f7c6c812f6beb0
+MD5 (patch-ab) = 98f0a2dd5b3b9a773c324cadcce64b8b
+MD5 (patch-ac) = 5b620194dfd6732f7d5cb467ea9f3368
diff --git a/misc/gnome-utils/patches/patch-ab b/misc/gnome-utils/patches/patch-ab
index c82fd8be55a..6c8459ba9bc 100644
--- a/misc/gnome-utils/patches/patch-ab
+++ b/misc/gnome-utils/patches/patch-ab
@@ -1,9 +1,7 @@
-$NetBSD: patch-ab,v 1.1 1999/08/29 14:20:44 rh Exp $
-
---- mini-utils/guname/Makefile.in.orig	Thu Jul 29 21:45:56 1999
-+++ mini-utils/guname/Makefile.in	Sun Aug 29 15:45:43 1999
-@@ -398,7 +398,7 @@
- mostlyclean distclean maintainer-clean
+--- mini-utils/guname/Makefile.in.orig	Fri May 19 23:25:05 2000
++++ mini-utils/guname/Makefile.in	Thu Jun  1 17:36:51 2000
+@@ -487,7 +487,7 @@
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
  
  
 -@GUNAME_CAPPLET_TRUE@install-data-local:
diff --git a/misc/gnome-utils/patches/patch-ac b/misc/gnome-utils/patches/patch-ac
new file mode 100644
index 00000000000..09aa0b116d6
--- /dev/null
+++ b/misc/gnome-utils/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2000/06/01 16:10:55 rh Exp $
+
+--- configure.orig	Fri May 19 21:49:06 2000
++++ configure	Thu Jun  1 17:44:51 2000
+@@ -8453,7 +8453,7 @@
+     esac
+   done
+ 
+-  for ac_config_dir in gfloppy; do
++  for ac_config_dir in ; do
+ 
+     # Do not complain, so a configure script can configure whichever
+     # parts of a large source tree are present.
diff --git a/misc/gnome-utils/pkg/PLIST b/misc/gnome-utils/pkg/PLIST
index 658fa9dce02..36b69c06c99 100644
--- a/misc/gnome-utils/pkg/PLIST
+++ b/misc/gnome-utils/pkg/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2000/03/16 22:21:24 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/06/01 16:10:56 rh Exp $
 bin/gcalc
+bin/gcharmap
 bin/gcolorsel
 bin/gdialog
+bin/gdict
 bin/gdiskfree
 bin/gfontsel
 bin/gless
-bin/gnome-run
-bin/grun
 bin/gsearchtool
 bin/gshutdown
 bin/gstripchart
@@ -14,29 +14,81 @@ bin/gstripchart_applet
 bin/gtt
 bin/guname
 bin/gw
+bin/logview
 bin/splac
 bin/splash
 etc/CORBA/servers/gstripchart_applet.gnorba
-man/man1/gtt.1
+etc/CORBA/servers/gdict.gnorba
 share/applets/Monitors/gstripchart_applet.desktop
+share/applets/Utility/gdict.desktop
 share/gnome/apps/Applications/gtt.desktop
 share/gnome/apps/System/gshutdown.desktop
+share/gnome/apps/System/logview.desktop
+share/gnome/apps/System/gdiskfree.desktop
+share/gnome/apps/System/guname.desktop
+share/gnome/apps/System/gw.desktop
+share/gnome/apps/Utilities/gcharmap.desktop
+share/gnome/apps/Utilities/GDict.desktop
 share/gnome/apps/Utilities/gcalc.desktop
 share/gnome/apps/Utilities/gcolorsel.desktop
-share/gnome/apps/Utilities/gdiskfree.desktop
 share/gnome/apps/Utilities/gfontsel.desktop
 share/gnome/apps/Utilities/gless.desktop
 share/gnome/apps/Utilities/gsearchtool.desktop
 share/gnome/apps/Utilities/gstripchart.desktop
-share/gnome/apps/Utilities/guname.desktop
-share/gnome/apps/Utilities/gw.desktop
-share/gnome/apps/gnome-run.desktop
+share/gnome/help/gcharmap/C/index.html
+share/gnome/help/gcharmap/C/authors.html
+share/gnome/help/gcharmap/C/bugs.html
+share/gnome/help/gcharmap/C/usage.html
+share/gnome/help/gcharmap/C/topic.dat
+share/gnome/help/gcharmap/C/license.html
+share/gnome/help/gcharmap/C/ln7.html
+share/gnome/help/gcharmap/C/images/gcharmap.png
+share/gnome/help/gcharmap/C/images/gcharmap_insertascii.png
+share/gnome/help/gcharmap/C/docbook.css
+share/gnome/help/gcolorsel/C/index.html
+share/gnome/help/gcolorsel/C/usage.html
+share/gnome/help/gcolorsel/C/simple.html
+share/gnome/help/gcolorsel/C/search.html
+share/gnome/help/gcolorsel/C/topic.dat
+share/gnome/help/gcolorsel/C/authors.html
+share/gnome/help/gcolorsel/C/bugs.html
+share/gnome/help/gcolorsel/C/license.html
+share/gnome/help/gcolorsel/C/ln7.html
+share/gnome/help/gcolorsel/C/menus.html
+share/gnome/help/gcolorsel/C/properties.html
+share/gnome/help/gcolorsel/C/xcolors.html
+share/gnome/help/gcolorsel/C/docbook.css
+share/gnome/help/gcolorsel/C/favorites.png
+share/gnome/help/gcolorsel/C/search.png
+share/gnome/help/gcolorsel/C/simple.png
+share/gnome/help/gdict/C/index.html
+share/gnome/help/gdict/C/authors.html
+share/gnome/help/gdict/C/usage.html
+share/gnome/help/gdict/C/topic.dat
+share/gnome/help/gdict/C/license.html
+share/gnome/help/gdict/C/ln7.html
+share/gnome/help/gdict/C/prefs.html
+share/gnome/help/gdict/C/docbook.css
+share/gnome/help/gdict/C/gdict-prefs.png
+share/gnome/help/gdict/C/gdict-spell.png
+share/gnome/help/gdict/C/gdictmain.png
+share/gnome/help/gdiskfree/C/images/gdiskfree-prefs.png
+share/gnome/help/gdiskfree/C/ln7.html
+share/gnome/help/gdiskfree/C/prefs.html
 share/gnome/help/gdiskfree/C/index.html
 share/gnome/help/gdiskfree/C/authors.html
 share/gnome/help/gdiskfree/C/usage.html
 share/gnome/help/gdiskfree/C/topic.dat
 share/gnome/help/gdiskfree/C/images/gdiskfree.png
 share/gnome/help/gdiskfree/C/docbook.css
+share/gnome/help/gless/C/index.html
+share/gnome/help/gless/C/authors.html
+share/gnome/help/gless/C/usage.html
+share/gnome/help/gless/C/topic.dat
+share/gnome/help/gless/C/docbook.css
+share/gnome/help/gless/C/gless-main.png
+share/gnome/help/gfontsel/C/license.html
+share/gnome/help/gfontsel/C/filterwin.png
 share/gnome/help/gfontsel/C/index.html
 share/gnome/help/gfontsel/C/filter.html
 share/gnome/help/gfontsel/C/fontinfo.html
@@ -60,20 +112,79 @@ share/gnome/help/gsearchtool/C/locate.html
 share/gnome/help/gsearchtool/C/topic.dat
 share/gnome/help/gshutdown/C/index.html
 share/gnome/help/gshutdown/C/topic.dat
-share/gnome/help/gshutdown/es/index.html
-share/gnome/help/gshutdown/es/topic.dat
-share/gnome/help/gshutdown/no/index.html
-share/gnome/help/gshutdown/no/topic.dat
+share/gnome/help/gshutdown/C/authors.html
+share/gnome/help/gshutdown/C/usage.html
+share/gnome/help/gshutdown/C/docbook.css
+share/gnome/help/gshutdown/C/gshutdown-advanced.png
+share/gnome/help/gshutdown/C/gshutdown-preferences.png
+share/gnome/help/gshutdown/C/gshutdown.png
+share/gnome/help/gstripchart/C/authors.html
+share/gnome/help/gstripchart/C/usage.html
+share/gnome/help/gstripchart/C/bugs.html
+share/gnome/help/gstripchart/C/license.html
+share/gnome/help/gstripchart/C/ln7.html
+share/gnome/help/gstripchart/C/prefs.html
+share/gnome/help/gstripchart/C/docbook.css
 share/gnome/help/gstripchart/C/index.html
 share/gnome/help/gstripchart/C/topic.dat
+share/gnome/help/gtt/C/authors.html
+share/gnome/help/gtt/C/usage.html
+share/gnome/help/gtt/C/bugs.html
+share/gnome/help/gtt/C/dialogs.html
+share/gnome/help/gtt/C/license.html
+share/gnome/help/gtt/C/ln10.html
+share/gnome/help/gtt/C/preferences.html
+share/gnome/help/gtt/C/docbook.css
+share/gnome/help/gtt/C/gtt_mainwin.png
+share/gnome/help/gtt/C/gtt_prefswin.png
 share/gnome/help/gtt/C/index.html
 share/gnome/help/gtt/C/topic.dat
-share/gnome/help/gtt/de/index.html
-share/gnome/help/gtt/de/topic.dat
-share/gnome/help/gtt/es/index.html
-share/gnome/help/gtt/es/topic.dat
+share/gnome/help/guname/C/index.html
+share/gnome/help/guname/C/authors.html
+share/gnome/help/guname/C/usage.html
+share/gnome/help/guname/C/topic.dat
+share/gnome/help/guname/C/license.html
+share/gnome/help/guname/C/docbook.css
+share/gnome/help/guname/C/guname-cpuinfo.png
+share/gnome/help/guname/C/guname-diskinfo.png
+share/gnome/help/guname/C/guname-main.png
+share/gnome/help/guname/C/guname-memoryinfo.png
+share/gnome/help/gw/C/index.html
+share/gnome/help/gw/C/authors.html
+share/gnome/help/gw/C/usage.html
+share/gnome/help/gw/C/topic.dat
+share/gnome/help/gw/C/bugs.html
+share/gnome/help/gw/C/license.html
+share/gnome/help/gw/C/ln7.html
+share/gnome/help/gw/C/prefs.html
+share/gnome/help/gw/C/docbook.css
+share/gnome/help/gw/C/gw-main.png
+share/gnome/help/gw/C/gw-menuitems.png
 share/gstripchart/gstripchart.conf
+share/logview/logview-descript.db
+share/logview/logview-regexp.db
+share/logview/logview-actions.db
+share/gcolorsel/glade/dialog-new-doc.glade
+share/gcolorsel/glade/dialog-new-doc.glade.h
+share/gcolorsel/glade/dialog-new-view.glade
+share/gcolorsel/glade/dialog-new-view.glade.h
+share/gcolorsel/glade/dialog-prefs.glade
+share/gcolorsel/glade/dialog-prefs.glade.h
+share/gcolorsel/glade/mdi-color-generic-properties.glade
+share/gcolorsel/glade/mdi-color-generic-properties.glade.h
+share/gcolorsel/glade/mdi-color-file-properties.glade
+share/gcolorsel/glade/mdi-color-file-properties.glade.h
+share/gcolorsel/glade/view-color-edit.glade
+share/gcolorsel/glade/view-color-edit.glade.h
+share/gcolorsel/glade/view-color-generic-properties.glade
+share/gcolorsel/glade/view-color-generic-properties.glade.h
+share/gcolorsel/glade/view-color-grid-properties.glade
+share/gcolorsel/glade/view-color-grid-properties.glade.h
+share/gcolorsel/glade/view-color-list-properties.glade
+share/gcolorsel/glade/view-color-list-properties.glade.h
 share/idl/gsu.idl
+share/pixmaps/logview/logview.xpm
+share/pixmaps/gdict.png
 share/pixmaps/gnome-fontsel.png
 share/pixmaps/gnome-searchtool.png
 share/pixmaps/gnome-shutdown.png
@@ -82,19 +193,41 @@ share/pixmaps/gnome-who.png
 @dirrm share/gstripchart
 @dirrm share/gnome/help/gsearchtool/C
 @dirrm share/gnome/help/gsearchtool
-@dirrm share/gnome/help/gtt/es
-@dirrm share/gnome/help/gtt/de
-@dirrm share/gnome/help/gtt/C
-@dirrm share/gnome/help/gtt
-@dirrm share/gnome/help/gstripchart/C
-@dirrm share/gnome/help/gstripchart
-@dirrm share/gnome/help/gshutdown/no
-@dirrm share/gnome/help/gshutdown/es
+@dirrm share/gnome/help/gshutdown/C/images
 @dirrm share/gnome/help/gshutdown/C
 @dirrm share/gnome/help/gshutdown
 @dirrm share/gnome/help/gfontsel/C/stylesheet-images
 @dirrm share/gnome/help/gfontsel/C
 @dirrm share/gnome/help/gfontsel
+@dirrm share/gnome/help/gdiskfree/C/stylesheet-images
 @dirrm share/gnome/help/gdiskfree/C/images
 @dirrm share/gnome/help/gdiskfree/C
 @dirrm share/gnome/help/gdiskfree
+@dirrm share/gnome/help/gcharmap/C/stylesheet-images
+@dirrm share/gnome/help/gcharmap/C/images
+@dirrm share/gnome/help/gcharmap/C
+@dirrm share/gnome/help/gcharmap
+@dirrm share/gnome/help/gstripchart/C/stylesheet-images
+@dirrm share/gnome/help/gstripchart/C/images
+@dirrm share/gnome/help/gstripchart/C
+@dirrm share/gnome/help/gstripchart
+@dirrm share/gnome/help/gtt/C/stylesheet-images
+@dirrm share/gnome/help/gtt/C/images
+@dirrm share/gnome/help/gtt/C
+@dirrm share/gnome/help/gtt
+@dirrm share/gnome/help/guname/C/images
+@dirrm share/gnome/help/guname/C
+@dirrm share/gnome/help/guname
+@dirrm share/gnome/help/gw/C/images
+@dirrm share/gnome/help/gw/C
+@dirrm share/gnome/help/gw
+@dirrm share/gnome/help/gless/C/images
+@dirrm share/gnome/help/gless/C
+@dirrm share/gnome/help/gless
+@dirrm share/gnome/help/gcolorsel/C/stylesheet-images
+@dirrm share/gnome/help/gcolorsel/C
+@dirrm share/gnome/help/gcolorsel
+@dirrm share/pixmaps/logview
+@dirrm share/logview
+@dirrm share/gcolorsel/glade
+@dirrm share/gcolorsel