Update "gnome-core" package to version 1.0.53 included in GNOME 1.0.53

release.

9 files changed, 162 insertions, 111 deletions

diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index b5b09035116..efb1cc90343 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.29 1999/10/23 00:12:45 tron Exp $
-#
+# $NetBSD: Makefile,v 1.30 1999/10/23 11:01:43 tron Exp $
 
-DISTNAME=		gnome-core-1.0.9
+DISTNAME=		gnome-core-1.0.53
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=gnome-1.0/sources/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=gnome-1.0.53/sources/}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 
 DEPENDS+=		esound-*:../../audio/esound
+DEPENDS+=		libghttp-*:../../www/libghttp
 DEPENDS+=		gnome-libs-*:../../x11/gnome-libs
-# "libgtop" packages is broken at the moment.
-#DEPENDS+=		libgtop-1.0.2:../../devel/libgtop
+DEPENDS+=		libgtop-*:../../devel/libgtop
 
 GNU_CONFIGURE=		yes
 USE_X11BASE=		yes
@@ -20,9 +19,16 @@ USE_LIBTOOL=		yes
 
 LOCALSTATEDIR=		/var/gnome
 
+ESD_CONFIG=		${LOCALBASE}/bin/esd-config
+ESD_CFLAGS=		`${ESD_CONFIG} --cflags`
+ESD_LIBS=		`${ESD_CONFIG} --libs`
+
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
 CPPFLAGS=		-I${LOCALBASE}/include -I${WRKDIR}
-CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
+CONFIGURE_ENV+=		ESD_CFLAGS="${ESD_CFLAGS}" \
+			ESD_CONFIG="${ESD_CONFIG}" \
+			ESD_LIBS="${ESD_LIBS}" \
+			LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
 			CPPFLAGS="${CPPFLAGS}"
 
 pre-configure:
diff --git a/x11/gnome-core/files/md5 b/x11/gnome-core/files/md5
index bf4917ac008..46ce869824d 100644
--- a/x11/gnome-core/files/md5
+++ b/x11/gnome-core/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.9 1999/08/29 12:42:57 rh Exp $
+$NetBSD: md5,v 1.10 1999/10/23 11:01:44 tron Exp $
 
-MD5 (gnome-core-1.0.9.tar.gz) = 401b66db20e50612a2a87ae5755f8c90
+MD5 (gnome-core-1.0.53.tar.gz) = 4fa600404c8f7eab2f451d05bb32a238
diff --git a/x11/gnome-core/files/patch-sum b/x11/gnome-core/files/patch-sum
index 69372e73c3d..b2bd3d22f8d 100644
--- a/x11/gnome-core/files/patch-sum
+++ b/x11/gnome-core/files/patch-sum
@@ -1,10 +1,7 @@
-$NetBSD: patch-sum,v 1.8 1999/09/03 02:00:09 jlam Exp $
+$NetBSD: patch-sum,v 1.9 1999/10/23 11:01:44 tron Exp $
 
-MD5 (patch-aa) = 1615bc65ef004f3649a4f07d8fa159e0
-MD5 (patch-ab) = 2484badfa1060b151b2c19bd12783f20
-MD5 (patch-ac) = bbff4f111083399fe2e6372cdf85b005
-MD5 (patch-ad) = 8707fdf463e93c12b718fa0f0f389686
-MD5 (patch-ae) = f62405560b5c4fcaf87c1ebdcde59a9a
+MD5 (patch-aa) = bbfda5e5e72f45c645356340cbec72a0
+MD5 (patch-ab) = da663b71d7c71c707258fa57ed9af4a9
 MD5 (patch-af) = a18ee68f6e295f5b4607f7b3fb6f3032
 MD5 (patch-ag) = 0ddce7d7bfbf857eab8ce9653c5b8863
 MD5 (patch-ah) = 5cce80b3eabd1a604cfebe3e9b5cc256
diff --git a/x11/gnome-core/patches/patch-aa b/x11/gnome-core/patches/patch-aa
index 3c26e3894c4..ef9aaaac2c1 100644
--- a/x11/gnome-core/patches/patch-aa
+++ b/x11/gnome-core/patches/patch-aa
@@ -1,20 +1,30 @@
-$NetBSD: patch-aa,v 1.4 1999/08/29 12:42:57 rh Exp $
+$NetBSD: patch-aa,v 1.5 1999/10/23 11:01:44 tron Exp $
 
