Update to 2.3.5.

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

8 files changed, 44 insertions, 78 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index bab9afd0b..e95f4bd54 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.3.4
+PORTVERSION=	2.3.5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.3
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index a59d031bf..a680e71d7 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.3.4.tar.bz2) = 307e05032477c2a7bfc230f8836c6661
+MD5 (gnome2/gnome-applets-2.3.5.tar.bz2) = 48b5b003ebf2cfb7d352bb40f69f140d
diff --git a/x11/gnome-applets/files/patch-battstat_Makefile.in b/x11/gnome-applets/files/patch-battstat_Makefile.in
index f47e6bab6..190874936 100644
--- a/x11/gnome-applets/files/patch-battstat_Makefile.in
+++ b/x11/gnome-applets/files/patch-battstat_Makefile.in
@@ -1,21 +1,21 @@
---- 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 @@
+--- battstat/Makefile.in.orig	Sun Jun 29 16:43:23 2003
++++ battstat/Makefile.in	Sun Jun 29 16:45:10 2003
+@@ -146,11 +146,11 @@
  pixmapsdir = $(datadir)/pixmaps
  pixmaps_DATA = battstat.png
- @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@APMLIB = -lapm
+-@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a
++@HAVE_LIBAPM_FALSE@APMLIB =
  @HAVE_LIBAPM_TRUE@APMDIR = 
--@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib
-+@HAVE_LIBAPM_FALSE@APMDIR = 
+-@HAVE_LIBAPM_FALSE@APMDIR = apmlib
++@HAVE_LIBAPM_FALSE@APMDIR =
  @HAVE_LIBAPM_TRUE@APMINC = 
--@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/
-+@HAVE_LIBAPM_FALSE@APMINC = 
+-@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
++@HAVE_LIBAPM_FALSE@APMINC =
  
  SUBDIRS = docs sounds $(APMDIR)
  
-@@ -223,8 +223,7 @@
+@@ -199,8 +199,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 =  \
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 495f9ce0a..9173118a8 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1,4 +1,5 @@
 bin/gkb_xmmap
+bin/gnome-keyboard-layout
 etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings/%gconf.xml
@@ -22,6 +23,8 @@ etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/multiload/%gconf.xml
@@ -563,19 +566,8 @@ share/gnome/help/gweather_applet/it/figures/gweather_settings.png
 share/gnome/help/gweather_applet/it/figures/gweather_weather.png
 share/gnome/help/gweather_applet/it/gweather.sgml
 share/gnome/help/gweather_applet/it/gweather_applet.sgml
-share/gnome/help/gweather_applet/it/index.html
-share/gnome/help/gweather_applet/it/stylesheet-images/caution.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/home.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/important.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/next.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/note.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/prev.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/tip.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/toc-blank.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/toc-minus.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/toc-plus.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/up.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/warning.gif
+share/gnome/help/gweather_applet/it/ln10.html
+share/gnome/help/gweather_applet/it/t1.html
 share/gnome/help/gweather_applet/it/topic.dat
 share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/C/legal.xml
@@ -632,21 +624,10 @@ share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/zh_TW/legal.xml
 share/gnome/help/mailcheck/zh_TW/mailcheck.xml
 share/gnome/help/mixer_applet/it/figures/mixer_applet.png
-share/gnome/help/mixer_applet/it/index.html
+share/gnome/help/mixer_applet/it/ln10.html
 share/gnome/help/mixer_applet/it/mixer.sgml
 share/gnome/help/mixer_applet/it/mixer_applet.sgml
-share/gnome/help/mixer_applet/it/stylesheet-images/caution.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/home.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/important.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/next.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/note.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/prev.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/tip.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/toc-blank.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/toc-minus.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/toc-plus.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/up.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/warning.gif
+share/gnome/help/mixer_applet/it/t1.html
 share/gnome/help/mixer_applet/it/topic.dat
 share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/C/legal.xml
@@ -1384,6 +1365,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index bab9afd0b..e95f4bd54 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.3.4
+PORTVERSION=	2.3.5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.3
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index a59d031bf..a680e71d7 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.3.4.tar.bz2) = 307e05032477c2a7bfc230f8836c6661
+MD5 (gnome2/gnome-applets-2.3.5.tar.bz2) = 48b5b003ebf2cfb7d352bb40f69f140d
diff --git a/x11/gnomeapplets2/files/patch-battstat_Makefile.in b/x11/gnomeapplets2/files/patch-battstat_Makefile.in
index f47e6bab6..190874936 100644
--- a/x11/gnomeapplets2/files/patch-battstat_Makefile.in
+++ b/x11/gnomeapplets2/files/patch-battstat_Makefile.in
@@ -1,21 +1,21 @@
---- 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 @@
+--- battstat/Makefile.in.orig	Sun Jun 29 16:43:23 2003
++++ battstat/Makefile.in	Sun Jun 29 16:45:10 2003
+@@ -146,11 +146,11 @@
  pixmapsdir = $(datadir)/pixmaps
  pixmaps_DATA = battstat.png
- @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@APMLIB = -lapm
+-@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a
++@HAVE_LIBAPM_FALSE@APMLIB =
  @HAVE_LIBAPM_TRUE@APMDIR = 
--@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib
-+@HAVE_LIBAPM_FALSE@APMDIR = 
+-@HAVE_LIBAPM_FALSE@APMDIR = apmlib
++@HAVE_LIBAPM_FALSE@APMDIR =
  @HAVE_LIBAPM_TRUE@APMINC = 
--@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/
-+@HAVE_LIBAPM_FALSE@APMINC = 
+-@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
++@HAVE_LIBAPM_FALSE@APMINC =
  
  SUBDIRS = docs sounds $(APMDIR)
  
-@@ -223,8 +223,7 @@
+@@ -199,8 +199,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 =  \
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 495f9ce0a..9173118a8 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -1,4 +1,5 @@
 bin/gkb_xmmap
+bin/gnome-keyboard-layout
 etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings/%gconf.xml
@@ -22,6 +23,8 @@ etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/multiload/%gconf.xml
@@ -563,19 +566,8 @@ share/gnome/help/gweather_applet/it/figures/gweather_settings.png
 share/gnome/help/gweather_applet/it/figures/gweather_weather.png
 share/gnome/help/gweather_applet/it/gweather.sgml
 share/gnome/help/gweather_applet/it/gweather_applet.sgml
-share/gnome/help/gweather_applet/it/index.html
-share/gnome/help/gweather_applet/it/stylesheet-images/caution.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/home.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/important.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/next.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/note.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/prev.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/tip.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/toc-blank.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/toc-minus.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/toc-plus.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/up.gif
-share/gnome/help/gweather_applet/it/stylesheet-images/warning.gif
+share/gnome/help/gweather_applet/it/ln10.html
+share/gnome/help/gweather_applet/it/t1.html
 share/gnome/help/gweather_applet/it/topic.dat
 share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/C/legal.xml
@@ -632,21 +624,10 @@ share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/zh_TW/legal.xml
 share/gnome/help/mailcheck/zh_TW/mailcheck.xml
 share/gnome/help/mixer_applet/it/figures/mixer_applet.png
-share/gnome/help/mixer_applet/it/index.html
+share/gnome/help/mixer_applet/it/ln10.html
 share/gnome/help/mixer_applet/it/mixer.sgml
 share/gnome/help/mixer_applet/it/mixer_applet.sgml
-share/gnome/help/mixer_applet/it/stylesheet-images/caution.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/home.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/important.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/next.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/note.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/prev.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/tip.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/toc-blank.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/toc-minus.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/toc-plus.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/up.gif
-share/gnome/help/mixer_applet/it/stylesheet-images/warning.gif
+share/gnome/help/mixer_applet/it/t1.html
 share/gnome/help/mixer_applet/it/topic.dat
 share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/C/legal.xml
@@ -1384,6 +1365,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs