The never ending gnome story:

Update "gnome-core" package to version 0.99.3.1.

4 files changed, 72 insertions, 29 deletions

diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 9c95f0fe144..0c6b79ffa2e 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 1999/01/03 00:49:12 tron Exp $
+# $NetBSD: Makefile,v 1.5 1999/01/16 05:39:42 tron Exp $
 #
 
-DISTNAME=	gnome-core-0.99.0
+DISTNAME=	gnome-core-0.99.3.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
 		ftp://ftp.gnome.org/pub/GNOME/sources/ \
@@ -10,8 +10,8 @@ MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 
-DEPENDS+=	gnome-libs-0.99.0:../../x11/gnome-libs
-DEPENDS+=	libgtop-0.99.0:../../devel/libgtop
+DEPENDS+=	gnome-libs-0.99.3:../../x11/gnome-libs
+DEPENDS+=	libgtop-0.99.2:../../devel/libgtop
 
 CONFLICTS=	gnome-core-*
 
diff --git a/x11/gnome-core/files/md5 b/x11/gnome-core/files/md5
index 892e3d304b3..462a8684565 100644
--- a/x11/gnome-core/files/md5
+++ b/x11/gnome-core/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/01/03 00:49:12 tron Exp $
+$NetBSD: md5,v 1.3 1999/01/16 05:39:42 tron Exp $
 
-MD5 (gnome-core-0.99.0.tar.gz) = 7458616e40bc2a5ab958c00e5a8d3804
+MD5 (gnome-core-0.99.3.1.tar.gz) = 39fe7763ebc0db14aca99f5d866bed93
diff --git a/x11/gnome-core/patches/patch-ac b/x11/gnome-core/patches/patch-ac
index a20d9c849ea..d1e9afd42c0 100644
--- a/x11/gnome-core/patches/patch-ac
+++ b/x11/gnome-core/patches/patch-ac
@@ -1,10 +1,8 @@
-$NetBSD: patch-ac,v 1.2 1999/01/04 21:58:12 tron Exp $
+$NetBSD: patch-ac,v 1.3 1999/01/16 05:39:42 tron Exp $
 
-Make this compile on NetBSD, as well as FreeBSD.
-
---- applets/modemlights/modemlights.c.orig	Mon Dec 14 20:34:38 1998
-+++ applets/modemlights/modemlights.c	Mon Jan  4 22:39:43 1999
-@@ -226,17 +226,21 @@
+--- applets/modemlights/modemlights.c.orig	Wed Jan 13 00:44:49 1999
++++ applets/modemlights/modemlights.c	Sat Jan 16 06:07:41 1999
+@@ -226,21 +226,24 @@
  	struct 	ppp_stats stats;
  
  	memset(&ifreq, 0, sizeof(ifreq));
@@ -13,24 +11,27 @@ Make this compile on NetBSD, as well as FreeBSD.
 -#else
 +#if (defined(BSD) && BSD >= 199506) || defined(__NetBSD__)
  	strncpy(ifreq.ifr_name, device_name, IFNAMSIZ);
--#endif /* __FreeBSD__ */
 +#else
 +	strncpy(ifreq.ifr_ifrn.ifrn_name, device_name, IFNAMSIZ);
-+#endif /* 4.4-BSD derived */
+ #endif /* __FreeBSD__ */
  	ifreq.ifr_ifru.ifru_data = (caddr_t)&stats;
 -#ifndef __FreeBSD__
--	if ((ioctl(ip_socket,SIOCDEVPRIVATE,(caddr_t)&ifreq) < 0))
-+#if (defined(BSD) && BSD >= 199506)
++#if defined(__FreeBSD__)
 +	if ((ioctl(ip_socket,SIOCGPPPSTATS,(caddr_t)&ifreq) < 0))
 +#else
 +#if defined(__NetBSD__)
 +	if ((ioctl(ip_socket,SIOCGIFFLAGS,(caddr_t)&ifreq) < 0))
++#else
+ #ifdef SIOCDEVPRIVATE
+ 	if ((ioctl(ip_socket,SIOCDEVPRIVATE,(caddr_t)&ifreq) < 0))
  #else
+-	*in = *out = 0;
+-	return FALSE;
++	if (0)
+ #endif
+-#else
 -		if ((ioctl(ip_socket,SIOCGPPPSTATS,(caddr_t)&ifreq) < 0))
