Update to 2.1.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@147 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 124 insertions, 102 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 5979a4629..c8b00beef 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.0.3
-PORTREVISION=	2
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-applets/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-applets/2.1
 DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index eeff34ef5..2a0e0aa7e 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.0.3.tar.bz2) = bb77b796fa7f0c4b714d45198c8c286b
+MD5 (gnome2/gnome-applets-2.1.1.tar.bz2) = f8e24f9480b13815215d626ee36cff17
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index cf6bce530..6e97117be 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Fri Sep 13 15:58:55 2002
-+++ configure	Wed Sep 18 01:18:40 2002
-@@ -6994,6 +6994,7 @@
+--- configure.orig	Sun Nov  3 14:13:35 2002
++++ configure	Mon Nov 11 16:56:45 2002
+@@ -5682,6 +5682,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,16 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10518,7 +10519,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- CATOBJEXT=.mo
--	         DATADIRNAME=lib
-+	         DATADIRNAME=share
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	      INSTOBJEXT=.mo
-@@ -10765,6 +10766,7 @@
+@@ -8918,6 +8919,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";;
@@ -25,16 +16,14 @@
  *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
  esac
  case "$host" in
-@@ -10817,6 +10819,20 @@
-   HAVE_LIBAPM_TRUE='#'
-   HAVE_LIBAPM_FALSE=
+@@ -8980,6 +8982,20 @@
  fi
-+	;;
+ 	
+ 	;;
 +  i386-*-freebsd*)
 +  	HAVE_LIBAPM=no
-+
 +if test "x$HAVE_LIBAPM" = "xyes"; then
-+	HAVE_LIBAPM_TRUE=
++    	HAVE_LIBAPM_TRUE=
 +	HAVE_LIBAPM_FALSE='#'
 +else
 +    	HAVE_LIBAPM_TRUE='#'
@@ -43,22 +32,25 @@
 +	;;
 +  *-*-freebsd*)
 +  	build_battstat_applet=no
- 
- 	;;
++
++	;;
    *-*-linux*)
-@@ -11494,13 +11510,13 @@
+ 	echo $ac_n "checking for apm_read in -lapm""... $ac_c" 1>&6
+ echo "configure:8986: checking for apm_read in -lapm" >&5
+@@ -9567,14 +9583,14 @@
  ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
  
- cat >>confdefs.h <<EOF
+ cat >> confdefs.h <<EOF
 -#define GNOME_ICONDIR "${prefix}/share/pixmaps"
 +#define GNOME_ICONDIR "${datadir}/pixmaps"
  EOF
  
- #defined the below to enable help to work for applets
  
- cat >>confdefs.h <<EOF
+ #defined the below to enable help to work for applets 
+ 
+ cat >> confdefs.h <<EOF
 -#define DATADIR "${prefix}/share"
 +#define DATADIR "${datadir}"
  EOF
  
- cat >>confdefs.h <<EOF
+ cat >> confdefs.h <<EOF
diff --git a/x11/gnome-applets/files/patch-battstat_Makefile.in b/x11/gnome-applets/files/patch-battstat_Makefile.in
index 3612d4350..6b05c2b4e 100644
--- a/x11/gnome-applets/files/patch-battstat_Makefile.in
+++ b/x11/gnome-applets/files/patch-battstat_Makefile.in
@@ -1,26 +1,26 @@
---- battstat/Makefile.in.orig	Tue Apr 30 14:48:53 2002
-+++ battstat/Makefile.in	Tue Apr 30 15:00:42 2002
-@@ -138,11 +138,11 @@
+--- battstat/Makefile.in.orig	Mon Nov 11 16:57:08 2002
++++ battstat/Makefile.in	Mon Nov 11 16:58:06 2002
+@@ -146,11 +146,11 @@
  pixmapsdir = $(datadir)/pixmaps
  pixmaps_DATA = battstat.png
  @HAVE_LIBAPM_TRUE@APMLIB = -lapm
 -@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@APMLIB =
