Update to 2.31.91.

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

3 files changed, 68 insertions, 33 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index f7bf2bcf5..b15fafca1 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-applets/Makefile,v 1.211 2010/03/28 17:55:31 marcus Exp $
+#   $MCom: ports/x11/gnome-applets/Makefile,v 1.213 2010/08/17 08:18:51 kwm Exp $
 #
 
 PORTNAME=	gnome-applets
-PORTVERSION=	2.31.90
+PORTVERSION=	2.31.91
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -79,9 +79,9 @@ GCONF_SCHEMAS+=	cpufreq-applet.schemas
 .if defined(WITH_MINI_COMMANDER)
 CONFIGURE_ARGS+=	--enable-mini-commander
 GCONF_SCHEMAS+=	mini-commander-global.schemas mini-commander.schemas
-PLIST_SUB+=	COMMANDER=""
+PLIST_SUB+=	COMMANDER="" OLDCOMMANDER="@comment "
 .else
-PLIST_SUB+=	COMMANDER="@comment "
+PLIST_SUB+=	COMMANDER="@comment " OLDCOMMANDER=""
 .endif
 
 .if ( exists(${pygnomedesktop_DETECT}) ) || \
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index e0448d7cb..ab0faabbb 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.31.90.tar.bz2) = 651f6573eecfbbacbb073026cbc1dae8
-SHA256 (gnome2/gnome-applets-2.31.90.tar.bz2) = 9842157962ea484e666ee4b6fe35cb996649140cf70440e59ebec4807effaf44
-SIZE (gnome2/gnome-applets-2.31.90.tar.bz2) = 9992793
+MD5 (gnome2/gnome-applets-2.31.91.tar.bz2) = 43bce1a45b32ae8e7d00cd8ed8df2ec1
+SHA256 (gnome2/gnome-applets-2.31.91.tar.bz2) = f21fc18bcefebfc677bc623160d3664d4e3df16672acc42447b7fc17359e1fe1
+SIZE (gnome2/gnome-applets-2.31.91.tar.bz2) = 10089827
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index ea0e140fd..f2cb40800 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -35,24 +35,13 @@ lib/python2.6/site-packages/invest/help.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.pyo
-libdata/bonobo/servers/GNOME_AccessxStatusApplet.server
-%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server
 libdata/bonobo/servers/GNOME_CDPlayerApplet.server
-%%CPUFREQ%%libdata/bonobo/servers/GNOME_CPUFreqApplet.server
-libdata/bonobo/servers/GNOME_CharpickerApplet.server
-libdata/bonobo/servers/GNOME_DriveMountApplet.server
-libdata/bonobo/servers/GNOME_GWeatherApplet_Factory.server
-libdata/bonobo/servers/GNOME_GeyesApplet.server
 %%PYTHON%%libdata/bonobo/servers/GNOME_GtikApplet.server
 libdata/bonobo/servers/GNOME_KeyboardApplet.server
 libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server
-libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
-libdata/bonobo/servers/GNOME_MixerApplet.server
-libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
+%%OLDCOMMANDER%%libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
 libdata/bonobo/servers/GNOME_NullApplet_Factory.server
-libdata/bonobo/servers/GNOME_Panel_TrashApplet.server
 libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
-libdata/bonobo/servers/GNOME_StickyNotesApplet.server
 %%PYTHON%%libdata/bonobo/servers/Invest_Applet.server
 libexec/accessx-status-applet
 %%BATTERY%%libexec/battstat-applet-2
@@ -69,20 +58,44 @@ libexec/multiload-applet-2
 libexec/null_applet
 libexec/stickynotes_applet
 libexec/trashapplet
+share/dbus-1/services/org.gnome.panel.applet.AccessxStatusAppletFactory.service
+%%BATTERY%%share/dbus-1/services/org.gnome.panel.applet.BattstatAppletFactory.service
+%%CPUFREQ%%share/dbus-1/services/org.gnome.panel.applet.CPUFreqAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.CharpickerAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.DriveMountAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.GWeatherAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.GeyesAppletFactory.service
+%%COMMANDER%%share/dbus-1/services/org.gnome.panel.applet.MiniCommanderAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.MixerAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.MultiLoadAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.StickyNotesAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.TrashAppletFactory.service
 %%CPUFREQ%%share/dbus-1/system-services/org.gnome.CPUFreqSelector.service
-share/gnome-2.0/ui/GNOME_AccessxApplet.xml
-%%BATTERY%%share/gnome-2.0/ui/GNOME_BattstatApplet.xml
-%%CPUFREQ%%share/gnome-2.0/ui/GNOME_CPUFreqApplet.xml
-share/gnome-2.0/ui/GNOME_CharpickerApplet.xml
-share/gnome-2.0/ui/GNOME_DriveMountApplet.xml
-share/gnome-2.0/ui/GNOME_GWeatherApplet.xml
-share/gnome-2.0/ui/GNOME_GeyesApplet.xml
-%%COMMANDER%%share/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
-share/gnome-2.0/ui/GNOME_MixerApplet.xml
-share/gnome-2.0/ui/GNOME_MultiloadApplet.xml
-share/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml
-share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
+share/gnome-2.0/ui/accessx-status-applet-menu.xml
+%%BATTERY%%share/gnome-2.0/ui/battstat-applet-menu.xml
+share/gnome-2.0/ui/charpick-applet-menu.xml
+%%CPUFREQ%%share/gnome-2.0/ui/cpufreq-applet-menu.xml
+share/gnome-2.0/ui/drivemount-applet-menu.xml
+share/gnome-2.0/ui/geyes-applet-menu.xml
+share/gnome-2.0/ui/gweather-applet-menu.xml
+%%COMMANDER%%share/gnome-2.0/ui/mini-commander-applet-menu.xml
+share/gnome-2.0/ui/mixer-applet-menu.xml
+share/gnome-2.0/ui/multiload-applet-menu.xml
+share/gnome-2.0/ui/stickynotes-applet-menu.xml
+share/gnome-2.0/ui/trashapplet-menu.xml
 %%PYTHON%%share/gnome-2.0/ui/Invest_Applet.xml
+share/gnome-panel/applets/org.gnome.applets.AccessxStatusApplet.panel-applet
+%%BATTERY%%share/gnome-panel/applets/org.gnome.applets.BattstatApplet.panel-applet
+%%CPUFREQ%%share/gnome-panel/applets/org.gnome.applets.CPUFreqApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.CharpickerApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.DriveMountApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.GWeatherApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.GeyesApplet.panel-applet
+%%COMMANDER%%share/gnome-panel/applets/org.gnome.applets.MiniCommanderApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.MixerApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.MultiLoadApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.StickyNotesApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.TrashApplet.panel-applet
 %%BATTERY%%%%DATADIR%%/builder/battstat_applet.ui
 %%CPUFREQ%%%%DATADIR%%/builder/cpufreq-preferences.ui
 %%PYTHON%%%%DATADIR%%/builder/financialchart.ui
@@ -1279,16 +1292,26 @@ share/gnome/help/gweather/zh_CN/figures/stock_weather-snow.png
 share/gnome/help/gweather/zh_CN/figures/stock_weather-storm.png
 share/gnome/help/gweather/zh_CN/figures/stock_weather-sunny.png
 share/gnome/help/gweather/zh_CN/gweather.xml
+%%PYTHON%%share/gnome/help/invest-applet/C/figures/symbol-search.png
 %%PYTHON%%share/gnome/help/invest-applet/C/invest-applet.xml
 %%PYTHON%%share/gnome/help/invest-applet/C/legal.xml
+%%PYTHON%%share/gnome/help/invest-applet/ca/figures/symbol-search.png
 %%PYTHON%%share/gnome/help/invest-applet/ca/invest-applet.xml
-%%PYTHON%%share/gnome/help/invest-applet/en_GB/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/de/figures/symbol-search.png
 %%PYTHON%%share/gnome/help/invest-applet/de/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/el/figures/symbol-search.png
 %%PYTHON%%share/gnome/help/invest-applet/el/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/en_GB/figures/symbol-search.png
+%%PYTHON%%share/gnome/help/invest-applet/en_GB/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/es/figures/symbol-search.png
 %%PYTHON%%share/gnome/help/invest-applet/es/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/fi/figures/symbol-search.png
 %%PYTHON%%share/gnome/help/invest-applet/fi/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/ru/figures/symbol-search.png
 %%PYTHON%%share/gnome/help/invest-applet/ru/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/sv/figures/symbol-search.png
 %%PYTHON%%share/gnome/help/invest-applet/sv/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/zh_CN/figures/symbol-search.png
 %%PYTHON%%share/gnome/help/invest-applet/zh_CN/invest-applet.xml
 share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/C/legal.xml
@@ -2265,15 +2288,25 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/mixer_applet2/C/figures
 @dirrm share/gnome/help/mixer_applet2/C
 @dirrm share/gnome/help/mixer_applet2
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/zh_CN/figures
 %%PYTHON%%@dirrm share/gnome/help/invest-applet/zh_CN
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/sv/figures
 %%PYTHON%%@dirrm share/gnome/help/invest-applet/sv
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/ru/figures
 %%PYTHON%%@dirrm share/gnome/help/invest-applet/ru
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/fi/figures
 %%PYTHON%%@dirrm share/gnome/help/invest-applet/fi
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/es/figures
 %%PYTHON%%@dirrm share/gnome/help/invest-applet/es
-%%PYTHON%%@dirrm share/gnome/help/invest-applet/el
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/en_GB/figures
 %%PYTHON%%@dirrm share/gnome/help/invest-applet/en_GB
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/el/figures
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/el
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/de/figures
 %%PYTHON%%@dirrm share/gnome/help/invest-applet/de
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/ca/figures
 %%PYTHON%%@dirrm share/gnome/help/invest-applet/ca
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/C/figures
 %%PYTHON%%@dirrm share/gnome/help/invest-applet/C
 %%PYTHON%%@dirrm share/gnome/help/invest-applet
 @dirrm share/gnome/help/gweather/zh_CN/figures
@@ -2591,6 +2624,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/accessx-status/C
 @dirrm share/gnome/help/accessx-status
 %%PYTHON%%@dirrm %%DATADIR%%/invest-applet
+@dirrmtry share/gnome-panel/applets
+@dirrmtry share/gnome-panel
 @dirrm %%DATADIR%%/geyes/Tango
 @dirrm %%DATADIR%%/geyes/Horrid
 @dirrm %%DATADIR%%/geyes/Default-tiny