Upgrade to 0.99.1.

4 files changed, 254 insertions, 566 deletions

diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa
index 8abff8c..b1b3414 100644
--- a/x11/gnomecore/files/patch-aa
+++ b/x11/gnomecore/files/patch-aa
@@ -1,28 +1,21 @@
---- configure.orig	Thu Sep 24 08:04:55 1998
-+++ configure	Thu Oct 15 04:06:29 1998
-@@ -942,12 +942,12 @@
- 
- 
- 	if test "$no_gnome_config" = "yes"; then
--          echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:947: 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:947: 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 $gnome_prefix/gnomeConf.sh"
--	    . $gnome_prefix/gnomeConf.sh
-+	    echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
-+	    . $prefix/share/gnome/gnomeConf.sh
- 	    
- 	  else
- 	    echo "$ac_t""not found" 1>&6
-@@ -5110,6 +5110,7 @@
- case "$host" in
- *linux*) CDROM_HOST=linux;;
- *solaris*) CDROM_HOST=solaris;;
-+*freebsd*) CDROM_HOST=freebsd;;
- esac
- 
- 
+--- configure.orig	Thu Dec 31 00:59:18 1998
++++ configure	Fri Jan  1 11:32:51 1999
+@@ -1098,13 +1098,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
+-	      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
++	      if test -f $prefix/share/gnome/gnomeConf.sh; then
+ 	        echo "$ac_t""found" 1>&6
+ 	        echo "loading gnome configuration from" \
+-		     "$gnome_prefix/gnomeConf.sh"
+-	        . $gnome_prefix/gnomeConf.sh
++		     "$prefix/share/gnome/gnomeConf.sh"
++	        . $prefix/share/gnome/gnomeConf.sh
+ 	        
+ 	      else
+ 	        echo "$ac_t""not found" 1>&6
diff --git a/x11/gnomecore/files/patch-ab b/x11/gnomecore/files/patch-ab
index 918446e..e653f9d 100644
--- a/x11/gnomecore/files/patch-ab
+++ b/x11/gnomecore/files/patch-ab
@@ -1,18 +1,18 @@
---- help-browser/gnome-info2html/utils.c.orig	Fri Jul 24 03:13:02 1998
-+++ help-browser/gnome-info2html/utils.c	Sat Sep 26 23:42:30 1998
-@@ -2,7 +2,7 @@
- 
+--- help-browser/gnome-info2html/utils.c.orig	Tue Dec 29 05:18:57 1998
++++ help-browser/gnome-info2html/utils.c	Tue Dec 29 05:19:04 1998
+@@ -3,7 +3,7 @@
  #include <stdio.h>
  #include <string.h>
+ #include <sys/types.h>
 -#include <regex.h>
 +#include <gnuregex.h>
  
  #include <glib.h>
  
---- help-browser/gnome-help-browser.c.orig	Fri Jul 24 03:13:01 1998
-+++ help-browser/gnome-help-browser.c	Sat Sep 26 23:42:30 1998
-@@ -65,13 +65,10 @@
- static int configCancel(GtkWidget *w, GtkWidget *window);
+--- help-browser/gnome-help-browser.c.orig	Tue Dec 29 05:19:41 1998
++++ help-browser/gnome-help-browser.c	Tue Dec 29 05:20:50 1998
+@@ -72,13 +72,10 @@
+ void destroy_server(HelpWindow win);
  
  /* MANPATH should probably come from somewhere */
 -#define DEFAULT_MANPATH "/usr/man:/usr/local/man:/usr/X11R6/man"
@@ -28,8 +28,8 @@
  #define DEFAULT_MEMCACHESIZE "1000000"
  #define DEFAULT_HISTORYLENGTH "1000"
  #define HELP_BROWSER_RC_DIR ".gnome-help-browser"