++@HAVE_LIBAPM_FALSE@APMLIB = 
  @HAVE_LIBAPM_TRUE@APMDIR = 
 -@HAVE_LIBAPM_FALSE@APMDIR = apmlib
-+@HAVE_LIBAPM_FALSE@APMDIR =
++@HAVE_LIBAPM_FALSE@APMDIR = 
  @HAVE_LIBAPM_TRUE@APMINC = 
 -@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
-+@HAVE_LIBAPM_FALSE@APMINC =
++@HAVE_LIBAPM_FALSE@APMINC = 
  
- SUBDIRS = sounds $(APMDIR)
+ SUBDIRS = docs sounds $(APMDIR)
  
-@@ -187,7 +187,7 @@
- X_PRE_LIBS = @X_PRE_LIBS@
+@@ -196,7 +196,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 =
- @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = 
  battstat_applet_2_LDFLAGS = 
  CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index da5f3bf59..3af5d24f8 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -45,19 +45,23 @@ libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
 libdata/bonobo/servers/GNOME_MixerApplet.server
 libdata/bonobo/servers/GNOME_ModemLightsApplet.server
 libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
+libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
 %%BATTERY%%libexec/battstat-applet-2
 libexec/cdplayer_applet2
 libexec/charpick_applet2
 libexec/drivemount_applet2
 libexec/geyes_applet2
 libexec/gkb-applet-2
+libexec/gnome-applets/mc-install-default-macros
 libexec/gtik2_applet2
 libexec/gweather-applet-2
 libexec/mini_commander_applet
 libexec/mixer_applet2
 libexec/modemlights_applet2
 libexec/multiload-applet-2
+libexec/wireless-applet
 %%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade
+share/gnome/gen_util/mini-commander.glade
 share/gnome/geyes/Bizarre/Bizarre-eye.png
 share/gnome/geyes/Bizarre/Bizarre-pupil.png
 share/gnome/geyes/Bizarre/config
@@ -75,6 +79,7 @@ share/gnome/geyes/Horrid/horrid_eye.png
 share/gnome/geyes/Horrid/horrid_pupil.png
 share/gnome/gkb/AM_Armenian.keyprop
 share/gnome/gkb/AR_Arabic.keyprop
+share/gnome/gkb/AR_Arabic_x.keyprop
 share/gnome/gkb/AZ_Azerbaidjani_Turkic.keyprop
 share/gnome/gkb/Armenian.keyprop
 share/gnome/gkb/BE_Dutch.keyprop
@@ -100,10 +105,12 @@ share/gnome/gkb/Dvorak.keyprop
 share/gnome/gkb/EE_Estonian.keyprop
 share/gnome/gkb/EE_Estonian_x.keyprop
 share/gnome/gkb/ES_Spanish.keyprop
+share/gnome/gkb/ES_Spanish-x86.keyprop
 share/gnome/gkb/ES_Spanish_x.keyprop
 share/gnome/gkb/FI_Finnish.keyprop
 share/gnome/gkb/FI_Finnish_x.keyprop
 share/gnome/gkb/FR_French.keyprop
+share/gnome/gkb/FR_French-x86.keyprop
 share/gnome/gkb/FR_French_x.keyprop
 share/gnome/gkb/FrenchCanadian.keyprop
 share/gnome/gkb/FrenchCanadian2.keyprop
@@ -119,10 +126,12 @@ share/gnome/gkb/GeorgianLatin.keyprop
 share/gnome/gkb/GeorgianRussian.keyprop
 share/gnome/gkb/German.keyprop
 share/gnome/gkb/GermanSwiss.keyprop
+share/gnome/gkb/HR_Croatian.keyprop
 share/gnome/gkb/HU_Hungarian.keyprop
 share/gnome/gkb/Hungarian-101.keyprop
 share/gnome/gkb/Hungarian-lat1.keyprop
 share/gnome/gkb/Hungarian-sun.keyprop
