Upgrade to 0.99.8.1.

5 files changed, 141 insertions, 33 deletions

diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 008d25fd4878..8012cd447da5 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	gnomecore
-# Version required:			0.99.5.1
+# Version required:			0.99.8.1
 # Date created:				17 March 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.16 1999/02/02 00:21:48 vanilla Exp $
+# $Id: Makefile,v 1.17 1999/02/02 08:30:21 vanilla Exp $
 #
 
-DISTNAME=	gnome-core-0.99.5.1
-PKGNAME=	gnomecore-0.99.5.1
+DISTNAME=	gnome-core-0.99.8.1
+PKGNAME=	gnomecore-0.99.8.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	gnome-core
diff --git a/x11/gnomecore/distinfo b/x11/gnomecore/distinfo
index d49f0511f109..4dbf7775d069 100644
--- a/x11/gnomecore/distinfo
+++ b/x11/gnomecore/distinfo
@@ -1 +1 @@
-MD5 (gnome-core-0.99.5.1.tar.gz) = 778c6b781abef8683d7e07215135d5f0
+MD5 (gnome-core-0.99.8.1.tar.gz) = 927e5ffaaba7a8fd5cd1b55be993d5b0
diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa
index 49623c09f374..32da72ad6ce5 100644
--- a/x11/gnomecore/files/patch-aa
+++ b/x11/gnomecore/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.orig	Mon Feb  1 06:34:03 1999
-+++ configure	Tue Feb  2 05:57:35 1999
-@@ -1121,13 +1121,13 @@
+--- configure.orig	Tue Feb 16 01:45:51 1999
++++ configure	Fri Feb 19 03:41:47 1999
+@@ -1133,13 +1133,13 @@
  	    fi
  	
  	    if test "$no_gnome_config" = "yes"; then
 -              echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:1126: checking for gnomeConf.sh file in $gnome_prefix" >&5
+-echo "configure:1138: checking for gnomeConf.sh file in $gnome_prefix" >&5
 -	      if test -f $gnome_prefix/gnomeConf.sh; then
 +              echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:1126: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
++echo "configure:1138: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
 +	      if test -f $prefix/share/gnome/gnomeConf.sh; then
  	        echo "$ac_t""found" 1>&6
  	        echo "loading gnome configuration from" \
@@ -19,7 +19,7 @@
  	        
  	      else
  	        echo "$ac_t""not found" 1>&6
-@@ -5046,7 +5046,7 @@
+@@ -5071,7 +5071,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -28,7 +28,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -5308,7 +5308,7 @@
+@@ -5333,7 +5333,7 @@
  		 USE_INCLUDED_LIBINTL=yes
  		 CATOBJEXT=.cat
  		 INSTOBJEXT=.cat
diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae
index aad9aa16cdb4..320b3643a70b 100644
--- a/x11/gnomecore/files/patch-ae
+++ b/x11/gnomecore/files/patch-ae
@@ -152,6 +152,17 @@
  
  
  bin_PROGRAMS = gen_util_applet
+--- applets/gkb/Makefile.in.orig	Fri Feb 19 03:47:32 1999
++++ applets/gkb/Makefile.in	Fri Feb 19 03:47:52 1999
+@@ -152,7 +152,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-INCLUDES = -I. -I$(srcdir)                                      -I$(top_srcdir)/intl -I$(top_builddir)/intl             -I$(srcdir)/../../panel                                 -I$(top_builddir)/panel         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"                -I$(includedir) $(GNOME_INCLUDEDIR)
++INCLUDES = -I. -I$(srcdir)                                      -I$(top_srcdir)/intl -I$(top_builddir)/intl             -I$(srcdir)/../../panel                                 -I$(top_builddir)/panel         -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"                -I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ 
+ #if DO_EXE
 --- applets/gnome-pager/Makefile.in.orig	Mon Feb  1 07:47:04 1999
 +++ applets/gnome-pager/Makefile.in	Tue Feb  2 06:02:53 1999
 @@ -150,7 +150,7 @@
@@ -163,17 +174,6 @@
  
  
  bin_PROGRAMS = gnomepager_applet