---- help-browser/toc.c.orig	Mon Aug 31 19:31:33 1998
-+++ help-browser/toc.c	Sat Sep 26 23:42:30 1998
+--- help-browser/toc.c.orig	Tue Dec 29 05:20:55 1998
++++ help-browser/toc.c	Tue Dec 29 05:21:48 1998
 @@ -19,14 +19,13 @@
  static int hideTocInt(GtkWidget *window);
  
@@ -46,7 +46,7 @@
 +    { "/usr/share/info",             TOC_INFO_TYPE  },
 +    { "/usr/local/info",             TOC_INFO_TYPE  },
 +    { "/usr/X11R6/info",             TOC_INFO_TYPE  },
-+    { "/usr/X11R6/share/gnome/help",       TOC_GHELP_TYPE },
++    { "/usr/X11R6/share/gnome/help",             TOC_GHELP_TYPE },
      { NULL, 0 }
  };
  
diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae
index c459b7c..923268b 100644
--- a/x11/gnomecore/files/patch-ae
+++ b/x11/gnomecore/files/patch-ae
@@ -1,259 +1,305 @@
---- applets/asclock/Makefile.in.orig	Sat Sep 26 23:49:56 1998
-+++ applets/asclock/Makefile.in	Sat Sep 26 23:50:23 1998
-@@ -145,7 +145,7 @@
- 
- INCLUDES = -I. -I$(srcdir) 				\
+--- 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 @@
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel				\
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)		\
+ 	-DVERSION=\""$(VERSION)"\"
  
- bin_PROGRAMS = asclock_applet
---- applets/batmon/Makefile.in.orig	Thu Sep 24 09:00:17 1998
-+++ applets/batmon/Makefile.in	Sat Sep 26 23:48:33 1998
-@@ -148,7 +148,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
- 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+--- applets/batmon/Makefile.in.orig	Thu Dec 31 01:54:56 1998
++++ applets/batmon/Makefile.in	Fri Jan  1 11:46:06 1999
+@@ -155,7 +155,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 = batmon_applet
---- applets/battery/Makefile.in.orig	Thu Sep 24 09:00:37 1998
-+++ applets/battery/Makefile.in	Sat Sep 26 23:48:33 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
- 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+--- 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 Sep 24 09:00:56 1998
-+++ applets/bussign/Makefile.in	Sat Sep 26 23:48:33 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+--- 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 Sep 24 09:00:47 1998
-+++ applets/cdplayer/Makefile.in	Sat Sep 26 23:48:33 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+--- 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 @@
  	-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 = cdplayer_applet
---- applets/charpick/Makefile.in.orig	Sat Sep 26 23:50:49 1998
-+++ applets/charpick/Makefile.in	Sat Sep 26 23:51:05 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+--- 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 @@
  	-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 = charpick_applet
---- applets/clockmail/Makefile.in.orig	Thu Sep 24 09:00:33 1998
-+++ applets/clockmail/Makefile.in	Sat Sep 26 23:48:33 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+--- 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 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = clockmail_applet
---- applets/cpuload/Makefile.in.orig	Thu Sep 24 09:00:40 1998
-+++ applets/cpuload/Makefile.in	Sat Sep 26 23:51:47 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+--- 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 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
  	-I$(includedir) $(GNOME_INCLUDEDIR)		\
  	-I$(LIBGTOP_INCS)
  
---- applets/cpumemusage/Makefile.in.orig	Thu Sep 24 09:00:41 1998
-+++ applets/cpumemusage/Makefile.in	Sat Sep 26 23:52:15 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+--- 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 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
  	-I$(includedir) $(GNOME_INCLUDEDIR)		\
- 	-I$(LIBGTOP_INCS)
+ 	-DVERSION=\""$(VERSION)"\"
  
---- applets/dialer/Makefile.in.orig	Thu Sep 24 09:00:26 1998
-+++ applets/dialer/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+--- 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 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 	-I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
  
- bin_PROGRAMS = dialer_applet
---- applets/diskusage/Makefile.in.orig	Thu Sep 24 09:00:43 1998
-+++ applets/diskusage/Makefile.in	Sat Sep 26 23:52:41 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+ 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 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
  
- bin_PROGRAMS = diskusage_applet
---- applets/drivemount/Makefile.in.orig	Thu Sep 24 09:00:32 1998
-+++ applets/drivemount/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+ 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 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+-	-I$(includedir) $(GNOME_INCLUDEDIR) $(shell esd-config --cflags)
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
++	-I$(includedir) $(GNOME_INCLUDEDIR) `esd-config --cflags`
  
- bin_PROGRAMS = drivemount_applet
---- applets/fifteen/Makefile.in.orig	Thu Sep 24 09:00:35 1998
-+++ applets/fifteen/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+ 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 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = fifteen_applet
---- applets/fish/Makefile.in.orig	Thu Sep 24 09:00:22 1998
-+++ applets/fish/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+--- 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 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
- bin_PROGRAMS = fish_applet
---- applets/gen_util/Makefile.in.orig	Thu Sep 24 09:00:15 1998
-+++ applets/gen_util/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+ #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 @@
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../../panel			\
+ 	-I$(top_builddir)/panel \
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-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 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel				\
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = gen_util_applet
---- applets/icewm-pager/Makefile.in.orig	Thu Sep 24 09:00:30 1998
-+++ applets/icewm-pager/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -146,7 +146,7 @@
+--- 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 @@
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-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 @@
+ 
  INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-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 @@
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-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 @@
  	-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 = wmpager_applet
---- applets/mixer/Makefile.in.orig	Thu Sep 24 09:00:50 1998
-+++ applets/mixer/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+ 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 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = mixer_applet
---- applets/modemlights/Makefile.in.orig	Thu Sep 24 09:00:52 1998
-+++ applets/modemlights/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+--- 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 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)		\
+ 	-DVERSION=\""$(VERSION)"\"
  
- bin_PROGRAMS = modemlights_applet
---- applets/multiload/Makefile.in.orig	Sat Sep 26 23:53:03 1998
-+++ applets/multiload/Makefile.in	Sat Sep 26 23:53:17 1998
-@@ -144,7 +144,7 @@
+--- 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 @@
  l = @l@
  
  INCLUDES = -I. -I$(srcdir) 				\
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
-        -I$(srcdir)/../../panel                         \
+ 	-I$(top_builddir)/panel -I$(srcdir)/../../panel	\
  	-I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
  
---- applets/netload/Makefile.in.orig	Thu Sep 24 09:00:25 1998
-+++ applets/netload/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+--- 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 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)		\
+ 	$(LIBGTOP_INCS)
  
- bin_PROGRAMS = netload_applet
---- applets/webcontrol/Makefile.in.orig	Thu Sep 24 09:00:28 1998
-+++ applets/webcontrol/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -146,7 +146,7 @@
+--- 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 @@
  INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(srcdir)/../../panel				\
+ 	-I$(top_builddir)/panel \
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-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 @@
  	-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 = webcontrol_applet
---- applets/winlist/Makefile.in.orig	Thu Sep 24 09:00:54 1998
-+++ applets/winlist/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
+--- 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 @@
  	-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 = winlist_applet
---- desktop-properties/Makefile.in.orig	Thu Sep 24 08:59:56 1998
-+++ desktop-properties/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -144,7 +144,7 @@
- l = @l@
- 
- INCLUDES = 			\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
- 	-I$(includedir) $(X_CFLAGS) $(GNOME_INCLUDEDIR)
- 
---- gmenu/Makefile.in.orig	Thu Sep 24 09:00:07 1998
-+++ gmenu/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -144,7 +144,7 @@
+--- 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 @@
  l = @l@
  
  INCLUDES = 			\