---- configure.orig	Tue Jul 20 00:59:19 1999
-+++ configure	Sun Aug 29 13:16:08 1999
-@@ -2351,6 +2351,7 @@
-   ac_tool_prefix=
+--- configure.orig	Wed Oct  6 08:52:20 1999
++++ configure	Sat Oct 23 11:52:52 1999
+@@ -2139,6 +2139,7 @@
  fi
  
+ 
 +if false; then
+ # Check for any special flags to pass to ltconfig.
+ #
+ # the following will cause an existing older ltconfig to fail, so
+@@ -2297,6 +2298,7 @@
+ 
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -2583,6 +2584,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 +fi
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
+@@ -6660,6 +6662,9 @@
+ s%@CATALOGS@%$CATALOGS%g
+ s%@CATOBJEXT@%$CATOBJEXT%g
+ s%@DATADIRNAME@%$DATADIRNAME%g
++s%@ESD_CFLAGS@%$ESD_CFLAGS%g
++s%@ESD_CONFIG@%$ESD_CONFIG%g
++s%@ESD_LIBS@%$ESD_LIBS%g
+ s%@GMOFILES@%$GMOFILES%g
+ s%@INSTOBJEXT@%$INSTOBJEXT%g
+ s%@INTLDEPS@%$INTLDEPS%g
diff --git a/x11/gnome-core/patches/patch-ab b/x11/gnome-core/patches/patch-ab
index af1136aa38b..ab1dd18571b 100644
--- a/x11/gnome-core/patches/patch-ab
+++ b/x11/gnome-core/patches/patch-ab
@@ -1,16 +1,22 @@
-$NetBSD: patch-ab,v 1.2 1999/03/16 22:29:11 tron Exp $
+$NetBSD: patch-ab,v 1.3 1999/10/23 11:01:44 tron Exp $
 
---- applets/modemlights/modemlights.h.orig	Fri Mar 12 03:50:10 1999
-+++ applets/modemlights/modemlights.h	Tue Mar 16 19:25:48 1999
-@@ -25,6 +25,11 @@
+--- applets/modemlights/modemlights.h.orig	Tue Aug 24 21:41:17 1999
++++ applets/modemlights/modemlights.h	Sat Oct 23 12:30:25 1999
+@@ -14,6 +14,8 @@
+ #include <time.h>
+ #include <net/if.h>
  
- #include <net/ppp_defs.h>
- 
-+#ifdef __NetBSD__
-+#  include <net/if_pppvar.h>
-+#  include <net/if_ppp.h>
-+#endif /* __NetBSD__ */
++#include <net/ppp_defs.h>
 +
+ #if defined(__OpenBSD__) || defined(__NetBSD__)
+ #  include <net/bpf.h>
+ #  include <net/if_pppvar.h>
+@@ -23,8 +25,6 @@
+ #ifdef __FreeBSD__
+ #    include <net/if_ppp.h>
+ #endif /* __FreeBSD__ */
+-
+-#include <net/ppp_defs.h>
+ 
  #include <gnome.h>
  #include <applet-widget.h>