---- applets/gticker/Makefile.in.orig	Mon Feb  1 07:47:20 1999
-+++ applets/gticker/Makefile.in	Tue Feb  2 06:03:08 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
- l = @l@
- 
--INCLUDES = -I. -I$(srcdir) 					-I$(srcdir)/../../panel					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(top_builddir)/panel 	-I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) 					-I$(srcdir)/../../panel					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(top_builddir)/panel 	-I$(includedir) $(GNOME_INCLUDEDIR)
- 
- 
- bin_PROGRAMS = gticker_applet
 --- applets/mini-commander/src/Makefile.in.orig	Tue Feb  2 06:03:17 1999
 +++ applets/mini-commander/src/Makefile.in	Tue Feb  2 06:03:29 1999
 @@ -150,7 +150,7 @@
@@ -432,3 +432,44 @@
  
  gnome_terminal_help_DATA =  	index.html			topic.dat
  
+--- applets/cpumemusage/proc.c.orig	Fri Feb 19 04:07:15 1999
++++ applets/cpumemusage/proc.c	Fri Feb 19 04:07:29 1999
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <glibtop.h>
+ #include <glibtop/cpu.h>
+ #include <glibtop/mem.h>
+--- applets/diskusage/diskusage_read.c.orig	Fri Feb 19 04:09:00 1999
++++ applets/diskusage/diskusage_read.c	Fri Feb 19 04:09:13 1999
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <glibtop.h>
+ #include <glibtop/fsusage.h>
+ #include <glibtop/mountlist.h>
+--- applets/Makefile.in.orig	Fri Feb 19 04:43:52 1999
++++ applets/Makefile.in	Fri Feb 19 04:44:40 1999
+@@ -152,13 +152,13 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-always_built_SUBDIRS = applet-dirs gen_util asclock 	 fish dialer webcontrol 	 drivemount clockmail fifteen battery charpick 	 gnome-pager mini-commander gkb
++always_built_SUBDIRS = applet-dirs gen_util asclock 	 fish dialer webcontrol clockmail fifteen battery charpick 	 gnome-pager mini-commander gkb
+ 
+ @FALSE_TRUE@@HAVE_LIBESD_TRUE@esdmanager = esd-manager
+ @FALSE_TRUE@@HAVE_LIBESD_FALSE@esdmanager = 
+ 
+ @FALSE_TRUE@@HAVE_FVWM_TRUE@fvwm = fvwm-pager
+-@HAVE_LIBGTOP_TRUE@libgtop_SUBDIRS = cpumemusage diskusage multiload netload
++@HAVE_LIBGTOP_TRUE@libgtop_SUBDIRS = cpumemusage diskusage multiload
+ @HAVE_LIBGTOP_FALSE@libgtop_SUBDIRS = 
+ 
+ @HAVE_LIBGHTTP_TRUE@slashapp = slashapp
+@@ -174,7 +174,7 @@
+ SUBDIRS = $(always_built_SUBDIRS) $(libgtop_SUBDIRS) 	 $(cdplayer) $(mixer) $(modemlights) $(winlist)          $(slashapp) $(esdmanager) $(fvwm)
+ 
+ 
+-DIST_SUBDIRS = $(always_built_SUBDIRS) esd-manager cpumemusage 	diskusage multiload netload slashapp cdplayer 	 mixer modemlights winlist fvwm-pager
++DIST_SUBDIRS = $(always_built_SUBDIRS) esd-manager cpumemusage 	diskusage multiload slashapp cdplayer 	 mixer modemlights winlist fvwm-pager
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
diff --git a/x11/gnomecore/pkg-plist b/x11/gnomecore/pkg-plist
index 7c5ef0333206..1156beda4fd1 100644
--- a/x11/gnomecore/pkg-plist
+++ b/x11/gnomecore/pkg-plist
@@ -5,7 +5,6 @@ bin/clockmail_applet
 bin/cpumemusage_applet
 bin/dialer_applet
 bin/diskusage_applet
-bin/drivemount_applet
 bin/fifteen_applet
 bin/gen_util_applet
 bin/gmenu
@@ -17,12 +16,10 @@ bin/gnome-session
 bin/gnome-smproxy
 bin/gnome-terminal
 bin/gnomepager_applet
-bin/gticker_applet
 bin/mini_commander_applet
 bin/mixer_applet
 bin/modemlights_applet
 bin/multiload_applet
-bin/netload_applet
 bin/panel
 bin/save-session
 bin/session-properties
@@ -35,19 +32,19 @@ etc/CORBA/servers/clockmail_applet.gnorba
 etc/CORBA/servers/cpumemusage_applet.gnorba
 etc/CORBA/servers/dialer_applet.gnorba
 etc/CORBA/servers/diskusage_applet.gnorba