@@ -262,9 +308,9 @@
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
---- gnome-terminal/Makefile.in.orig	Thu Sep 24 09:00:03 1998
-+++ gnome-terminal/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -148,7 +148,7 @@
+--- 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 @@
  	-I$(top_srcdir)/intl	\
  	-I$(top_builddir)/intl	\
  	$(GNOME_INCLUDEDIR)	\
@@ -273,9 +319,9 @@
  
  LDADD = \
  	$(GNOME_LIBDIR)					\
---- gsm/Makefile.in.orig	Thu Sep 24 08:59:50 1998
-+++ gsm/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -145,7 +145,7 @@
+--- 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 @@
  
  INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \
  	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
@@ -284,38 +330,60 @@
  	-DDEFAULTDIR="\"$(datadir)\""
  
  LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
---- panel/Makefile.in.orig	Thu Sep 24 09:00:09 1998
-+++ panel/Makefile.in	Sun Sep 27 00:00:12 1998
-@@ -151,7 +151,7 @@
+--- 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 @@
+ 	-I$(includedir)						\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		\
+ 	$(GNOME_INCLUDEDIR)					\
+-	-DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" 	\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale\""	\
++	-DGNOMEHELPPATH=\""$(datadir)/help\"" 	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale\""	\
+ 	-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_helpdir = $(datadir)/gnome/help/help-browser/C
++help_browser_helpdir = $(datadir)/help/help-browser/C
  
- INCLUDES = -I. -I$(srcdir) \
- 	-I$(top_srcdir)/intl -I$(top_builddir)/intl \
+ 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 @@
+ 	-I$(top_srcdir)/intl \
+ 	-I$(top_builddir)/intl \
+ 	-I$(top_builddir)/panel \
 -	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 +	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
  	-I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS)
  
  bin_PROGRAMS = panel
-@@ -178,7 +178,7 @@
- 	applet-widget.h		\
+@@ -180,7 +180,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:30:0 -rpath $(libdir)
++libpanel_applet_la_LDFLAGS = -version-info 0:99:0 -rpath $(libdir)
  libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
  
  BUILT_SOURCES = $(CORBA_SRCLIST)
-@@ -244,7 +244,7 @@
- 	panel.in		\
- 	appletsConf.sh.in
+@@ -245,7 +245,7 @@
+ 	panel.gnorba		\
+ 	panel.soundlist
  
 -confexecdir = $(libdir)
 +confexecdir = $(datadir)
  confexec_DATA = appletsConf.sh
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
---- smproxy/Makefile.in.orig	Thu Sep 24 08:59:51 1998
-+++ smproxy/Makefile.in	Sun Sep 27 00:01:00 1998
-@@ -144,7 +144,7 @@
+ 
+ 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 @@
  l = @l@
  
  INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \
@@ -324,9 +392,9 @@
  
  LDADD = -lXt -lXmu $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
  
---- core-docs/Makefile.in.orig	Thu Sep 24 09:00:04 1998
-+++ core-docs/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -151,7 +151,7 @@
+--- 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 @@
  YACC = @YACC@
  l = @l@
  
@@ -335,87 +403,14 @@
  
  GNOME_INTRO_HTML_FILES = \
  	gnome-intro/c93191.html \