--#endif /* __FreeBSD__ */
-+	if ((ioctl(ip_socket,SIOCDEVPRIVATE,(caddr_t)&ifreq) < 0))
 +#endif /* NetBSD */
-+#endif /* 4.4-BSD derived */
+ #endif /* __FreeBSD__ */
  			{
  				/* failure means ppp is not up */
- 				*in = *out = 0;
diff --git a/x11/gnome-core/pkg/PLIST b/x11/gnome-core/pkg/PLIST
index b042ac070bd..06fa8b2f886 100644
--- a/x11/gnome-core/pkg/PLIST
+++ b/x11/gnome-core/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/01/03 00:49:12 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/01/16 05:39:42 tron Exp $
 bin/gmenu
 bin/gnome-session
 bin/save-session
@@ -10,7 +10,6 @@ bin/gnome-help-browser
 bin/gnome-terminal
 bin/panel
 bin/gen_util_applet
-bin/batmon_applet
 bin/asclock_applet
 bin/netload_applet
 bin/dialer_applet
@@ -31,7 +30,6 @@ bin/multiload_applet
 etc/CORBA/servers/help-browser.gnorba
 etc/CORBA/servers/panel.gnorba
 etc/CORBA/servers/gen_util.gnorba
-etc/CORBA/servers/batmon_applet.gnorba
 etc/CORBA/servers/asclock_applet.gnorba
 etc/CORBA/servers/fish_applet.gnorba
 etc/CORBA/servers/dialer_applet.gnorba
@@ -50,6 +48,7 @@ etc/CORBA/servers/netload_applet.gnorba
 etc/CORBA/servers/modemlights_applet.gnorba
 etc/sound/events/panel.soundlist
 include/applet-widget.h
+include/gnome-panel.h
 include/panel-types.h
 lib/libfish_applet.so.0.0
 lib/libfish_applet.a
@@ -80,6 +79,7 @@ lib/locale/es_SV/LC_MESSAGES/gnome-core.cat
 lib/locale/ru/LC_MESSAGES/gnome-core.cat
 lib/locale/pl/LC_MESSAGES/gnome-core.cat
 lib/locale/hu/LC_MESSAGES/gnome-core.cat
+lib/locale/nl/LC_MESSAGES/gnome-core.cat
 share/applets/Monitors/cpumemusage_applet.desktop
 share/applets/Monitors/diskusage_applet.desktop
 share/applets/Monitors/cpuload_applet.desktop
@@ -91,7 +91,6 @@ share/applets/Amusements/.directory
 share/applets/Amusements/fish_applet.desktop
 share/applets/Amusements/fifteen_applet.desktop
 share/applets/Monitors/.directory
-share/applets/Monitors/batmon_applet.desktop
 share/applets/Monitors/battery_applet.desktop
 share/applets/Multimedia/.directory
 share/applets/Network/.directory
@@ -134,12 +133,18 @@ share/apps/Utilities/gnome-terminal.desktop
 share/apps/.order
 share/apps/gnome-help.desktop
 share/default.session
+share/gnome/help/help-browser/C/gnome-logo-large.png
 share/gnome/help/help-browser/C/help-browser.html
 share/gnome/help/help-browser/C/topic.dat
 share/gnome/help/help-browser/C/default-page.html
-share/gnome/help/help-browser/C/bg.png
-share/gnome/help/help-browser/C/gnome-logo2.png
 share/gnome/help/help-browser/C/index.html
+share/gnome/help/help-browser/es/help-browser.html
+share/gnome/help/help-browser/es/topic.dat
+share/gnome/help/help-browser/es/default-page.html
+share/gnome/help/help-browser/es/index.html
+share/gnome/help/help-browser/fr/topic.dat
+share/gnome/help/help-browser/fr/default-page.html
+share/gnome/help/help-browser/fr/index.html
 share/gnome/help/gnome-intro/C/pix/terminal.gif
 share/gnome/help/gnome-intro/C/pix/gedit-2files.gif
 share/gnome/help/gnome-intro/C/pix/ghex-2files.gif
@@ -188,6 +193,25 @@ share/gnome/help/gnome-intro/C/c93127.html
 share/gnome/help/gnome-intro/C/c93412.html
 share/gnome/help/gnome-intro/C/c93175.html
 share/gnome/help/gnome-intro/C/docbook.css
+share/gnome/help/mini-commander/C/change-log.html
+share/gnome/help/mini-commander/C/faq.html
+share/gnome/help/mini-commander/C/legal-notice.html
+share/gnome/help/mini-commander/C/features.html
+share/gnome/help/mini-commander/C/macros.html
+share/gnome/help/mini-commander/C/clock.html
+share/gnome/help/mini-commander/C/feedback.html
+share/gnome/help/mini-commander/C/screenshot01.gif
+share/gnome/help/mini-commander/C/command-completion.html
+share/gnome/help/mini-commander/C/gpl2.html
+share/gnome/help/mini-commander/C/screenshots.html
+share/gnome/help/mini-commander/C/command-history.html
+share/gnome/help/mini-commander/C/history.html
+share/gnome/help/mini-commander/C/todo.html
+share/gnome/help/mini-commander/C/customization.html
+share/gnome/help/mini-commander/C/index.html
+share/gnome/help/mini-commander/C/docbook.css
+share/gnome/help/mini-commander/C/introduction.html
+share/gnome/help/mini-commander/C/download.html
 share/panelrc
 share/pixmaps/emacs.png
 share/pixmaps/gnome-aorta.png
@@ -225,6 +249,8 @@ share/pixmaps/gnome-networktool.png
 share/pixmaps/gnome-note.png
 share/pixmaps/gnome-qeye.png
 share/pixmaps/gnome-talk.png
+share/pixmaps/tiles/tile-blue-up.png
+share/pixmaps/tiles/tile-blue-down.png
 share/pixmaps/tiles/tile-normal-up.png
 share/pixmaps/tiles/tile-normal-down.png
 share/pixmaps/tiles/tile-purple-up.png
@@ -239,7 +265,7 @@ share/pixmaps/gnome-term.png
 share/pixmaps/gnome-tigert.png
 share/pixmaps/gnome-unknown.png
 share/pixmaps/gnome-word.png
-share/pixmaps/kterm.png
+share/pixmaps/kterm.xpm
 share/pixmaps/launcher-program.png
 share/pixmaps/monitor.png
 share/pixmaps/netscape.png
@@ -256,8 +282,6 @@ share/pixmaps/panel-menu-main.png
 share/pixmaps/mailcheck/email.png
 share/pixmaps/mailcheck/email-e.png
 share/pixmaps/mailcheck/tux-anim.png
-share/pixmaps/batmon-ac.png
-share/pixmaps/batmon-bat.png
 share/pixmaps/fish/fishanim.png
 share/pixmaps/gnome-color-browser.png
 share/pixmaps/tiles/tile-coral-up.png
@@ -276,6 +300,10 @@ share/idl/help-browser.idl
 @dirrm share/pixmaps/tiles
 @dirrm share/pixmaps/mailcheck
 @dirrm share/pixmaps/fish
+@dirrm share/gnome/help/mini-commander/C
+@dirrm share/gnome/help/mini-commander
+@dirrm share/gnome/help/help-browser/fr
+@dirrm share/gnome/help/help-browser/es
 @dirrm share/gnome/help/help-browser/C
 @dirrm share/gnome/help/help-browser
 @dirrm share/gnome/help/gnome-intro/C/pix
@@ -299,5 +327,19 @@ share/idl/help-browser.idl
 @dirrm share/applets/Network
 @dirrm share/applets/Utility
 @dirrm share/applets
+@dirrm lib/locale/es_DO/LC_MESSAGES
+@dirrm lib/locale/es_DO
+@dirrm lib/locale/es_GT/LC_MESSAGES
+@dirrm lib/locale/es_GT
+@dirrm lib/locale/es_HN/LC_MESSAGES
+@dirrm lib/locale/es_HN
+@dirrm lib/locale/es_MX/LC_MESSAGES
+@dirrm lib/locale/es_MX
+@dirrm lib/locale/es_PA/LC_MESSAGES
+@dirrm lib/locale/es_PA
+@dirrm lib/locale/es_PE/LC_MESSAGES
+@dirrm lib/locale/es_PE
+@dirrm lib/locale/es_SV/LC_MESSAGES
+@dirrm lib/locale/es_SV
 @dirrm etc/CORBA/servers
 @dirrm etc/CORBA