-etc/CORBA/servers/drivemount_applet.gnorba
 etc/CORBA/servers/fifteen_applet.gnorba
 etc/CORBA/servers/fish_applet.gnorba
 etc/CORBA/servers/gen_util.gnorba
+etc/CORBA/servers/gkb_applet.gnorba
 etc/CORBA/servers/gnomepager_applet.gnorba
 etc/CORBA/servers/help-browser.gnorba
 etc/CORBA/servers/mini-commander_applet.gnorba
 etc/CORBA/servers/mixer_applet.gnorba
 etc/CORBA/servers/modemlights_applet.gnorba
 etc/CORBA/servers/multiload_applet.gnorba
-etc/CORBA/servers/netload_applet.gnorba
 etc/CORBA/servers/panel.gnorba
 etc/CORBA/servers/slash_applet.gnorba
+etc/CORBA/servers/webcontrol_applet.gnorba
 etc/sound/events/panel.soundlist
 include/applet-widget.h
 include/gnome-panel.h
@@ -56,6 +53,10 @@ lib/libfish_applet.a
 lib/libfish_applet.la
 lib/libfish_applet.so
 lib/libfish_applet.so.0
+lib/libgkb_applet.a
+lib/libgkb_applet.la
+lib/libgkb_applet.so
+lib/libgkb_applet.so.0
 lib/libpanel_applet.a
 lib/libpanel_applet.la
 lib/libpanel_applet.so
@@ -66,7 +67,6 @@ share/gnome/appletsConf.sh
 share/gnome/applets/Amusements/.directory
 share/gnome/applets/Amusements/fifteen_applet.desktop
 share/gnome/applets/Amusements/fish_applet.desktop
-share/gnome/applets/Amusements/gticker_applet.desktop
 share/gnome/applets/Amusements/slash_applet.desktop
 share/gnome/applets/Monitors/.directory
 share/gnome/applets/Monitors/battery_applet.desktop
@@ -81,14 +81,13 @@ share/gnome/applets/Network/.directory
 share/gnome/applets/Network/dialer_applet.desktop
 share/gnome/applets/Network/mailcheck_applet.desktop
 share/gnome/applets/Network/modemlights_applet.desktop
-share/gnome/applets/Network/netload_applet.desktop
 share/gnome/applets/Network/webcontrol_applet.desktop
 share/gnome/applets/Utility/.directory
 share/gnome/applets/Utility/asclock_applet.desktop
 share/gnome/applets/Utility/charpick_applet.desktop
 share/gnome/applets/Utility/clock_applet.desktop
 share/gnome/applets/Utility/clockmail_applet.desktop
-share/gnome/applets/Utility/drivemount_applet.desktop
+share/gnome/applets/Utility/gkb_applet.desktop
 share/gnome/applets/Utility/gnomepager_applet.desktop
 share/gnome/applets/Utility/mini-commander_applet.desktop
 share/gnome/applets/Utility/printer.desktop
@@ -174,7 +173,6 @@ share/gnome/help/gnome-terminal/C/docbook.css
 share/gnome/help/gnome-terminal/C/emulation.html
 share/gnome/help/gnome-terminal/C/enviroment.html
 share/gnome/help/gnome-terminal/C/index.html
-share/gnome/help/gnome-terminal/C/ln9.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
@@ -220,6 +218,37 @@ share/gnome/panelrc
 share/gnome/pixmaps/emacs.png
 share/gnome/pixmaps/fish/fishanim.png
 share/gnome/pixmaps/fish/oldwanda.png
