Upgrade to 0.99.3.1.

5 files changed, 208 insertions, 156 deletions

diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 01ec61443e3..e7970e590a3 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -1,26 +1,27 @@
 # New ports collection makefile for:   gnomecore
-# Version required:    0.99.1
+# Version required:    0.99.3.1
 # Date created:        17 March 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.9 1999/01/06 12:19:42 obrien Exp $
+# $Id: Makefile,v 1.10 1999/01/12 16:50:33 vanilla Exp $
 #
 
-DISTNAME=	gnome-core-0.99.1
-PKGNAME=	gnomecore-0.99.1
+DISTNAME=	gnome-core-0.99.3.1
+PKGNAME=	gnomecore-0.99.3.1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
-		ftp://ftp.gnome.org/pub/GNOME/sources/
+MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/latest/ \
+		ftp://ftp.geo.net/pub/gnome/sources/latest/ \
+		ftp://gnomeftp.wgn.net/pub/gnome/sources/latest/ \
+		ftp://ftp.gnome.org/pub/GNOME/sources/latest/
 
 MAINTAINER=	nacai@iname.com
 
+RUN_DEPENDS=	${X11BASE}/share/gnome/sounds/duck.wav:${PORTSDIR}/audio/gnomeaudio
 LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
-		gtop.0:${PORTSDIR}/devel/libgtop \
+		gtop.1:${PORTSDIR}/devel/libgtop \
 		esd.1:${PORTSDIR}/audio/esound \
 		ghttp.0:${PORTSDIR}/www/libghttp
 
-BROKEN=	'gnome-core-0.99.2 is the currently available'
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/gnomecore/distinfo b/x11/gnomecore/distinfo
index 1a6d65ec6eb..c7457285e8d 100644
--- a/x11/gnomecore/distinfo
+++ b/x11/gnomecore/distinfo
@@ -1 +1 @@
-MD5 (gnome-core-0.99.1.tar.gz) = 5652e843f0406a2000afbf7e7f1b7b41
+MD5 (gnome-core-0.99.3.1.tar.gz) = 39fe7763ebc0db14aca99f5d866bed93
diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa
index b1b34145f83..25d5a0b89a9 100644
--- a/x11/gnomecore/files/patch-aa
+++ b/x11/gnomecore/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.orig	Thu Dec 31 00:59:18 1998
-+++ configure	Fri Jan  1 11:32:51 1999
-@@ -1098,13 +1098,13 @@
+--- configure.orig	Wed Jan 13 10:36:02 1999
++++ configure	Thu Jan 14 21:55:14 1999
+@@ -1100,13 +1100,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:1103: checking for gnomeConf.sh file in $gnome_prefix" >&5
+-echo "configure:1105: 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:1103: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
++echo "configure:1105: 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" \
diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae
index 923268b869e..44fcf255baa 100644
--- a/x11/gnomecore/files/patch-ae
+++ b/x11/gnomecore/files/patch-ae
@@ -1,6 +1,6 @@
---- applets/asclock/Makefile.in.orig	Thu Dec 31 01:54:57 1998
-+++ applets/asclock/Makefile.in	Fri Jan  1 11:47:02 1999
-@@ -152,7 +152,7 @@
+--- applets/asclock/Makefile.in.orig	Wed Jan 13 11:02:10 1999
++++ applets/asclock/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel				\
@@ -9,8 +9,8 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)		\
  	-DVERSION=\""$(VERSION)"\"
  
---- applets/batmon/Makefile.in.orig	Thu Dec 31 01:54:56 1998
-+++ applets/batmon/Makefile.in	Fri Jan  1 11:46:06 1999
+--- applets/battery/Makefile.in.orig	Wed Jan 13 11:02:19 1999
++++ applets/battery/Makefile.in	Thu Jan 14 21:57:40 1999
 @@ -155,7 +155,7 @@
  	-I$(top_builddir)/intl	\
  	-I$(top_builddir)/panel	\
@@ -19,32 +19,10 @@
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
- bin_PROGRAMS = batmon_applet
---- applets/battery/Makefile.in.orig	Thu Dec 31 01:55:03 1998
-+++ applets/battery/Makefile.in	Fri Jan  1 11:46:06 1999
-@@ -153,7 +153,7 @@
- 	-I$(top_builddir)/intl	\
- 	-I$(top_builddir)/panel	\
- 	-I$(srcdir)/../../panel				\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
- 
  bin_PROGRAMS = battery_applet