---- help-browser/Makefile.in.orig	Thu Sep 24 08:59:59 1998
-+++ help-browser/Makefile.in	Sat Sep 26 23:48:34 1998
-@@ -149,8 +149,8 @@
- 	-I$(includedir)						\
- 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		\
- 	$(GNOME_INCLUDEDIR)					\
--	-DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" 	\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale\""
-+	-DGNOMEHELPPATH=\""$(datadir)/help\"" 	\
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale\""
- 
- LDADD = \
- 	$(GNOME_LIBDIR)					\
-@@ -184,7 +184,7 @@
- 	     toc.h toc-man.h toc-ghelp.h toc-info.h \
- 	     $(PIXMAPS) gnome-help.desktop
- 
--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
---- capplets/keyboard-properties/Makefile.in.orig	Sun Sep 27 00:07:30 1998
-+++ capplets/keyboard-properties/Makefile.in	Sun Sep 27 00:07:41 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
- 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
- 	-I$(srcdir)/../../control-center		\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
- 
- bin_PROGRAMS = keyboard-properties
---- capplets/mouse-properties/Makefile.in.orig	Sun Sep 27 00:07:13 1998
-+++ capplets/mouse-properties/Makefile.in	Sun Sep 27 00:07:24 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
- 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
- 	-I$(srcdir)/../../control-center		\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
- 
- bin_PROGRAMS = mouse-properties
---- capplets/screensaver-properties/Makefile.in.orig	Sun Sep 27 00:07:49 1998
-+++ capplets/screensaver-properties/Makefile.in	Sun Sep 27 00:08:00 1998
-@@ -146,7 +146,7 @@
- INCLUDES = -I. -I$(srcdir) 				\
- 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
- 	-I$(srcdir)/../../control-center		\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
- 
- bin_PROGRAMS = screensaver-properties-capplet
---- control-center/Makefile.in.orig	Thu Sep 24 09:00:58 1998
-+++ control-center/Makefile.in	Sun Sep 27 03:15:36 1998
-@@ -144,7 +144,7 @@
- l = @l@
- 
- INCLUDES = 			\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
- 
-@@ -177,7 +177,7 @@
- sysdir = $(datadir)/apps/System
- sys_DATA = gnomecc.desktop
- 
--confexecdir = $(libdir)
-+confexecdir = $(datadir)
- confexec_DATA = cappletConf.sh
- 
- libcapplet_la_SOURCES = \
-@@ -186,7 +186,7 @@
- 	capplet-widget-libs.h	\
- 	$(CORBA_SRCLIST)
- 
--libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libcapplet_la_LDFLAGS = -version-info 0:30:0 -rpath $(libdir)
- libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
- 
- include_HEADERS = capplet-widget.h
+--- po/Makefile.in.in.orig	Thu Dec 31 00:59:06 1998
++++ po/Makefile.in.in	Fri Jan  1 11:46:07 1999
+@@ -18,7 +18,7 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-datadir = $(prefix)/@DATADIRNAME@
++datadir = $(prefix)/share
+ localedir = $(datadir)/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
diff --git a/x11/gnomecore/files/patch-ah b/x11/gnomecore/files/patch-ah
deleted file mode 100644
index f869794..0000000
--- a/x11/gnomecore/files/patch-ah
+++ /dev/null
@@ -1,300 +0,0 @@
---- applets/cdplayer/cdrom-freebsd.c.orig	Thu Oct 15 04:04:38 1998
-+++ applets/cdplayer/cdrom-freebsd.c	Thu Oct 15 04:18:21 1998
-@@ -0,0 +1,297 @@
-+#include <stdlib.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <glib.h>
-+
-+#include <sys/types.h>
-+#include <sys/cdio.h>
-+#include "cdrom-interface.h"
-+
-+
-+#define ASSIGN_MSF(dest, src) \
-+{ \
-+  (dest).minute = (src).minute; \
-+  (dest).second = (src).second; \
-+  (dest).frame = (src).frame; \
-+}
-+
-+int
-+cdrom_play(cdrom_device_t cdp, int start, int stop)
-+{
-+	struct ioc_play_track ti;
-+
-+	ti.start_track = start;
-+	ti.start_index = 1;
-+	ti.end_track = stop;
-+	ti.end_index = 1;
-+	if(ioctl(cdp->device, CDIOCPLAYTRACKS, &ti) == -1) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_play_msf(cdrom_device_t cdp, cdrom_msf_t * start)
-+{
-+	struct ioc_play_msf msf;
-+
-+	if (cdrom_read_track_info(cdp) == DISC_IO_ERROR)
-+		return DISC_IO_ERROR;
-+	msf.start_m = start->minute;
-+	msf.start_s = start->second;
-+	msf.start_f = start->frame;
-+
-+	msf.end_m = cdp->track_info[cdp->nr_track].address.minute;
-+	msf.end_s = cdp->track_info[cdp->nr_track].address.second;
-+	msf.end_f = cdp->track_info[cdp->nr_track].address.frame;
-+
-+	if (ioctl(cdp->device, CDIOCPLAYMSF, &msf) == -1) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_pause(cdrom_device_t cdp)
-+{
-+	if (ioctl(cdp->device, CDIOCPAUSE, 0) == -1) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_resume(cdrom_device_t cdp)
-+{
-+	if (ioctl(cdp->device, CDIOCRESUME, 0) == -1) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_stop(cdrom_device_t cdp)
-+{
-+	if (ioctl(cdp->device, CDIOCSTOP, 0) == -1) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_read_track_info(cdrom_device_t cdp)
-+{
-+	struct ioc_toc_header hdr;
-+	struct ioc_read_toc_entry toc;
-+	struct cd_toc_entry tocentry;
-+
-+	int i, j, nr_track;
-+
-+	if (ioctl(cdp->device, CDIOREADTOCHEADER, &hdr) == -1) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	cdp->track0 = hdr.starting_track;
-+	cdp->track1 = hdr.ending_track;
-+	nr_track = hdr.ending_track - hdr.starting_track + 1;
-+	if (nr_track <= 0)
-+		return DISC_IO_ERROR;
-+
-+	if(nr_track != cdp->nr_track) {
-+		if (cdp->track_info)
-+			g_free(cdp->track_info);
-+		cdp->nr_track = nr_track;
-+		cdp->track_info = g_malloc((cdp->nr_track + 1) * sizeof(track_info_t));
-+	}
-+	for (i = 0, j = cdp->track0; i < cdp->nr_track; i++, j++) {
-+		toc.starting_track = j;
-+		toc.address_format = CD_MSF_FORMAT;
-+
-+		if (ioctl(cdp->device, CDIOREADTOCENTRY, &toc) == -1) {
-+			cdp->my_errno = errno;
-+			return DISC_IO_ERROR;
-+		}
-+		cdp->track_info[i].track = j;
-+		cdp->track_info[i].audio_track = tocentry.control !=
-+			0 ? 1 : 0;
-+		ASSIGN_MSF(cdp->track_info[i].address, tocentry.addr.msf);
-+	}
-+
-+#if 0
-+#define	LEADOUT = 0xaa
-+	toc.starting_track = LEADOUT;
-+	toc.address_format = CD_MSF_FORMAT;
-+	if (ioctl(cdp->device, CDROMREADTOENTRY, &toc) == -1) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+#endif
-+	cdp->track_info[i].track = j;
-+	cdp->track_info[i].audio_track = 0;
-+	ASSIGN_MSF(cdp->track_info[i].address, tocentry.addr.msf);
-+
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_get_status(cdrom_device_t cdp, cdrom_device_status_t * stat)
-+{
-+	struct ioc_read_subchannel sc;
-+	struct cd_sub_channel_info scd;
-+
-+	sc.address_format = CD_MSF_FORMAT;
-+	if (ioctl(cdp->device, CDIOCREADSUBCHANNEL, &sc) == -1) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	switch (scd.header.audio_status) {
-+		case CD_AS_PLAY_IN_PROGRESS:
-+			stat->audio_status = DISC_PLAY;
-+			break;
-+		case CD_AS_PLAY_PAUSED:
-+			stat->audio_status = DISC_PAUSED;
-+			break;
-+		case CD_AS_PLAY_COMPLETED:
-+			stat->audio_status = DISC_COMPLETED;
-+			break;
-+		case CD_AS_AUDIO_INVALID:
-+		case CD_AS_PLAY_ERROR:
-+		case CD_AS_NO_STATUS:
-+			stat->audio_status = DISC_STOP;
-+			break;
-+		default:
-+			stat->audio_status = DISC_ERROR;
-+	}
-+	stat->track = scd.what.position.track_number;
-+	ASSIGN_MSF(stat->relative_address, scd.what.position.reladdr.msf);
-+	ASSIGN_MSF(stat->absolute_address, scd.what.position.absaddr.msf);
-+	return DISC_NO_ERROR;
-+}
-+
-+cdrom_device_t
-+cdrom_open(char *device, int *errcode)
-+{
-+	cdrom_device_t cdp;
-+
-+	cdp = g_malloc(sizeof(struct cdrom_device));
-+
-+	cdp->device = open(device, O_RDONLY);
-+	if (cdp->device == -1) {
-+		*errcode = errno;
-+		g_free(cdp);
-+		return NULL;
-+	}
-+	cdp->nr_track = 0;
-+	cdp->track_info = NULL;
-+	return cdp;
-+}
-+
-+void
-+cdrom_close(cdrom_device_t cdp)
-+{
-+	if (cdp->nr_track)
-+		g_free(cdp->track_info);
-+	close(cdp->device);
-+	g_free(cdp);
-+}
-+
-+int
-+cdrom_eject(cdrom_device_t cdp)
-+{
-+	if (ioctl(cdp->device, CDIOCEJECT, 0) == -1 ) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_next(cdrom_device_t cdp)
-+{
-+	cdrom_device_status_t stat;
-+	int track;
-+
-+	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
-+	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
-+		return DISC_IO_ERROR;
-+	track = stat.track + 1;
-+	return cdrom_play(cdp, track, cdp->track1);
-+}
-+
-+int
-+cdrom_prev(cdrom_device_t cdp)
-+{
-+	cdrom_device_status_t stat;
-+	int track;
-+
-+	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
-+	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
-+		return DISC_IO_ERROR;
-+	track = stat.track - 1;
-+	return cdrom_play(cdp, track, cdp->track1);
-+}
-+
-+int
-+cdrom_rewind(cdrom_device_t cdp)
-+{
-+	cdrom_device_status_t stat;
-+	int track;
-+
-+	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
-+	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
-+		return DISC_IO_ERROR;
-+	if (stat.absolute_address.second != 0)
-+		stat.absolute_address.second--;
-+	else {
-+		stat.absolute_address.second = 0;
-+		if (stat.absolute_address.minute > 0)
-+			stat.absolute_address.minute--;
-+	}
-+	stat.absolute_address.frame = 0;
-+	return cdrom_play_msf(cdp, &stat.absolute_address);
-+}
-+
-+int
-+cdrom_ff(cdrom_device_t cdp)
-+{
-+	cdrom_device_status_t stat;
-+	int track;
-+
-+	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
-+	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
-+		return DISC_IO_ERROR;
-+	stat.absolute_address.second++;
-+	if (stat.absolute_address.second >= 60) {
-+		stat.absolute_address.minute++;
-+		stat.absolute_address.second = 0;
-+	}
-+	stat.absolute_address.frame = 0;
-+	return cdrom_play_msf(cdp, &stat.absolute_address);
-+}
-+
-+int
-+cdrom_track_length(cdrom_device_t cdp, int track, cdrom_msf_t * length)
-+{
-+	int index, s1, s2, i;
-+
-+	if ((track < cdp->track0) || (track > cdp->track1))
-+		return DISC_INDEX_OUT_OF_RANGE;
-+	index = track - cdp->track0;
-+
-+	s1 = cdp->track_info[index + 1].address.second;
-+	s2 = cdp->track_info[index].address.second;
-+	length->second = s1 = s1 - s2;
-+	if (s1 < 0) {
-+		i = 1;
-+		length->second = s1 + 60;
-+	} else
-+		i = 0;
-+
-+	length->minute = cdp->track_info[index + 1].address.minute -
-+	    cdp->track_info[index].address.minute - i;
-+}