+share/gnome/gkb/Hungarian-x86.keyprop
 share/gnome/gkb/Hungarian.keyprop
 share/gnome/gkb/Hungarian101-1.keyprop
 share/gnome/gkb/Hungarian101.keyprop
@@ -171,7 +180,9 @@ share/gnome/gkb/TR_Turkish_x.keyprop
 share/gnome/gkb/Thai.keyprop
 share/gnome/gkb/Thai2.keyprop
 share/gnome/gkb/UA_Ukrainian.keyprop
+share/gnome/gkb/UK-x86.keyprop
 share/gnome/gkb/UK.keyprop
+share/gnome/gkb/US-101A-x86.keyprop
 share/gnome/gkb/US-101.keyprop
 share/gnome/gkb/US-84.keyprop
 share/gnome/gkb/US-dec.keyprop
@@ -198,6 +209,7 @@ share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml
 share/gnome/gweather/Locations
 %%BATTERY%%share/gnome/help/battstat/C/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png
@@ -294,6 +306,7 @@ share/gnome/pixmaps/gkb/jo.png
 share/gnome/pixmaps/gkb/jp.png
 share/gnome/pixmaps/gkb/km.png
 share/gnome/pixmaps/gkb/kw.png
+share/gnome/pixmaps/gkb/lam.png
 share/gnome/pixmaps/gkb/la.png
 share/gnome/pixmaps/gkb/lb.png
 share/gnome/pixmaps/gkb/lt.png
@@ -338,17 +351,16 @@ share/gnome/pixmaps/gweather/tstorm.xpm
 share/gnome/pixmaps/mini-commander/browser-mini.xpm
 share/gnome/pixmaps/mini-commander/history-mini.xpm
 share/gnome/pixmaps/mixer/gnome-mixer-applet.png
-share/gnome/pixmaps/mixer/volume-max-small.png
-share/gnome/pixmaps/mixer/volume-max.png
-share/gnome/pixmaps/mixer/volume-medium-small.png
-share/gnome/pixmaps/mixer/volume-medium.png
-share/gnome/pixmaps/mixer/volume-min-small.png
-share/gnome/pixmaps/mixer/volume-min.png
-share/gnome/pixmaps/mixer/volume-mute-small.png
-share/gnome/pixmaps/mixer/volume-mute.png
-share/gnome/pixmaps/mixer/volume-zero-small.png
-share/gnome/pixmaps/mixer/volume-zero.png
+share/gnome/pixmaps/wireless-applet/broken-0.png
+share/gnome/pixmaps/wireless-applet/no-link-0.png
+share/gnome/pixmaps/wireless-applet/signal-1-40.png
+share/gnome/pixmaps/wireless-applet/signal-41-60.png
+share/gnome/pixmaps/wireless-applet/signal-61-80.png
+share/gnome/pixmaps/wireless-applet/signal-81-100.png
+share/gnome/pixmaps/wireless-applet/wireless-applet.png
+share/gnome/wireless-applet/wireless-applet.glade
 share/gnome/xmodmap/xmodmap.am
+share/gnome/xmodmap/xmodmap.ar
 share/gnome/xmodmap/xmodmap.be
 share/gnome/xmodmap/xmodmap.bg
 share/gnome/xmodmap/xmodmap.br
@@ -362,9 +374,11 @@ share/gnome/xmodmap/xmodmap.dk
 share/gnome/xmodmap/xmodmap.dvorak
 share/gnome/xmodmap/xmodmap.ee
 share/gnome/xmodmap/xmodmap.es
+share/gnome/xmodmap/xmodmap.es_x86
 share/gnome/xmodmap/xmodmap.fi
 share/gnome/xmodmap/xmodmap.fr
 share/gnome/xmodmap/xmodmap.fr-2