---- applets/bussign/Makefile.in.orig	Thu Dec 31 01:55:12 1998
-+++ applets/bussign/Makefile.in	Fri Jan  1 11:46:06 1999
-@@ -152,7 +152,7 @@
- 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
- 	-I$(top_builddir)/panel \
- 	-I$(srcdir)/../../panel				\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
- 
- bin_PROGRAMS = bussign_applet
---- applets/cdplayer/Makefile.in.orig	Thu Dec 31 01:55:14 1998
-+++ applets/cdplayer/Makefile.in	Fri Jan  1 11:46:06 1999
-@@ -152,7 +152,7 @@
+--- applets/cdplayer/Makefile.in.orig	Wed Jan 13 11:03:09 1999
++++ applets/cdplayer/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(top_builddir)/panel \
  	-I$(srcdir)/../../panel				\
@@ -53,9 +31,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = cdplayer_applet
---- applets/charpick/Makefile.in.orig	Thu Dec 31 01:55:04 1998
-+++ applets/charpick/Makefile.in	Fri Jan  1 11:46:06 1999
-@@ -152,7 +152,7 @@
+--- applets/charpick/Makefile.in.orig	Wed Jan 13 11:02:21 1999
++++ applets/charpick/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(top_builddir)/panel \
  	-I$(srcdir)/../../panel				\
@@ -64,9 +42,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = charpick_applet
---- applets/clockmail/Makefile.in.orig	Thu Dec 31 01:55:01 1998
-+++ applets/clockmail/Makefile.in	Fri Jan  1 11:46:06 1999
-@@ -152,7 +152,7 @@
+--- applets/clockmail/Makefile.in.orig	Wed Jan 13 11:02:17 1999
++++ applets/clockmail/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -75,9 +53,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = clockmail_applet
---- applets/cpumemusage/Makefile.in.orig	Thu Dec 31 01:55:09 1998
-+++ applets/cpumemusage/Makefile.in	Fri Jan  1 11:46:06 1999
-@@ -152,7 +152,7 @@
+--- applets/cpumemusage/Makefile.in.orig	Wed Jan 13 11:03:02 1999
++++ applets/cpumemusage/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -86,9 +64,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)		\
  	-I$(LIBGTOP_INCS)
  
---- applets/dialer/Makefile.in.orig	Thu Dec 31 01:54:58 1998
-+++ applets/dialer/Makefile.in	Fri Jan  1 11:46:06 1999
-@@ -152,7 +152,7 @@
+--- applets/dialer/Makefile.in.orig	Wed Jan 13 11:02:12 1999
++++ applets/dialer/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -97,9 +75,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)		\
  	-DVERSION=\""$(VERSION)"\"
  
---- applets/diskusage/Makefile.in.orig	Thu Dec 31 01:55:09 1998
-+++ applets/diskusage/Makefile.in	Fri Jan  1 11:46:06 1999
-@@ -152,7 +152,7 @@
+--- applets/diskusage/Makefile.in.orig	Wed Jan 13 11:03:03 1999
++++ applets/diskusage/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -108,9 +86,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
  
  bin_PROGRAMS = diskusage_applet
---- applets/drivemount/Makefile.in.orig	Thu Dec 31 01:55:01 1998
-+++ applets/drivemount/Makefile.in	Fri Jan  1 11:46:06 1999
-@@ -152,7 +152,7 @@
+--- applets/drivemount/Makefile.in.orig	Wed Jan 13 11:02:16 1999
++++ applets/drivemount/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -119,9 +97,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = drivemount_applet
---- applets/esd-manager/Makefile.in.orig	Thu Dec 31 01:55:08 1998
-+++ applets/esd-manager/Makefile.in	Fri Jan  1 11:46:06 1999
-@@ -152,8 +152,8 @@
+--- applets/esd-manager/Makefile.in.orig	Wed Jan 13 11:03:01 1999
++++ applets/esd-manager/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -154,8 +154,8 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -132,9 +110,9 @@
  
  bin_PROGRAMS = esdmanager_applet
  
---- applets/fifteen/Makefile.in.orig	Thu Dec 31 01:55:02 1998
-+++ applets/fifteen/Makefile.in	Fri Jan  1 11:46:06 1999
-@@ -152,7 +152,7 @@
+--- applets/fifteen/Makefile.in.orig	Wed Jan 13 11:02:18 1999
++++ applets/fifteen/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -143,9 +121,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = fifteen_applet
---- applets/fish/Makefile.in.orig	Thu Dec 31 01:54:57 1998
-+++ applets/fish/Makefile.in	Fri Jan  1 11:46:06 1999
-@@ -152,7 +152,7 @@
+--- applets/fish/Makefile.in.orig	Wed Jan 13 11:02:11 1999
++++ applets/fish/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -154,9 +132,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  #if DO_EXE
---- applets/fvwm-pager/Makefile.in.orig	Thu Dec 31 01:55:17 1998
-+++ applets/fvwm-pager/Makefile.in	Fri Jan  1 11:46:06 1999
-@@ -156,7 +156,7 @@
+--- applets/fvwm-pager/Makefile.in.orig	Wed Jan 13 11:03:14 1999
++++ applets/fvwm-pager/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -158,7 +158,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../../panel			\
  	-I$(top_builddir)/panel \
@@ -165,9 +143,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = fvwm-pager
---- applets/gen_util/Makefile.in.orig	Thu Dec 31 01:54:55 1998
-+++ applets/gen_util/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -152,7 +152,7 @@
+--- applets/gen_util/Makefile.in.orig	Wed Jan 13 11:02:08 1999
++++ applets/gen_util/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel				\
@@ -176,9 +154,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = gen_util_applet
---- applets/gnome-pager/Makefile.in.orig	Thu Dec 31 01:55:04 1998
-+++ applets/gnome-pager/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -152,7 +152,7 @@
+--- applets/gnome-pager/Makefile.in.orig	Wed Jan 13 11:02:22 1999
++++ applets/gnome-pager/Makefile.in	Thu Jan 14 21:57:40 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -187,9 +165,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)		\
  	-DVERSION=\""$(VERSION)"\"
  
---- applets/gticker/Makefile.in.orig	Thu Dec 31 01:55:12 1998
-+++ applets/gticker/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -150,7 +150,7 @@
+--- applets/gticker/Makefile.in.orig	Wed Jan 13 11:03:07 1999
++++ applets/gticker/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -152,7 +152,7 @@
  
  INCLUDES = -I. -I$(srcdir) 				\
  	-I$(srcdir)/../../panel				\
@@ -198,9 +176,9 @@
  	-I$(top_builddir)/panel \
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
---- applets/icewm-pager/Makefile.in.orig	Thu Dec 31 01:55:00 1998
-+++ applets/icewm-pager/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -152,7 +152,7 @@
+--- applets/icewm-pager/Makefile.in.orig	Wed Jan 13 11:02:14 1999
++++ applets/icewm-pager/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -209,20 +187,20 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)		\
  	-DVERSION=\""$(VERSION)"\"
  
---- applets/mini-commander/Makefile.in.orig	Thu Dec 31 01:55:07 1998
-+++ applets/mini-commander/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -156,7 +156,7 @@
+--- applets/mini-commander/src/Makefile.in.orig	Thu Jan 14 22:01:53 1999
++++ applets/mini-commander/src/Makefile.in	Thu Jan 14 22:02:06 1999
+@@ -155,7 +155,7 @@
+ 	-I$(srcdir)					\
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
- 	-I$(top_builddir)/panel	\
- 	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel -I$(top_srcdir)/panel	\
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = mini_commander_applet
---- applets/mixer/Makefile.in.orig	Thu Dec 31 01:55:15 1998
-+++ applets/mixer/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -152,7 +152,7 @@
+--- applets/mixer/Makefile.in.orig	Wed Jan 13 11:03:10 1999
++++ applets/mixer/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -231,9 +209,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = mixer_applet
---- applets/modemlights/Makefile.in.orig	Thu Dec 31 01:55:15 1998
-+++ applets/modemlights/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -152,7 +152,7 @@
+--- applets/modemlights/Makefile.in.orig	Wed Jan 13 11:03:12 1999
++++ applets/modemlights/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -242,9 +220,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)		\
  	-DVERSION=\""$(VERSION)"\"
  