- 
diff --git a/x11/gnome-core/patches/patch-ac b/x11/gnome-core/patches/patch-ac
deleted file mode 100644
index 241fc8feb9d..00000000000
--- a/x11/gnome-core/patches/patch-ac
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ac,v 1.5 1999/03/08 16:40:57 tron Exp $
-
---- applets/modemlights/modemlights.c.orig	Mon Feb  8 17:20:52 1999
-+++ applets/modemlights/modemlights.c	Mon Mar  8 15:23:45 1999
-@@ -32,7 +32,7 @@
- #include <errno.h>
- #include <ctype.h>
- 
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- #include <net/if_ppp.h>
- #endif
- 
-@@ -249,13 +249,13 @@
- 	struct 	ppp_stats stats;
- 
- 	memset(&ifreq, 0, sizeof(ifreq));
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- 	strncpy(ifreq.ifr_name, device_name, IFNAMSIZ);
- #else
- 	strncpy(ifreq.ifr_ifrn.ifrn_name, device_name, IFNAMSIZ);
- #endif /* FreeBSD or OpenBSD */
- 	ifreq.ifr_ifru.ifru_data = (caddr_t)&stats;
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- 		if ((ioctl(ip_socket,SIOCGPPPSTATS,(caddr_t)&ifreq) < 0))
- #else
- #ifdef SIOCDEVPRIVATE
-@@ -264,7 +264,7 @@
- 	*in = *out = 0;
- 	return FALSE;
- #endif
--#endif /* FreeBSD or OpenBSD */
-+#endif /* FreeBSD or NetBSD or OpenBSD */
- 			{
- 				/* failure means ppp is not up */
- 				*in = *out = 0;
diff --git a/x11/gnome-core/patches/patch-ad b/x11/gnome-core/patches/patch-ad
deleted file mode 100644
index 049d2b21e39..00000000000
--- a/x11/gnome-core/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/03/08 16:40:58 tron Exp $
-
---- applets/jbc/jbc-applet.c.orig	Wed Feb 24 15:30:35 1999
-+++ applets/jbc/jbc-applet.c	Mon Mar  8 14:43:44 1999
-@@ -67,7 +67,11 @@
- do_flicker ()
- {
-   thetime = time (NULL);
-+#if defined(__NetBSD__) && __NetBSD_Version__ < 103010000
-+  atime = *localtime (&thetime);
-+#else
-   localtime_r (&thetime, &atime);
-+#endif
- 
-   d[0] = atime.tm_hour / 10;
-   d[1] = atime.tm_hour % 10;
diff --git a/x11/gnome-core/patches/patch-ae b/x11/gnome-core/patches/patch-ae
deleted file mode 100644
index 775fd81cd60..00000000000
--- a/x11/gnome-core/patches/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/05/13 23:59:34 tron Exp $
-
---- gsm/gnome-wm.orig	Tue Mar 23 23:03:46 1999
-+++ gsm/gnome-wm	Fri May 14 01:49:52 1999
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # The user can specify his prefered WM by setting the WINDOW_MANAGER
- # environment variable.
diff --git a/x11/gnome-core/pkg/PLIST b/x11/gnome-core/pkg/PLIST
index 39f9e722bcf..c7f971d3ad9 100644
--- a/x11/gnome-core/pkg/PLIST
+++ b/x11/gnome-core/pkg/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.11 1999/08/29 12:42:57 rh Exp $
+@comment $NetBSD: PLIST,v 1.12 1999/10/23 11:01:45 tron Exp $
 bin/another_clock_applet
 bin/asclock_applet
 bin/battery_applet
 bin/charpick_applet
 bin/clockmail_applet
+bin/cpumemusage_applet
 bin/dialer_applet
 bin/drivemount_applet
 bin/fifteen_applet
@@ -27,6 +28,12 @@ bin/modemlights_applet
 bin/panel
 bin/save-session
 bin/webcontrol_applet
+etc/CORBA/servers/bad-applet.goad
+etc/CORBA/servers/cpumemusage_applet.gnorba
+etc/CORBA/servers/deskguide_applet.gnorba
+etc/CORBA/servers/diskusage_applet.gnorba
+etc/CORBA/servers/multiload_applet.gnorba
+etc/CORBA/servers/tasklist_applet.gnorba
 etc/CORBA/servers/another_clock_applet.gnorba
 etc/CORBA/servers/asclock_applet.gnorba
 etc/CORBA/servers/battery_applet.gnorba
@@ -50,7 +57,6 @@ etc/CORBA/servers/webcontrol_applet.gnorba
 etc/sound/events/panel.soundlist
 include/applet-widget.h
 include/gnome-panel.h
-include/panel-types.h
 lib/appletsConf.sh
 lib/libfish_applet.a
 lib/libfish_applet.so.0.0
@@ -72,17 +78,26 @@ share/applets/Network/mailcheck_applet.desktop
 share/applets/Network/modemlights_applet.desktop
 share/applets/Network/webcontrol_applet.desktop
 share/applets/Utility/.directory
-share/applets/Utility/another_clock_applet.desktop
-share/applets/Utility/asclock_applet.desktop
 share/applets/Utility/charpick_applet.desktop
-share/applets/Utility/clock_applet.desktop
-share/applets/Utility/clockmail_applet.desktop
 share/applets/Utility/drivemount_applet.desktop
 share/applets/Utility/gkb_applet.desktop
 share/applets/Utility/gnomepager_applet.desktop
-share/applets/Utility/jbc_applet.desktop
 share/applets/Utility/mini-commander_applet.desktop
 share/applets/Utility/printer.desktop
+share/applets/Clocks/.directory
+share/applets/Clocks/clock_applet.desktop
+share/applets/Clocks/asclock_applet.desktop
+share/applets/Clocks/clockmail_applet.desktop
+share/applets/Clocks/jbc_applet.desktop
+share/applets/Clocks/another_clock_applet.desktop
+share/applets/Monitors/cpumemusage_applet.desktop
+share/applets/Monitors/diskusage_applet.desktop
+share/applets/Monitors/cpuload_applet.desktop
+share/applets/Monitors/memload_applet.desktop
+share/applets/Monitors/swapload_applet.desktop
+share/applets/Network/clockmail_applet.desktop
+share/applets/Utility/deskguide_applet.desktop
+share/applets/Utility/tasklist_applet.desktop
 share/asclock/Freeamp/beats.xpm
 share/asclock/Freeamp/clock.xpm
 share/asclock/Freeamp/config
@@ -154,6 +169,8 @@ share/asclock/shaped/month.xpm
 share/asclock/shaped/second.xpm
 share/asclock/shaped/weekday.xpm
 share/gnome/apps/.order
+share/gnome/apps/Settings/save-session.desktop
+share/gnome/apps/Settings/session.desktop
 share/gnome/apps/Applications/.directory
 share/gnome/apps/Applications/Emacs.desktop
 share/gnome/apps/Applications/Netscape.desktop
@@ -180,6 +197,37 @@ share/gnome/apps/Utilities/gnome-terminal.desktop
 share/gnome/apps/gnome-help.desktop
 share/gnome/default.session
 share/gnome/default.wm
+share/gnome/help/help-browser/ca/default-page.html
+share/gnome/help/help-browser/et/default-page.html
+share/gnome/help/help-browser/eu/default-page.html
+share/gnome/help/help-browser/ja/help-browser.html
+share/gnome/help/help-browser/ja/topic.dat
+share/gnome/help/help-browser/ja/default-page.html
+share/gnome/help/help-browser/ja/index.html
+share/gnome/help/gnome-terminal/C/index.html
+share/gnome/help/gnome-terminal/C/authors.html
+share/gnome/help/gnome-terminal/C/classes.html
+share/gnome/help/gnome-terminal/C/config.html
+share/gnome/help/gnome-terminal/C/emulation.html
+share/gnome/help/gnome-terminal/C/environment.html
+share/gnome/help/gnome-terminal/C/ln12.html
+share/gnome/help/gnome-terminal/C/menus.html
+share/gnome/help/gnome-terminal/C/options.html
+share/gnome/help/gnome-terminal/C/pointerusage.html
+share/gnome/help/gnome-terminal/C/terminal.html
+share/gnome/help/gnome-terminal/no/index.html
+share/gnome/help/gnome-terminal/no/authors.html
+share/gnome/help/gnome-terminal/no/classes.html
+share/gnome/help/gnome-terminal/no/config.html
+share/gnome/help/gnome-terminal/no/emulation.html
+share/gnome/help/gnome-terminal/no/enviroment.html
+share/gnome/help/gnome-terminal/no/ln9.html
+share/gnome/help/gnome-terminal/no/menus.html
+share/gnome/help/gnome-terminal/no/options.html
+share/gnome/help/gnome-terminal/no/pointerusage.html
+share/gnome/help/gnome-terminal/no/terminal.html
+share/gnome/help/gnome-terminal/no/termtech.html
+share/gnome/help/mini-commander_applet/C/topic.dat
 share/gnome/help/gnome-intro/C/a-sample-session.html
 share/gnome/help/gnome-intro/C/a-sample-session75.html
 share/gnome/help/gnome-intro/C/c93.html
@@ -270,7 +318,6 @@ share/gnome/help/mini-commander_applet/C/change-log.html
 share/gnome/help/mini-commander_applet/C/clock.html
 share/gnome/help/mini-commander_applet/C/command-completion.html
 share/gnome/help/mini-commander_applet/C/command-history.html
-share/gnome/help/mini-commander_applet/C/docbook.css
 share/gnome/help/mini-commander_applet/C/download.html
 share/gnome/help/mini-commander_applet/C/faq.html
 share/gnome/help/mini-commander_applet/C/features.html
@@ -282,7 +329,6 @@ share/gnome/help/mini-commander_applet/C/introduction.html
 share/gnome/help/mini-commander_applet/C/legal-notice.html
 share/gnome/help/mini-commander_applet/C/macros.html
 share/gnome/help/mini-commander_applet/C/properties-0.html
-share/gnome/help/mini-commander_applet/C/screenshot01.gif
 share/gnome/help/mini-commander_applet/C/screenshots.html
 share/gnome/help/mini-commander_applet/C/todo.html
 share/idl/gnome-panel.idl
@@ -292,7 +338,6 @@ share/locale/cs/LC_MESSAGES/gnome-core.mo
 share/locale/da/LC_MESSAGES/gnome-core.mo
 share/locale/de/LC_MESSAGES/gnome-core.mo
 share/locale/es/LC_MESSAGES/gnome-core.mo
-share/locale/es_MX/LC_MESSAGES/gnome-core.mo
 share/locale/fi/LC_MESSAGES/gnome-core.mo
 share/locale/fr/LC_MESSAGES/gnome-core.mo
 share/locale/ga/LC_MESSAGES/gnome-core.mo
@@ -317,6 +362,7 @@ share/pixmaps/emacs.png
 share/pixmaps/fish/fishanim.png
 share/pixmaps/fish/oldwanda.png
 share/pixmaps/gkb.xpm
+share/pixmaps/gkb/ee.xpm
 share/pixmaps/gkb/at.xpm
 share/pixmaps/gkb/be.xpm
 share/pixmaps/gkb/bg.xpm
@@ -441,6 +487,7 @@ share/pixmaps/tiles/tile-purple-up.png
 share/pixmaps/tiles/tile-sand-down.png
 share/pixmaps/tiles/tile-sand-up.png
 share/pixmaps/vnterm.xpm
+share/xmodmap/xmodmap.ee
 share/xmodmap/xmodmap.be
 share/xmodmap/xmodmap.bg
 share/xmodmap/xmodmap.ch
@@ -479,6 +526,50 @@ share/xmodmap/xmodmap.uk
 share/xmodmap/xmodmap.us
 share/xmodmap/xmodmap.us.old
 share/xmodmap/xmodmap.yu
+bin/gnome-login-check
+bin/session-properties
+bin/deskguide_applet
+bin/tasklist_applet
+bin/diskusage_applet
+bin/multiload_applet
+share/locale/ro/LC_MESSAGES/gnome-core.mo
+share/locale/el/LC_MESSAGES/gnome-core.mo
+share/locale/eu/LC_MESSAGES/gnome-core.mo
+share/locale/en_GB/LC_MESSAGES/gnome-core.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gnome-core.mo
+share/locale/et/LC_MESSAGES/gnome-core.mo
+share/pixmaps/charpick.png
+share/pixmaps/gnome-battery.png
+share/pixmaps/gnome-clock.png
+share/pixmaps/gnome-color-xterm.png
+share/pixmaps/gnome-cpu.png
+share/pixmaps/gnome-cpu-mem.png
+share/pixmaps/gnome-favorites.png
+share/pixmaps/gnome-fifteen.png
+share/pixmaps/gnome-fish.png
+share/pixmaps/gnome-graphics.png
+share/pixmaps/gnome-joystick.png
+share/pixmaps/gnome-laptop.png
+share/pixmaps/gnome-life.png
+share/pixmaps/gnome-mem.png
+share/pixmaps/gnome-modem.png
+share/pixmaps/gnome-panel.png
+share/pixmaps/gnome-xterm.png
+share/pixmaps/gnome-terminal.png
+share/pixmaps/gnome-util.png
+share/pixmaps/gnome-ccbackground.png
+share/pixmaps/gnome-ccdesktop.png
+share/pixmaps/gnome-ccthemes.png
+share/pixmaps/gnome-ccdialog.png
+share/pixmaps/gnome-ccscreensaver.png
+share/pixmaps/gnome-ccwindowmanager.png
+share/pixmaps/gnome-cckeyboard-bell.png
+share/pixmaps/gnome-cckeyboard.png
+share/pixmaps/gnome-ccmime.png
+share/pixmaps/gnome-ccperiph.png
+share/pixmaps/gnome-deskguide.png
+share/pixmaps/gnome-deskguide-splash.png
+share/pixmaps/gnome-tasklist.png
 @dirrm share/xmodmap
 @dirrm share/pixmaps/tiles
 @dirrm share/pixmaps/mini-commander
@@ -493,9 +584,13 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/help-browser/no
 @dirrm share/gnome/help/help-browser/ko
 @dirrm share/gnome/help/help-browser/it
+@dirrm share/gnome/help/help-browser/ja
 @dirrm share/gnome/help/help-browser/hu
 @dirrm share/gnome/help/help-browser/fr
+@dirrm share/gnome/help/help-browser/eu
+@dirrm share/gnome/help/help-browser/et
 @dirrm share/gnome/help/help-browser/es
+@dirrm share/gnome/help/help-browser/ca
 @dirrm share/gnome/help/help-browser/C
 @dirrm share/gnome/help/help-browser
 @dirrm share/gnome/help/gnome-terminal/no
@@ -526,6 +621,7 @@ share/xmodmap/xmodmap.yu
 @dirrm share/applets/Network
 @dirrm share/applets/Multimedia
 @dirrm share/applets/Monitors
+@dirrm share/applets/Clocks
 @dirrm share/applets/Amusements
 @dirrm share/applets
 @dirrm etc/CORBA/servers