+share/gnome/xmodmap/xmodmap.fr_x86
 share/gnome/xmodmap/xmodmap.gb
 share/gnome/xmodmap/xmodmap.gb-102
 share/gnome/xmodmap/xmodmap.gb-105
@@ -379,6 +393,7 @@ share/gnome/xmodmap/xmodmap.hu-lat1
 share/gnome/xmodmap/xmodmap.hu-sun-lat2
 share/gnome/xmodmap/xmodmap.hu.old
 share/gnome/xmodmap/xmodmap.hu_latin1
+share/gnome/xmodmap/xmodmap.hu_x86
 share/gnome/xmodmap/xmodmap.il
 share/gnome/xmodmap/xmodmap.il_phonetic
 share/gnome/xmodmap/xmodmap.is
@@ -410,7 +425,9 @@ 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.uk_x86
 share/gnome/xmodmap/xmodmap.us
+share/gnome/xmodmap/xmodmap.us101A_x86
 share/gnome/xmodmap/xmodmap.us-101
 share/gnome/xmodmap/xmodmap.us-84
 share/gnome/xmodmap/xmodmap.us-dec
@@ -424,6 +441,7 @@ share/gnome/xmodmap/xmodmap.us_intl
 share/gnome/xmodmap/xmodmap.yu
 share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo
@@ -443,7 +461,6 @@ share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
@@ -464,6 +481,7 @@ share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/xmodmap
+@dirrm share/gnome/wireless-applet
 @dirrm share/gnome/pixmaps/mixer
 @dirrm share/gnome/pixmaps/mini-commander
 @dirrm share/gnome/pixmaps/gweather
@@ -492,8 +510,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/cdplayer
 @dirrm share/gnome/gweather
 @dirrm share/gnome/gkb
+@dirrm share/gnome/gen_util
 @dirrm share/gnome/geyes
 %%BATTERY%%@dirrm share/gnome/battstat_applet
+@dirrm libexec/gnome-applets
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 5979a4629..c8b00beef 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.0.3
-PORTREVISION=	2
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-applets/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-applets/2.1
 DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index eeff34ef5..2a0e0aa7e 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.0.3.tar.bz2) = bb77b796fa7f0c4b714d45198c8c286b
+MD5 (gnome2/gnome-applets-2.1.1.tar.bz2) = f8e24f9480b13815215d626ee36cff17
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index cf6bce530..6e97117be 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Fri Sep 13 15:58:55 2002
-+++ configure	Wed Sep 18 01:18:40 2002
-@@ -6994,6 +6994,7 @@
+--- configure.orig	Sun Nov  3 14:13:35 2002
++++ configure	Mon Nov 11 16:56:45 2002
+@@ -5682,6 +5682,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,16 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10518,7 +10519,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- CATOBJEXT=.mo
--	         DATADIRNAME=lib
-+	         DATADIRNAME=share
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	      INSTOBJEXT=.mo
-@@ -10765,6 +10766,7 @@
+@@ -8918,6 +8919,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";;
@@ -25,16 +16,14 @@
  *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
  esac
  case "$host" in
-@@ -10817,6 +10819,20 @@
-   HAVE_LIBAPM_TRUE='#'
-   HAVE_LIBAPM_FALSE=
+@@ -8980,6 +8982,20 @@
  fi
-+	;;
+ 	
+ 	;;
 +  i386-*-freebsd*)
 +  	HAVE_LIBAPM=no
-+
 +if test "x$HAVE_LIBAPM" = "xyes"; then
-+	HAVE_LIBAPM_TRUE=
++    	HAVE_LIBAPM_TRUE=
 +	HAVE_LIBAPM_FALSE='#'
 +else
 +    	HAVE_LIBAPM_TRUE='#'
@@ -43,22 +32,25 @@
 +	;;
 +  *-*-freebsd*)
 +  	build_battstat_applet=no