---- applets/multiload/Makefile.in.orig	Thu Dec 31 01:55:10 1998
-+++ applets/multiload/Makefile.in	Fri Jan  1 11:47:27 1999
-@@ -149,7 +149,7 @@
+--- applets/multiload/Makefile.in.orig	Wed Jan 13 11:03:04 1999
++++ applets/multiload/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -151,7 +151,7 @@
  l = @l@
  
  INCLUDES = -I. -I$(srcdir) 				\
@@ -253,9 +231,9 @@
  	-I$(top_builddir)/panel -I$(srcdir)/../../panel	\
  	-I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
  
---- applets/netload/Makefile.in.orig	Thu Dec 31 01:55:11 1998
-+++ applets/netload/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -152,7 +152,7 @@
+--- applets/netload/Makefile.in.orig	Wed Jan 13 11:03:06 1999
++++ applets/netload/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -264,9 +242,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)		\
  	$(LIBGTOP_INCS)
  
---- applets/slashapp/Makefile.in.orig	Thu Dec 31 01:55:13 1998
-+++ applets/slashapp/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -151,7 +151,7 @@
+--- applets/slashapp/Makefile.in.orig	Wed Jan 13 11:03:08 1999
++++ applets/slashapp/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -153,7 +153,7 @@
  INCLUDES = -I. -I$(srcdir) 				\
  	-I$(srcdir)/../../panel				\
  	-I$(top_builddir)/panel \
@@ -275,9 +253,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = slash_applet
---- applets/webcontrol/Makefile.in.orig	Thu Dec 31 01:54:59 1998
-+++ applets/webcontrol/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -152,7 +152,7 @@
+--- applets/webcontrol/Makefile.in.orig	Wed Jan 13 11:02:13 1999
++++ applets/webcontrol/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(top_builddir)/panel \
  	-I$(srcdir)/../../panel				\
@@ -286,9 +264,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = webcontrol_applet
---- applets/winlist/Makefile.in.orig	Thu Dec 31 01:55:16 1998
-+++ applets/winlist/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -152,7 +152,7 @@
+--- applets/winlist/Makefile.in.orig	Wed Jan 13 11:03:13 1999
++++ applets/winlist/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -154,7 +154,7 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(top_builddir)/panel \
  	-I$(srcdir)/../../panel				\
@@ -297,9 +275,9 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = winlist_applet
---- gmenu/Makefile.in.orig	Thu Dec 31 01:54:52 1998
-+++ gmenu/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -149,7 +149,7 @@
+--- gmenu/Makefile.in.orig	Wed Jan 13 11:02:03 1999
++++ gmenu/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -151,7 +151,7 @@
  l = @l@
  
  INCLUDES = 			\
@@ -308,9 +286,9 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
---- gnome-terminal/Makefile.in.orig	Thu Dec 31 01:54:50 1998
-+++ gnome-terminal/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -153,7 +153,7 @@
+--- gnome-terminal/Makefile.in.orig	Wed Jan 13 11:02:01 1999
++++ gnome-terminal/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -155,7 +155,7 @@
  	-I$(top_srcdir)/intl	\
  	-I$(top_builddir)/intl	\
  	$(GNOME_INCLUDEDIR)	\
@@ -319,9 +297,9 @@
  
  LDADD = \
  	$(GNOME_LIBDIR)					\
---- gsm/Makefile.in.orig	Thu Dec 31 01:54:44 1998
-+++ gsm/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -150,7 +150,7 @@
+--- gsm/Makefile.in.orig	Wed Jan 13 11:01:45 1999
++++ gsm/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -152,7 +152,7 @@
  
  INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
@@ -330,9 +308,9 @@
  	-DDEFAULTDIR="\"$(datadir)\""
  
  LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
---- help-browser/Makefile.in.orig	Thu Dec 31 01:54:48 1998
-+++ help-browser/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -154,8 +154,8 @@
+--- help-browser/Makefile.in.orig	Wed Jan 13 11:01:51 1999
++++ help-browser/Makefile.in	Thu Jan 14 22:05:11 1999
+@@ -156,8 +156,8 @@
  	-I$(includedir)						\
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl		\
  	$(GNOME_INCLUDEDIR)					\
@@ -343,18 +321,42 @@
  	-DVERSION=\""$(VERSION)"\"
  
  LDADD = \
