Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

2 files changed, 40 insertions, 39 deletions

diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index e7abc62..fc72f4f 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.orig	Mon Nov 18 18:04:37 2002
-+++ configure	Wed Nov 20 02:25:38 2002
-@@ -5683,6 +5683,7 @@
+--- configure.orig	Mon Dec 16 17:15:36 2002
++++ configure	Thu Dec 19 13:43:27 2002
+@@ -7862,6 +7862,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
++c_aux_dir/ltconfig $LIBTOOL_DEPS
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8771,6 +8772,7 @@
+@@ -12328,6 +12329,7 @@
  *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
  *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
  *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
@@ -16,41 +16,41 @@
  *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
  esac
  case "$host" in
-@@ -8831,6 +8833,20 @@
-   HAVE_LIBAPM_TRUE='#'
-   HAVE_LIBAPM_FALSE=
+@@ -12391,6 +12393,20 @@
  fi
-+	;;
+ 
+ 	;;
 +  i386-*-freebsd*)
-+  	HAVE_LIBAPM=no
-+
++      HAVE_LIBAPM=no
 +if test "x$HAVE_LIBAPM" = "xyes"; then
-+    	HAVE_LIBAPM_TRUE=
-+	HAVE_LIBAPM_FALSE='#'
++    HAVE_LIBAPM_TRUE=
++    HAVE_LIBAPM_FALSE='#'
 +else
-+    	HAVE_LIBAPM_TRUE='#'
-+	HAVE_LIBAPM_FALSE=
++    HAVE_LIBAPM_TRUE='#'
++    HAVE_LIBAPM_FALSE=
 +fi
-+	;;
++    ;;
 +  *-*-freebsd*)
-+  	build_battstat_applet=no
- 	
- 	;;
++      build_battstat_applet=no
++
++    ;;
    *-*-linux*)
-@@ -9420,14 +9436,14 @@
+ 	echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5
+ echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6
+@@ -13688,14 +13704,14 @@
  ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
  
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
 -#define GNOME_ICONDIR "${prefix}/share/pixmaps"
 +#define GNOME_ICONDIR "${datadir}/pixmaps"
- EOF
+ _ACEOF
  
  
- #defined the below to enable help to work for applets 
+ #defined the below to enable help to work for applets
  
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
 -#define DATADIR "${prefix}/share"
 +#define DATADIR "${datadir}"
- EOF
+ _ACEOF
  
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
diff --git a/x11/gnome-applets/files/patch-battstat_Makefile.in b/x11/gnome-applets/files/patch-battstat_Makefile.in
index d0834c4..f47e6ba 100644
--- a/x11/gnome-applets/files/patch-battstat_Makefile.in
+++ b/x11/gnome-applets/files/patch-battstat_Makefile.in
@@ -1,26 +1,27 @@
---- battstat/Makefile.in.orig	Wed Nov 20 02:26:09 2002
-+++ battstat/Makefile.in	Wed Nov 20 02:28:24 2002
-@@ -144,11 +144,11 @@
+--- battstat/Makefile.in.orig	Thu Dec 19 13:50:27 2002
++++ battstat/Makefile.in	Thu Dec 19 13:51:02 2002
+@@ -148,11 +148,11 @@
  pixmapsdir = $(datadir)/pixmaps
  pixmaps_DATA = battstat.png
- @HAVE_LIBAPM_TRUE@APMLIB = -lapm
--@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a
+ @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm
+-@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a
 +@HAVE_LIBAPM_FALSE@APMLIB = 
  @HAVE_LIBAPM_TRUE@APMDIR = 
--@HAVE_LIBAPM_FALSE@APMDIR = apmlib
+-@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib
 +@HAVE_LIBAPM_FALSE@APMDIR = 
  @HAVE_LIBAPM_TRUE@APMINC = 
--@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
+-@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/
 +@HAVE_LIBAPM_FALSE@APMINC = 
  
  SUBDIRS = docs sounds $(APMDIR)
  
-@@ -194,7 +194,7 @@
- battstat_applet_2_OBJECTS =  properties.$(OBJEXT) \
- battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT)
- @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = 
--@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =  apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =
+@@ -223,8 +223,7 @@
+ @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES =  \
+ @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la
+ @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =  \
+-@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la \
+-@HAVE_LIBAPM_FALSE@apmlib/libapm.a
++@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la
  battstat_applet_2_LDFLAGS = 
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)