- 
- 	;;
++
++	;;
    *-*-linux*)
-@@ -11494,13 +11510,13 @@
+ 	echo $ac_n "checking for apm_read in -lapm""... $ac_c" 1>&6
+ echo "configure:8986: checking for apm_read in -lapm" >&5
+@@ -9567,14 +9583,14 @@
  ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
  
- cat >>confdefs.h <<EOF
+ cat >> confdefs.h <<EOF
 -#define GNOME_ICONDIR "${prefix}/share/pixmaps"
 +#define GNOME_ICONDIR "${datadir}/pixmaps"
  EOF
  
- #defined the below to enable help to work for applets
  
- cat >>confdefs.h <<EOF
+ #defined the below to enable help to work for applets 
+ 
+ cat >> confdefs.h <<EOF
 -#define DATADIR "${prefix}/share"
 +#define DATADIR "${datadir}"
  EOF
  
- cat >>confdefs.h <<EOF
+ cat >> confdefs.h <<EOF
diff --git a/x11/gnomeapplets2/files/patch-battstat_Makefile.in b/x11/gnomeapplets2/files/patch-battstat_Makefile.in
index 3612d4350..6b05c2b4e 100644
--- a/x11/gnomeapplets2/files/patch-battstat_Makefile.in
+++ b/x11/gnomeapplets2/files/patch-battstat_Makefile.in
@@ -1,26 +1,26 @@
---- battstat/Makefile.in.orig	Tue Apr 30 14:48:53 2002
-+++ battstat/Makefile.in	Tue Apr 30 15:00:42 2002
-@@ -138,11 +138,11 @@
+--- battstat/Makefile.in.orig	Mon Nov 11 16:57:08 2002
++++ battstat/Makefile.in	Mon Nov 11 16:58:06 2002
+@@ -146,11 +146,11 @@
  pixmapsdir = $(datadir)/pixmaps
  pixmaps_DATA = battstat.png
  @HAVE_LIBAPM_TRUE@APMLIB = -lapm
 -@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@APMLIB =
++@HAVE_LIBAPM_FALSE@APMLIB = 
  @HAVE_LIBAPM_TRUE@APMDIR = 
 -@HAVE_LIBAPM_FALSE@APMDIR = apmlib
-+@HAVE_LIBAPM_FALSE@APMDIR =
++@HAVE_LIBAPM_FALSE@APMDIR = 
  @HAVE_LIBAPM_TRUE@APMINC = 
 -@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
-+@HAVE_LIBAPM_FALSE@APMINC =
++@HAVE_LIBAPM_FALSE@APMINC = 
  
- SUBDIRS = sounds $(APMDIR)
+ SUBDIRS = docs sounds $(APMDIR)
  
-@@ -187,7 +187,7 @@
- X_PRE_LIBS = @X_PRE_LIBS@
+@@ -196,7 +196,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 =
- @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = 
  battstat_applet_2_LDFLAGS = 
  CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index da5f3bf59..3af5d24f8 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -45,19 +45,23 @@ libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
 libdata/bonobo/servers/GNOME_MixerApplet.server
 libdata/bonobo/servers/GNOME_ModemLightsApplet.server
 libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
+libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
 %%BATTERY%%libexec/battstat-applet-2
 libexec/cdplayer_applet2
 libexec/charpick_applet2
 libexec/drivemount_applet2
 libexec/geyes_applet2
 libexec/gkb-applet-2
+libexec/gnome-applets/mc-install-default-macros
 libexec/gtik2_applet2
 libexec/gweather-applet-2
 libexec/mini_commander_applet
 libexec/mixer_applet2
 libexec/modemlights_applet2
 libexec/multiload-applet-2
+libexec/wireless-applet
 %%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade
+share/gnome/gen_util/mini-commander.glade
 share/gnome/geyes/Bizarre/Bizarre-eye.png
 share/gnome/geyes/Bizarre/Bizarre-pupil.png
 share/gnome/geyes/Bizarre/config