-@@ -215,7 +215,7 @@
- 	     toc.h toc-man.h toc-ghelp.h toc-info.h \
- 	     $(PIXMAPS) gnome-help.desktop help-browser.gnorba
+--- help-browser/help/C/Makefile.in.orig	Fri Jan 15 00:13:50 1999
++++ help-browser/help/C/Makefile.in	Fri Jan 15 00:14:00 1999
+@@ -154,7 +154,7 @@
+ 	     gnome-help-browser-topic.dat \
+ 	     default-page.html gnome-logo-large.png sample-help.html sample-topic.dat
  
 -help_browser_helpdir = $(datadir)/gnome/help/help-browser/C
 +help_browser_helpdir = $(datadir)/help/help-browser/C
- 
- sysdir = $(datadir)/apps
- sys_DATA = gnome-help.desktop
---- panel/Makefile.in.orig	Thu Dec 31 01:54:53 1998
-+++ panel/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -158,7 +158,7 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- help-browser/help/es/Makefile.in.orig	Fri Jan 15 00:14:07 1999
++++ help-browser/help/es/Makefile.in	Fri Jan 15 00:14:16 1999
+@@ -154,7 +154,7 @@
+ 	     gnome-help-browser-topic.dat \
+ 	     default-page.html 
+ 
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/es
++help_browser_helpdir = $(datadir)/help/help-browser/es
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- help-browser/help/fr/Makefile.in.orig	Fri Jan 15 00:14:20 1999
++++ help-browser/help/fr/Makefile.in	Fri Jan 15 00:14:32 1999
+@@ -154,7 +154,7 @@
+ 	     gnome-help-browser-topic.dat \
+ 	     default-page.html 
+ 
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/fr
++help_browser_helpdir = $(datadir)/help/help-browser/fr
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- panel/Makefile.in.orig	Wed Jan 13 11:02:05 1999
++++ panel/Makefile.in	Thu Jan 14 22:06:15 1999
+@@ -160,7 +160,7 @@
  	-I$(top_srcdir)/intl \
  	-I$(top_builddir)/intl \
  	-I$(top_builddir)/panel \
@@ -363,16 +365,16 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS)
  
  bin_PROGRAMS = panel
-@@ -180,7 +180,7 @@
+@@ -182,7 +182,7 @@
  	gnome-panel.h		\
  	panel-types.h
  
 -libpanel_applet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libpanel_applet_la_LDFLAGS = -version-info 0:99:0 -rpath $(libdir)
++libpanel_applet_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
  libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
  
  BUILT_SOURCES = $(CORBA_SRCLIST)
-@@ -245,7 +245,7 @@
+@@ -247,7 +247,7 @@
  	panel.gnorba		\
  	panel.soundlist
  
@@ -381,9 +383,9 @@
  confexec_DATA = appletsConf.sh
  
  panelgnorbadir  = $(sysconfdir)/CORBA/servers
---- smproxy/Makefile.in.orig	Thu Dec 31 01:54:45 1998
-+++ smproxy/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -149,7 +149,7 @@
+--- smproxy/Makefile.in.orig	Wed Jan 13 11:01:47 1999
++++ smproxy/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -151,7 +151,7 @@
  l = @l@
  
  INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \
@@ -392,9 +394,9 @@
  
  LDADD = -lXt -lXmu $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
  
---- core-docs/Makefile.in.orig	Thu Dec 31 01:54:51 1998
-+++ core-docs/Makefile.in	Fri Jan  1 11:46:07 1999
-@@ -156,7 +156,7 @@
+--- core-docs/Makefile.in.orig	Wed Jan 13 11:02:02 1999
++++ core-docs/Makefile.in	Thu Jan 14 21:57:41 1999
+@@ -158,7 +158,7 @@
  YACC = @YACC@
  l = @l@
  
@@ -403,8 +405,8 @@
  
  GNOME_INTRO_HTML_FILES = \
  	gnome-intro/c93191.html \
---- po/Makefile.in.in.orig	Thu Dec 31 00:59:06 1998
-+++ po/Makefile.in.in	Fri Jan  1 11:46:07 1999
+--- po/Makefile.in.in.orig	Wed Jan 13 10:18:21 1999
++++ po/Makefile.in.in	Thu Jan 14 21:57:41 1999
 @@ -18,7 +18,7 @@
  
  prefix = @prefix@
@@ -414,3 +416,23 @@
  localedir = $(datadir)/locale
  gnulocaledir = $(prefix)/share/locale
  gettextsrcdir = $(prefix)/share/gettext/po
+--- applets/mini-commander/docs/Makefile.in.orig	Thu Jan 14 22:40:44 1999
++++ applets/mini-commander/docs/Makefile.in	Thu Jan 14 22:42:30 1999
+@@ -150,7 +150,7 @@
+ YACC = @YACC@
+ l = @l@
+ 
+-docdir = $(datadir)/gnome/help/mini-commander/C
++docdir = $(datadir)/help/mini-commander/C
+ 
+ # .html files which are generated by db2html;  precompiled .html files 
+ # are included, so people without db2html (the DocBook to HTML converter) 
+@@ -183,7 +183,7 @@
+ 
+ TAR = tar
+ GZIP = --best
+-all: Makefile $(DATA)
++all: Makefile
+ 
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
diff --git a/x11/gnomecore/pkg-plist b/x11/gnomecore/pkg-plist
index 7cccf7c14f7..3bd16a5f0d3 100644
--- a/x11/gnomecore/pkg-plist
+++ b/x11/gnomecore/pkg-plist
@@ -1,13 +1,12 @@
 bin/asclock_applet
-bin/batmon_applet
 bin/battery_applet
-bin/bussign_applet
 bin/charpick_applet
 bin/clockmail_applet
 bin/cpumemusage_applet
 bin/dialer_applet
 bin/diskusage_applet
 bin/drivemount_applet
+bin/esdmanager_applet
 bin/fifteen_applet
 bin/gen_util_applet
 bin/gmenu
@@ -31,7 +30,6 @@ bin/slash_applet
 bin/webcontrol_applet
 bin/wmpager_applet
 etc/CORBA/servers/asclock_applet.gnorba
-etc/CORBA/servers/batmon_applet.gnorba
 etc/CORBA/servers/battery_applet.gnorba
 etc/CORBA/servers/charpick_applet.gnorba
 etc/CORBA/servers/clockmail_applet.gnorba
@@ -39,6 +37,7 @@ 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/esdmanager_applet.gnorba
 etc/CORBA/servers/fifteen_applet.gnorba
 etc/CORBA/servers/fish_applet.gnorba
 etc/CORBA/servers/gen_util.gnorba
@@ -49,6 +48,7 @@ etc/CORBA/servers/mixer_applet.gnorba
 etc/CORBA/servers/modemlights_applet.gnorba
 etc/CORBA/servers/multiload_applet.gnorba
 etc/CORBA/servers/panel.gnorba
+etc/CORBA/servers/slash_applet.gnorba
 etc/CORBA/servers/wmpager_applet.gnorba
 etc/sound/events/panel.soundlist
 include/applet-widget.h
@@ -61,18 +61,16 @@ lib/libfish_applet.so.0
 lib/libpanel_applet.a
 lib/libpanel_applet.la
 lib/libpanel_applet.so
-lib/libpanel_applet.so.0.99
+lib/libpanel_applet.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/appletsConf.sh
 share/gnome/applets/Amusements/.directory
-share/gnome/applets/Amusements/bussign_applet.desktop
 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/batmon_applet.desktop
 share/gnome/applets/Monitors/battery_applet.desktop
 share/gnome/applets/Monitors/cpuload_applet.desktop
 share/gnome/applets/Monitors/cpumemusage_applet.desktop
@@ -92,6 +90,7 @@ 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/esdmanager_applet.desktop
 share/gnome/applets/Utility/gnomepager_applet.desktop
 share/gnome/applets/Utility/mini-commander_applet.desktop
 share/gnome/applets/Utility/printer.desktop
@@ -170,17 +169,40 @@ share/gnome/help/gnome-intro/C/pix/panel-menu.gif
 share/gnome/help/gnome-intro/C/pix/same-gnome.gif
 share/gnome/help/gnome-intro/C/pix/terminal.gif
 share/gnome/help/gnome-intro/C/topic.dat
-share/gnome/help/help-browser/C/bg.png
 share/gnome/help/help-browser/C/default-page.html
-share/gnome/help/help-browser/C/gnome-logo2.png
+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/index.html
 share/gnome/help/help-browser/C/topic.dat
+share/gnome/help/help-browser/es/default-page.html
+share/gnome/help/help-browser/es/help-browser.html
+share/gnome/help/help-browser/es/index.html
+share/gnome/help/help-browser/es/topic.dat
+share/gnome/help/help-browser/fr/default-page.html
+share/gnome/help/help-browser/fr/index.html
+share/gnome/help/help-browser/fr/topic.dat
+share/gnome/help/mini-commander/C/change-log.html
+share/gnome/help/mini-commander/C/clock.html
+share/gnome/help/mini-commander/C/command-completion.html
+share/gnome/help/mini-commander/C/command-history.html
+share/gnome/help/mini-commander/C/customization.html
+share/gnome/help/mini-commander/C/docbook.css
+share/gnome/help/mini-commander/C/download.html
+share/gnome/help/mini-commander/C/faq.html
+share/gnome/help/mini-commander/C/features.html
+share/gnome/help/mini-commander/C/feedback.html
+share/gnome/help/mini-commander/C/gpl2.html
+share/gnome/help/mini-commander/C/history.html
+share/gnome/help/mini-commander/C/index.html
+share/gnome/help/mini-commander/C/introduction.html
+share/gnome/help/mini-commander/C/legal-notice.html
+share/gnome/help/mini-commander/C/macros.html
+share/gnome/help/mini-commander/C/screenshot01.gif
+share/gnome/help/mini-commander/C/screenshots.html
+share/gnome/help/mini-commander/C/todo.html
 share/gnome/idl/gnome-panel.idl
 share/gnome/idl/help-browser.idl
 share/gnome/panelrc
-share/gnome/pixmaps/batmon-ac.png
-share/gnome/pixmaps/batmon-bat.png
 share/gnome/pixmaps/emacs.png
 share/gnome/pixmaps/fish/fishanim.png
 share/gnome/pixmaps/fish/oldwanda.png
@@ -230,7 +252,7 @@ share/gnome/pixmaps/gnome-term.png
 share/gnome/pixmaps/gnome-tigert.png
 share/gnome/pixmaps/gnome-unknown.png
 share/gnome/pixmaps/gnome-word.png
-share/gnome/pixmaps/kterm.png
+share/gnome/pixmaps/kterm.xpm
 share/gnome/pixmaps/launcher-program.png
 share/gnome/pixmaps/mailcheck/email-e.png
 share/gnome/pixmaps/mailcheck/email.png
@@ -245,6 +267,8 @@ share/gnome/pixmaps/panel-drawer.png
 share/gnome/pixmaps/panel-folder.png
 share/gnome/pixmaps/panel-knob.png
 share/gnome/pixmaps/panel-menu-main.png
+share/gnome/pixmaps/tiles/tile-blue-down.png
+share/gnome/pixmaps/tiles/tile-blue-up.png
 share/gnome/pixmaps/tiles/tile-coral-down.png
 share/gnome/pixmaps/tiles/tile-coral-up.png
 share/gnome/pixmaps/tiles/tile-drc-1-down.png
@@ -280,6 +304,7 @@ share/locale/hu/LC_MESSAGES/gnome-core.mo
 share/locale/it/LC_MESSAGES/gnome-core.mo
 share/locale/ja/LC_MESSAGES/gnome-core.mo
 share/locale/ko/LC_MESSAGES/gnome-core.mo
+share/locale/nl/LC_MESSAGES/gnome-core.mo
 share/locale/no/LC_MESSAGES/gnome-core.mo
 share/locale/pl/LC_MESSAGES/gnome-core.mo
 share/locale/pt/LC_MESSAGES/gnome-core.mo
@@ -307,7 +332,11 @@ share/locale/sv/LC_MESSAGES/gnome-core.mo
 @dirrm share/gnome/help/gnome-intro/C
 @dirrm share/gnome/help/gnome-intro
 @dirrm share/gnome/help/help-browser/C
+@dirrm share/gnome/help/help-browser/es
+@dirrm share/gnome/help/help-browser/fr
 @dirrm share/gnome/help/help-browser
+@dirrm share/gnome/help/mini-commander/C
+@dirrm share/gnome/help/mini-commander
 @dirrm share/gnome/help
 @dirrm share/gnome/pixmaps/mailcheck
 @dirrm share/gnome/pixmaps/fish