+share/gnome/pixmaps/gkb.xpm
+share/gnome/pixmaps/gkb/be.xpm
+share/gnome/pixmaps/gkb/bg.xpm
+share/gnome/pixmaps/gkb/ca.xpm
+share/gnome/pixmaps/gkb/ch.xpm
+share/gnome/pixmaps/gkb/cz.xpm
+share/gnome/pixmaps/gkb/de.xpm
+share/gnome/pixmaps/gkb/dk.xpm
+share/gnome/pixmaps/gkb/es.xpm
+share/gnome/pixmaps/gkb/fi.xpm
+share/gnome/pixmaps/gkb/fr.xpm
+share/gnome/pixmaps/gkb/gb.xpm
+share/gnome/pixmaps/gkb/gr.xpm
+share/gnome/pixmaps/gkb/hu.xpm
+share/gnome/pixmaps/gkb/il.xpm
+share/gnome/pixmaps/gkb/is.xpm
+share/gnome/pixmaps/gkb/it.xpm
+share/gnome/pixmaps/gkb/jp.xpm
+share/gnome/pixmaps/gkb/nl.xpm
+share/gnome/pixmaps/gkb/no.xpm
+share/gnome/pixmaps/gkb/pl.xpm
+share/gnome/pixmaps/gkb/pt.xpm
+share/gnome/pixmaps/gkb/qc.xpm
+share/gnome/pixmaps/gkb/ru.xpm
+share/gnome/pixmaps/gkb/se.xpm
+share/gnome/pixmaps/gkb/si.xpm
+share/gnome/pixmaps/gkb/sk.xpm
+share/gnome/pixmaps/gkb/th.xpm
+share/gnome/pixmaps/gkb/tr.xpm
+share/gnome/pixmaps/gkb/us.xpm
+share/gnome/pixmaps/gkb/yu.xpm
 share/gnome/pixmaps/gnome-aorta.png
 share/gnome/pixmaps/gnome-audio2.png
 share/gnome/pixmaps/gnome-background.png
@@ -302,6 +331,42 @@ share/gnome/pixmaps/tiles/tile-purple-up.png
 share/gnome/pixmaps/tiles/tile-sand-down.png
 share/gnome/pixmaps/tiles/tile-sand-up.png
 share/gnome/pixmaps/vnterm.xpm
+share/gnome/xmodmap/xmodmap.be
+share/gnome/xmodmap/xmodmap.bg
+share/gnome/xmodmap/xmodmap.ch
+share/gnome/xmodmap/xmodmap.cz
+share/gnome/xmodmap/xmodmap.de
+share/gnome/xmodmap/xmodmap.dk
+share/gnome/xmodmap/xmodmap.dvorak
+share/gnome/xmodmap/xmodmap.es
+share/gnome/xmodmap/xmodmap.fi
+share/gnome/xmodmap/xmodmap.fr
+share/gnome/xmodmap/xmodmap.gr
+share/gnome/xmodmap/xmodmap.hu
+share/gnome/xmodmap/xmodmap.hu.old
+share/gnome/xmodmap/xmodmap.il
+share/gnome/xmodmap/xmodmap.is
+share/gnome/xmodmap/xmodmap.it
+share/gnome/xmodmap/xmodmap.la
+share/gnome/xmodmap/xmodmap.nl
+share/gnome/xmodmap/xmodmap.no
+share/gnome/xmodmap/xmodmap.pl
+share/gnome/xmodmap/xmodmap.pt
+share/gnome/xmodmap/xmodmap.qc
+share/gnome/xmodmap/xmodmap.ru
+share/gnome/xmodmap/xmodmap.ru_koi8
+share/gnome/xmodmap/xmodmap.se
+share/gnome/xmodmap/xmodmap.sf
+share/gnome/xmodmap/xmodmap.sg
+share/gnome/xmodmap/xmodmap.si
+share/gnome/xmodmap/xmodmap.sk
+share/gnome/xmodmap/xmodmap.th
+share/gnome/xmodmap/xmodmap.tr_f
+share/gnome/xmodmap/xmodmap.tr_q
+share/gnome/xmodmap/xmodmap.uk
+share/gnome/xmodmap/xmodmap.us
+share/gnome/xmodmap/xmodmap.us.old
+share/gnome/xmodmap/xmodmap.yu
 share/locale/ca/LC_MESSAGES/gnome-core.mo
 share/locale/cs/LC_MESSAGES/gnome-core.mo
 share/locale/da/LC_MESSAGES/gnome-core.mo
@@ -359,7 +424,9 @@ share/locale/sv/LC_MESSAGES/gnome-core.mo
 @dirrm share/gnome/help
 @dirrm share/gnome/mc/templates
 @dirrm share/gnome/mc
+@dirrm share/gnome/pixmaps/gkb
+@dirrm share/gnome/pixmaps/fish
 @dirrm share/gnome/pixmaps/mailcheck
 @dirrm share/gnome/pixmaps/mini-commander
-@dirrm share/gnome/pixmaps/fish
 @dirrm share/gnome/pixmaps/tiles
+@dirrm share/gnome/xmodmap