@@ -75,6 +79,7 @@ share/gnome/geyes/Horrid/horrid_eye.png
 share/gnome/geyes/Horrid/horrid_pupil.png
 share/gnome/gkb/AM_Armenian.keyprop
 share/gnome/gkb/AR_Arabic.keyprop
+share/gnome/gkb/AR_Arabic_x.keyprop
 share/gnome/gkb/AZ_Azerbaidjani_Turkic.keyprop
 share/gnome/gkb/Armenian.keyprop
 share/gnome/gkb/BE_Dutch.keyprop
@@ -100,10 +105,12 @@ share/gnome/gkb/Dvorak.keyprop
 share/gnome/gkb/EE_Estonian.keyprop
 share/gnome/gkb/EE_Estonian_x.keyprop
 share/gnome/gkb/ES_Spanish.keyprop
+share/gnome/gkb/ES_Spanish-x86.keyprop
 share/gnome/gkb/ES_Spanish_x.keyprop
 share/gnome/gkb/FI_Finnish.keyprop
 share/gnome/gkb/FI_Finnish_x.keyprop
 share/gnome/gkb/FR_French.keyprop
+share/gnome/gkb/FR_French-x86.keyprop
 share/gnome/gkb/FR_French_x.keyprop
 share/gnome/gkb/FrenchCanadian.keyprop
 share/gnome/gkb/FrenchCanadian2.keyprop
@@ -119,10 +126,12 @@ share/gnome/gkb/GeorgianLatin.keyprop
 share/gnome/gkb/GeorgianRussian.keyprop
 share/gnome/gkb/German.keyprop
 share/gnome/gkb/GermanSwiss.keyprop
+share/gnome/gkb/HR_Croatian.keyprop
 share/gnome/gkb/HU_Hungarian.keyprop
 share/gnome/gkb/Hungarian-101.keyprop
 share/gnome/gkb/Hungarian-lat1.keyprop
 share/gnome/gkb/Hungarian-sun.keyprop
+share/gnome/gkb/Hungarian-x86.keyprop
 share/gnome/gkb/Hungarian.keyprop
 share/gnome/gkb/Hungarian101-1.keyprop
 share/gnome/gkb/Hungarian101.keyprop
@@ -171,7 +180,9 @@ share/gnome/gkb/TR_Turkish_x.keyprop
 share/gnome/gkb/Thai.keyprop
 share/gnome/gkb/Thai2.keyprop
 share/gnome/gkb/UA_Ukrainian.keyprop
+share/gnome/gkb/UK-x86.keyprop
 share/gnome/gkb/UK.keyprop
+share/gnome/gkb/US-101A-x86.keyprop
 share/gnome/gkb/US-101.keyprop
 share/gnome/gkb/US-84.keyprop
 share/gnome/gkb/US-dec.keyprop
@@ -198,6 +209,7 @@ share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml
 share/gnome/gweather/Locations
 %%BATTERY%%share/gnome/help/battstat/C/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png
@@ -294,6 +306,7 @@ share/gnome/pixmaps/gkb/jo.png
 share/gnome/pixmaps/gkb/jp.png
 share/gnome/pixmaps/gkb/km.png
 share/gnome/pixmaps/gkb/kw.png
+share/gnome/pixmaps/gkb/lam.png
 share/gnome/pixmaps/gkb/la.png
 share/gnome/pixmaps/gkb/lb.png
 share/gnome/pixmaps/gkb/lt.png
@@ -338,17 +351,16 @@ share/gnome/pixmaps/gweather/tstorm.xpm
 share/gnome/pixmaps/mini-commander/browser-mini.xpm
 share/gnome/pixmaps/mini-commander/history-mini.xpm
 share/gnome/pixmaps/mixer/gnome-mixer-applet.png
-share/gnome/pixmaps/mixer/volume-max-small.png
-share/gnome/pixmaps/mixer/volume-max.png
-share/gnome/pixmaps/mixer/volume-medium-small.png
-share/gnome/pixmaps/mixer/volume-medium.png
-share/gnome/pixmaps/mixer/volume-min-small.png
-share/gnome/pixmaps/mixer/volume-min.png
-share/gnome/pixmaps/mixer/volume-mute-small.png
-share/gnome/pixmaps/mixer/volume-mute.png
-share/gnome/pixmaps/mixer/volume-zero-small.png
-share/gnome/pixmaps/mixer/volume-zero.png
+share/gnome/pixmaps/wireless-applet/broken-0.png
+share/gnome/pixmaps/wireless-applet/no-link-0.png
+share/gnome/pixmaps/wireless-applet/signal-1-40.png
+share/gnome/pixmaps/wireless-applet/signal-41-60.png
+share/gnome/pixmaps/wireless-applet/signal-61-80.png
+share/gnome/pixmaps/wireless-applet/signal-81-100.png
+share/gnome/pixmaps/wireless-applet/wireless-applet.png
+share/gnome/wireless-applet/wireless-applet.glade
 share/gnome/xmodmap/xmodmap.am
+share/gnome/xmodmap/xmodmap.ar
 share/gnome/xmodmap/xmodmap.be
 share/gnome/xmodmap/xmodmap.bg
 share/gnome/xmodmap/xmodmap.br
@@ -362,9 +374,11 @@ share/gnome/xmodmap/xmodmap.dk
 share/gnome/xmodmap/xmodmap.dvorak
 share/gnome/xmodmap/xmodmap.ee
 share/gnome/xmodmap/xmodmap.es
+share/gnome/xmodmap/xmodmap.es_x86
 share/gnome/xmodmap/xmodmap.fi
 share/gnome/xmodmap/xmodmap.fr
 share/gnome/xmodmap/xmodmap.fr-2
+share/gnome/xmodmap/xmodmap.fr_x86
 share/gnome/xmodmap/xmodmap.gb
 share/gnome/xmodmap/xmodmap.gb-102
 share/gnome/xmodmap/xmodmap.gb-105
@@ -379,6 +393,7 @@ share/gnome/xmodmap/xmodmap.hu-lat1
 share/gnome/xmodmap/xmodmap.hu-sun-lat2
 share/gnome/xmodmap/xmodmap.hu.old
 share/gnome/xmodmap/xmodmap.hu_latin1
+share/gnome/xmodmap/xmodmap.hu_x86
 share/gnome/xmodmap/xmodmap.il
 share/gnome/xmodmap/xmodmap.il_phonetic
 share/gnome/xmodmap/xmodmap.is
@@ -410,7 +425,9 @@ 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.uk_x86
 share/gnome/xmodmap/xmodmap.us
+share/gnome/xmodmap/xmodmap.us101A_x86
 share/gnome/xmodmap/xmodmap.us-101
 share/gnome/xmodmap/xmodmap.us-84
 share/gnome/xmodmap/xmodmap.us-dec
@@ -424,6 +441,7 @@ share/gnome/xmodmap/xmodmap.us_intl
 share/gnome/xmodmap/xmodmap.yu
 share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo
@@ -443,7 +461,6 @@ share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
@@ -464,6 +481,7 @@ share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/xmodmap
+@dirrm share/gnome/wireless-applet
 @dirrm share/gnome/pixmaps/mixer
 @dirrm share/gnome/pixmaps/mini-commander
 @dirrm share/gnome/pixmaps/gweather
@@ -492,8 +510,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/cdplayer
 @dirrm share/gnome/gweather
 @dirrm share/gnome/gkb
+@dirrm share/gnome/gen_util
 @dirrm share/gnome/geyes
 %%BATTERY%%@dirrm share/gnome/battstat_applet
+@dirrm libexec/gnome-applets
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs