Update to 2.5.6.

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

5 files changed, 56 insertions, 51 deletions

diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index acc9377f4..4a36c0fe0 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.5.5
+PORTVERSION=	2.5.6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.5
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index 3f5a06ad9..fa9c6dedc 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1 +1,2 @@
-MD5 (gnome2/gnome-applets-2.5.5.tar.bz2) = f69b898936da1a18e8cfe8cd749c8724
+MD5 (gnome2/gnome-applets-2.5.6.tar.bz2) = f6967a3956d6d1a00275bb96dc70d90c
+SIZE (gnome2/gnome-applets-2.5.6.tar.bz2) = 4512562
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index df7a1a384..73b0823ce 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Mon Sep  8 20:00:28 2003
-+++ configure	Wed Sep 24 23:29:28 2003
-@@ -11792,6 +11793,7 @@
+--- configure.orig	Sun Feb 22 19:22:49 2004
++++ configure	Sun Feb 22 19:24:33 2004
+@@ -22912,6 +22912,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";;
@@ -8,16 +8,16 @@
  *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
  esac
  case "$host" in
-@@ -11856,7 +11858,7 @@
+@@ -23034,7 +23035,7 @@
  
  	;;
-   # list of supported OS cores
--  *-*-linux*|*-*-freebsd*|*-*-openbsd*)
-+  *-*-linux*|i386-*-freebsd*|*-*-openbsd*)
- 	echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5
- echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6
- if test "${ac_cv_lib_apm_apm_read+set}" = set; then
-@@ -13646,14 +13648,14 @@
+   # list of supported OS cores that do not use libapm
+-  *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
++  i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
+ 	;;
+   *)
+ 	echo "warning: ${host} is not supported by battstat_applet, not building" >&2
+@@ -24905,14 +24906,14 @@
  ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
  
  cat >>confdefs.h <<_ACEOF
diff --git a/x11/gnomeapplets2/files/patch-battstat_Makefile.in b/x11/gnomeapplets2/files/patch-battstat_Makefile.in
deleted file mode 100644
index f45bc47e9..000000000
--- a/x11/gnomeapplets2/files/patch-battstat_Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- battstat/Makefile.in.orig	Sun Feb  1 22:56:01 2004
-+++ battstat/Makefile.in	Sun Feb  1 22:57:34 2004
-@@ -243,11 +243,11 @@
- pixmaps_DATA = battstat.png
- 
- @HAVE_LIBAPM_TRUE@APMLIB = -lapm
--@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@APMLIB = 
- @HAVE_LIBAPM_TRUE@APMDIR = 
--@HAVE_LIBAPM_FALSE@APMDIR = apmlib
-+@HAVE_LIBAPM_FALSE@APMDIR =
- @HAVE_LIBAPM_TRUE@APMINC = 
--@HAVE_LIBAPM_FALSE@APMINC = -I$(srcdir)/apmlib/
-+@HAVE_LIBAPM_FALSE@APMINC =
- 
- SUBDIRS = docs sounds $(APMDIR)
- 
-@@ -314,8 +314,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 =
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 454bb5359..661ddedc2 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -92,17 +92,21 @@ libexec/stickynotes_applet
 libexec/wireless-applet
 %%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade
 share/gnome/gen_util/mini-commander.glade
-share/gnome/geyes/Bizarre-eye.png
-share/gnome/geyes/Bizarre-pupil.png
-share/gnome/geyes/Bloodshot-eye.png
-share/gnome/geyes/Bloodshot-pupil.png
-share/gnome/geyes/Default-eye.png
-share/gnome/geyes/Default-pupil.png
-share/gnome/geyes/Default-tiny-eye.png
-share/gnome/geyes/Default-tiny-pupil.png
-share/gnome/geyes/config
-share/gnome/geyes/horrid_eye.png
-share/gnome/geyes/horrid_pupil.png
+share/gnome/geyes/Bizarre/Bizarre-eye.png
+share/gnome/geyes/Bizarre/Bizarre-pupil.png
+share/gnome/geyes/Bizarre/config
+share/gnome/geyes/Bloodshot/Bloodshot-eye.png
+share/gnome/geyes/Bloodshot/Bloodshot-pupil.png
+share/gnome/geyes/Bloodshot/config
+share/gnome/geyes/Default-tiny/Default-tiny-eye.png
+share/gnome/geyes/Default-tiny/Default-tiny-pupil.png
+share/gnome/geyes/Default-tiny/config
+share/gnome/geyes/Default/Default-eye.png
+share/gnome/geyes/Default/Default-pupil.png
+share/gnome/geyes/Default/config
+share/gnome/geyes/Horrid/config
+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
@@ -259,9 +263,18 @@ share/gnome/help/accessx-status/C/accessx-status.xml
 share/gnome/help/accessx-status/C/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/C/legal.xml
 %%BATTERY%%share/gnome/help/battstat/C/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/C/figures/ac_small.png
 %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png
 %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png
 %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-general.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/warning_small.png
 %%BATTERY%%share/gnome/help/battstat/C/legal.xml
 %%BATTERY%%share/gnome/help/battstat/ja/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-apperance.png
@@ -463,6 +476,7 @@ share/gnome/help/command-line/zh_TW/command-line.xml
 share/gnome/help/command-line/zh_TW/figures/command-line.png
 share/gnome/help/command-line/zh_TW/legal.xml
 share/gnome/help/drivemount/C/drivemount.xml
+share/gnome/help/drivemount/C/figures/drivemount-applet_window.png
 share/gnome/help/drivemount/C/figures/drivemount_applet_all.png
 share/gnome/help/drivemount/C/figures/drivemount_applet_floppy.png
 share/gnome/help/drivemount/C/figures/drivemount_applet_settings.png
@@ -726,6 +740,11 @@ share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_connecting.png
 share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_display.png
 share/gnome/help/modemlights/C/legal.xml
 share/gnome/help/modemlights/C/modemlights.xml
+share/gnome/help/multiload/C/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/C/figures/system_monitor.png
+share/gnome/help/multiload/C/figures/system_monitor_prefs.png
+share/gnome/help/multiload/C/legal.xml
+share/gnome/help/multiload/C/multiload.xml
 share/gnome/help/stickynotes_applet/C/legal.xml
 share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
 share/gnome/help/wireless/C/legal.xml
@@ -918,6 +937,8 @@ share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/modemlights-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/stickynotes_applet-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/wireless-C.omf
@@ -1171,6 +1192,7 @@ share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/et/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1225,6 +1247,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/wireless
 @dirrm share/gnome/help/stickynotes_applet/C
 @dirrm share/gnome/help/stickynotes_applet
+@dirrm share/gnome/help/multiload/C/figures
+@dirrm share/gnome/help/multiload/C
+@dirrm share/gnome/help/multiload
 @dirrm share/gnome/help/modemlights/C/figures
 @dirrm share/gnome/help/modemlights/C
 @dirrm share/gnome/help/modemlights
@@ -1418,6 +1443,11 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/cdplayer/C/figures
 @dirrm share/gnome/help/cdplayer/C
 @dirrm share/gnome/help/cdplayer
+@dirrm share/gnome/geyes/Horrid
+@dirrm share/gnome/geyes/Default
+@dirrm share/gnome/geyes/Default-tiny
+@dirrm share/gnome/geyes/Bloodshot
+@dirrm share/gnome/geyes/Bizarre
 %%BATTERY%%@dirrm share/gnome/help/battstat/ja/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/ja
 %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
@@ -1561,5 +1591,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-C.omf 2>/dev/null || /usr/bin/true