Update to 2.22.1.

9 files changed, 103 insertions, 65 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 3fd7606c00a4..eaf94524d7f7 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gnome-applets
-PORTVERSION=	2.22.0
+PORTVERSION=	2.22.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,7 +18,7 @@ COMMENT=	Applets components for the GNOME 2 Desktop Environment
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
-		gweather.0:${PORTSDIR}/net/libgweather \
+		gweather.1:${PORTSDIR}/net/libgweather \
 		xklavier.12:${PORTSDIR}/x11/libxklavier \
 		gucharmap.6:${PORTSDIR}/deskutils/gucharmap
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 1615f44453d4..fdd0c23d693a 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.22.0.tar.bz2) = cd31cc9171cc350e7d0074b1a8092fbd
-SHA256 (gnome2/gnome-applets-2.22.0.tar.bz2) = d63979ad23873a2ba0f9e36a399c1fedf8311da7f7dd65d4288f5da99e4c150b
-SIZE (gnome2/gnome-applets-2.22.0.tar.bz2) = 6923842
+MD5 (gnome2/gnome-applets-2.22.1.tar.bz2) = d6df0a48c875b77a4fafe47fc81bde29
+SHA256 (gnome2/gnome-applets-2.22.1.tar.bz2) = 9154ba13e85ca5c0b90752f94a39fa976b28791eb1460139af16dd9d9d8bf88b
+SIZE (gnome2/gnome-applets-2.22.1.tar.bz2) = 7230966
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 29aa4df4550c..57da678f7081 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -168,6 +168,18 @@ share/gnome/help/accessx-status/es/figures/accessx_sticky-keys.png
 share/gnome/help/accessx-status/es/figures/accessx_sticky-meta-key.png
 share/gnome/help/accessx-status/es/figures/accessx_sticky-shift-key.png
 share/gnome/help/accessx-status/es/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/fi/accessx-status.xml
+share/gnome/help/accessx-status/fi/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/fi/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/fi/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/fi/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/fi/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/fi/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/fi/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/fi/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/fi/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/fi/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/fi/figures/accessx_sticky-windows-key.png
 share/gnome/help/accessx-status/fr/accessx-status.xml
 share/gnome/help/accessx-status/fr/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/fr/figures/accessx-status-disabled.png
@@ -253,6 +265,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
 %%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-credits-hal.png
 %%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-preferences.png
 %%BATTERY%%share/gnome/help/battstat/bg/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/el/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/el/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/el/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/el/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/el/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/el/figures/context-menu.png
 %%BATTERY%%share/gnome/help/battstat/en_GB/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-applet-expanded.png
 %%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-applet.png
@@ -265,6 +283,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
 %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-credits-hal.png
 %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-preferences.png
 %%BATTERY%%share/gnome/help/battstat/es/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/fi/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/fi/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/fi/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/fi/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/fi/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/fi/figures/context-menu.png
 %%BATTERY%%share/gnome/help/battstat/fr/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet-expanded.png
 %%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet.png
@@ -333,6 +357,11 @@ share/gnome/help/char-palette/es/figures/charpalette_applet.png
 share/gnome/help/char-palette/es/figures/charpalette_chargroup.png
 share/gnome/help/char-palette/es/figures/charpick-preferences.png
 share/gnome/help/char-palette/es/figures/charpick_characters.png
+share/gnome/help/char-palette/fi/char-palette.xml
+share/gnome/help/char-palette/fi/figures/charpalette_applet.png
+share/gnome/help/char-palette/fi/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/fi/figures/charpick-preferences.png
+share/gnome/help/char-palette/fi/figures/charpick_characters.png
 share/gnome/help/char-palette/fr/char-palette.xml
 share/gnome/help/char-palette/fr/figures/charpalette_applet.png
 share/gnome/help/char-palette/fr/figures/charpalette_chargroup.png
@@ -456,6 +485,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector-both.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fi/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fi/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fi/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fi/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fi/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fi/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fi/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fi/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fi/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fi/figures/cpufreq-applet.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/cpufreq-applet.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-100.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-25.png
@@ -555,6 +594,12 @@ share/gnome/help/drivemount/es/figures/drivemount-applet_example.png
 share/gnome/help/drivemount/es/figures/drivemount-applet_mount.png
 share/gnome/help/drivemount/es/figures/drivemount-applet_open.png
 share/gnome/help/drivemount/es/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/fi/drivemount.xml
+share/gnome/help/drivemount/fi/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/fi/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/fi/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/fi/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/fi/figures/drivemount-applet_status.png
 share/gnome/help/drivemount/fr/drivemount.xml
 share/gnome/help/drivemount/fr/figures/drivemount-applet_eject.png
 share/gnome/help/drivemount/fr/figures/drivemount-applet_example.png
@@ -622,6 +667,8 @@ share/gnome/help/geyes/en_GB/figures/geyes_applet.png
 share/gnome/help/geyes/en_GB/geyes.xml
 share/gnome/help/geyes/es/figures/geyes_applet.png
 share/gnome/help/geyes/es/geyes.xml
+share/gnome/help/geyes/fi/figures/geyes_applet.png
+share/gnome/help/geyes/fi/geyes.xml
 share/gnome/help/geyes/fr/figures/geyes_applet.png
 share/gnome/help/geyes/fr/geyes.xml
 share/gnome/help/geyes/it/figures/geyes_applet.png
@@ -642,6 +689,7 @@ share/gnome/help/gswitchit/ca/gswitchit.xml
 share/gnome/help/gswitchit/el/gswitchit.xml
 share/gnome/help/gswitchit/en_GB/gswitchit.xml
 share/gnome/help/gswitchit/es/gswitchit.xml
+share/gnome/help/gswitchit/fi/gswitchit.xml
 share/gnome/help/gswitchit/fr/gswitchit.xml
 share/gnome/help/gswitchit/oc/gswitchit.xml
 share/gnome/help/gswitchit/ru/gswitchit.xml
@@ -978,6 +1026,8 @@ share/gnome/help/trashapplet/C/legal.xml
 share/gnome/help/trashapplet/C/trashapplet.xml
 share/gnome/help/trashapplet/ca/figures/trash-applet.png
 share/gnome/help/trashapplet/ca/trashapplet.xml
+share/gnome/help/trashapplet/da/figures/trash-applet.png
+share/gnome/help/trashapplet/da/trashapplet.xml
 share/gnome/help/trashapplet/de/figures/trash-applet.png
 share/gnome/help/trashapplet/de/trashapplet.xml
 share/gnome/help/trashapplet/en_GB/figures/trash-applet.png
@@ -1128,6 +1178,7 @@ share/omf/accessx-status/accessx-status-bg.omf
 share/omf/accessx-status/accessx-status-ca.omf
 share/omf/accessx-status/accessx-status-en_GB.omf
 share/omf/accessx-status/accessx-status-es.omf
+share/omf/accessx-status/accessx-status-fi.omf
 share/omf/accessx-status/accessx-status-fr.omf
 share/omf/accessx-status/accessx-status-it.omf
 share/omf/accessx-status/accessx-status-nl.omf
@@ -1136,8 +1187,10 @@ share/omf/accessx-status/accessx-status-sv.omf
 share/omf/accessx-status/accessx-status-uk.omf
 %%BATTERY%%share/omf/battstat/battstat-C.omf
 %%BATTERY%%share/omf/battstat/battstat-bg.omf
+%%BATTERY%%share/omf/battstat/battstat-el.omf
 %%BATTERY%%share/omf/battstat/battstat-en_GB.omf
 %%BATTERY%%share/omf/battstat/battstat-es.omf
+%%BATTERY%%share/omf/battstat/battstat-fi.omf
 %%BATTERY%%share/omf/battstat/battstat-fr.omf
 %%BATTERY%%share/omf/battstat/battstat-ko.omf
 %%BATTERY%%share/omf/battstat/battstat-oc.omf
@@ -1150,6 +1203,7 @@ share/omf/char-palette/char-palette-bg.omf
 share/omf/char-palette/char-palette-ca.omf
 share/omf/char-palette/char-palette-en_GB.omf
 share/omf/char-palette/char-palette-es.omf
+share/omf/char-palette/char-palette-fi.omf
 share/omf/char-palette/char-palette-fr.omf
 share/omf/char-palette/char-palette-it.omf
 share/omf/char-palette/char-palette-ko.omf
@@ -1172,6 +1226,7 @@ share/omf/char-palette/char-palette-uk.omf
 %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-ca.omf
 %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-en_GB.omf
 %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-es.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-fi.omf
 %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-fr.omf
 %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-nl.omf
 %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-oc.omf
@@ -1183,6 +1238,7 @@ share/omf/char-palette/char-palette-uk.omf
 share/omf/drivemount/drivemount-C.omf
 share/omf/drivemount/drivemount-en_GB.omf
 share/omf/drivemount/drivemount-es.omf
+share/omf/drivemount/drivemount-fi.omf
 share/omf/drivemount/drivemount-fr.omf
 share/omf/drivemount/drivemount-it.omf
 share/omf/drivemount/drivemount-ko.omf
@@ -1198,6 +1254,7 @@ share/omf/geyes/geyes-ca.omf
 share/omf/geyes/geyes-de.omf
 share/omf/geyes/geyes-en_GB.omf
 share/omf/geyes/geyes-es.omf
+share/omf/geyes/geyes-fi.omf
 share/omf/geyes/geyes-fr.omf
 share/omf/geyes/geyes-it.omf
 share/omf/geyes/geyes-ko.omf
@@ -1210,6 +1267,7 @@ share/omf/gswitchit/gswitchit-ca.omf
 share/omf/gswitchit/gswitchit-el.omf
 share/omf/gswitchit/gswitchit-en_GB.omf
 share/omf/gswitchit/gswitchit-es.omf
+share/omf/gswitchit/gswitchit-fi.omf
 share/omf/gswitchit/gswitchit-fr.omf
 share/omf/gswitchit/gswitchit-oc.omf
 share/omf/gswitchit/gswitchit-ru.omf
@@ -1265,6 +1323,7 @@ share/omf/stickynotes_applet/stickynotes_applet-sv.omf
 share/omf/stickynotes_applet/stickynotes_applet-uk.omf
 share/omf/trashapplet/trashapplet-C.omf
 share/omf/trashapplet/trashapplet-ca.omf
+share/omf/trashapplet/trashapplet-da.omf
 share/omf/trashapplet/trashapplet-de.omf
 share/omf/trashapplet/trashapplet-en_GB.omf
 share/omf/trashapplet/trashapplet-es.omf
@@ -1447,6 +1506,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/trashapplet/en_GB
 @dirrm share/gnome/help/trashapplet/de/figures
 @dirrm share/gnome/help/trashapplet/de
+@dirrm share/gnome/help/trashapplet/da/figures
+@dirrm share/gnome/help/trashapplet/da
 @dirrm share/gnome/help/trashapplet/ca/figures
 @dirrm share/gnome/help/trashapplet/ca
 @dirrm share/gnome/help/trashapplet/C/figures
@@ -1557,6 +1618,7 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/gswitchit/ru
 @dirrm share/gnome/help/gswitchit/oc
 @dirrm share/gnome/help/gswitchit/fr
+@dirrm share/gnome/help/gswitchit/fi
 @dirrm share/gnome/help/gswitchit/es
 @dirrm share/gnome/help/gswitchit/en_GB
 @dirrm share/gnome/help/gswitchit/el
@@ -1577,6 +1639,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/geyes/it
 @dirrm share/gnome/help/geyes/fr/figures
 @dirrm share/gnome/help/geyes/fr
+@dirrm share/gnome/help/geyes/fi/figures
+@dirrm share/gnome/help/geyes/fi
 @dirrm share/gnome/help/geyes/es/figures
 @dirrm share/gnome/help/geyes/es
 @dirrm share/gnome/help/geyes/en_GB/figures
@@ -1608,6 +1672,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/drivemount/it
 @dirrm share/gnome/help/drivemount/fr/figures
 @dirrm share/gnome/help/drivemount/fr
+@dirrm share/gnome/help/drivemount/fi/figures
+@dirrm share/gnome/help/drivemount/fi
 @dirrm share/gnome/help/drivemount/es/figures
 @dirrm share/gnome/help/drivemount/es
 @dirrm share/gnome/help/drivemount/en_GB/figures
@@ -1631,6 +1697,8 @@ share/xmodmap/xmodmap.yu
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr/figures
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fi/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fi
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es/figures
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB/figures
@@ -1677,6 +1745,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/char-palette/it
 @dirrm share/gnome/help/char-palette/fr/figures
 @dirrm share/gnome/help/char-palette/fr
+@dirrm share/gnome/help/char-palette/fi/figures
+@dirrm share/gnome/help/char-palette/fi
 @dirrm share/gnome/help/char-palette/es/figures
 @dirrm share/gnome/help/char-palette/es
 @dirrm share/gnome/help/char-palette/en_GB/figures
@@ -1702,10 +1772,14 @@ share/xmodmap/xmodmap.yu
 %%BATTERY%%@dirrm share/gnome/help/battstat/ko
 %%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/fr
+%%BATTERY%%@dirrm share/gnome/help/battstat/fi/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/fi
 %%BATTERY%%@dirrm share/gnome/help/battstat/es/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/es
 %%BATTERY%%@dirrm share/gnome/help/battstat/en_GB/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/en_GB
+%%BATTERY%%@dirrm share/gnome/help/battstat/el/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/el
 %%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/bg
 %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
@@ -1723,6 +1797,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/accessx-status/it
 @dirrm share/gnome/help/accessx-status/fr/figures
 @dirrm share/gnome/help/accessx-status/fr
+@dirrm share/gnome/help/accessx-status/fi/figures
+@dirrm share/gnome/help/accessx-status/fi
 @dirrm share/gnome/help/accessx-status/es/figures
 @dirrm share/gnome/help/accessx-status/es
 @dirrm share/gnome/help/accessx-status/en_GB/figures
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 817e3850b5cc..8d930c00e29c 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	gnome-panel
-PORTVERSION=	2.22.0
-PORTREVISION?=	3
+PORTVERSION=	2.22.1
+PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	gweather.0:${PORTSDIR}/net/libgweather \
+LIB_DEPENDS=	gweather.1:${PORTSDIR}/net/libgweather \
     		polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome
 
 USE_GETTEXT=	yes
@@ -69,8 +69,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -type f | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -e \
 		's|"applications.menu"|"gnome-applications.menu"|'
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
-	    	${WRKSRC}/applets/clock/gweather-xml.c
 .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
 	( ${OSVERSION} < 503101 )
 .for po in da.po it.po zh_CN.po zh_TW.po
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 57f37c4c59d5..d5bc43d7667c 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.22.0.tar.bz2) = fe10c920c1f182a2bd5dba98863c786c
-SHA256 (gnome2/gnome-panel-2.22.0.tar.bz2) = 8b2152b35e3d82a640c383b29e99a322595dca23269450ad8d3182bdd94b308a
-SIZE (gnome2/gnome-panel-2.22.0.tar.bz2) = 3267787
+MD5 (gnome2/gnome-panel-2.22.1.tar.bz2) = fb497e544c3873fffe9c12059838231b
+SHA256 (gnome2/gnome-panel-2.22.1.tar.bz2) = 60e1c8c65d069fd9129d681874c9fae9a3390b0b7a7fb484b1a09e683efac0c6
+SIZE (gnome2/gnome-panel-2.22.1.tar.bz2) = 3243201
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-location.c b/x11/gnome-panel/files/patch-applets_clock_clock-location.c
index 1bb485f32586..405c4b89634e 100644
--- a/x11/gnome-panel/files/patch-applets_clock_clock-location.c
+++ b/x11/gnome-panel/files/patch-applets_clock_clock-location.c
@@ -1,8 +1,8 @@
---- applets/clock/clock-location.c.orig	2008-03-22 21:14:45.000000000 -0400
-+++ applets/clock/clock-location.c	2008-03-23 02:11:34.000000000 -0400
-@@ -28,6 +28,8 @@
+--- applets/clock/clock-location.c.orig	2008-04-07 17:17:51.000000000 -0400
++++ applets/clock/clock-location.c	2008-04-07 22:54:31.000000000 -0400
+@@ -27,6 +27,8 @@
+ #include "clock-marshallers.h"
  #include "set-timezone.h"
- #include "gweather-xml.h"
  
 +#define daylight 1
 +
@@ -17,15 +17,7 @@
  
  #define PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CLOCK_LOCATION_TYPE, ClockLocationPrivate))
  
-@@ -271,7 +274,6 @@ parse_etc_sysconfig_clock (void)
- 			}
- 		}
- 	}
--
- out:
- 	if (lines)
- 		g_strfreev (lines);
-@@ -298,7 +300,11 @@ zone_from_etc_sysconfig_clock (void)
+@@ -299,7 +302,11 @@ zone_from_etc_sysconfig_clock (void)
  
  		parse_etc_sysconfig_clock ();
  		
@@ -37,8 +29,8 @@
  
  		monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE,
  					       NULL, NULL);
-@@ -632,10 +638,17 @@ gboolean
- clock_location_is_current (ClockLocation *loc)
+@@ -642,12 +649,18 @@ gboolean
+ clock_location_is_current_timezone (ClockLocation *loc)
  {
          ClockLocationPrivate *priv = PRIVATE (loc);
 -	const char *zone;
@@ -47,13 +39,16 @@
  
 -	if ((zone = zone_from_etc_sysconfig_clock ()))
 +	zones = clock_zonetable_new (SYSTEM_ZONEINFODIR);
-+
 +	if ((zone = clock_location_guess_zone (zones))) {
 +		g_object_unref (zones);
  		return strcmp (zone, priv->timezone) == 0;
+-	else
+-		return clock_location_get_offset (loc) == 0;
 +	}
 +
 +	g_object_unref (zones);
- 
- 	return clock_location_get_offset (loc) == 0;
++
++	return clock_location_get_offset (loc) == 0;
  }
+ 
+ gboolean
diff --git a/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c b/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c
deleted file mode 100644
index 7ae87fdd360f..000000000000
--- a/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- applets/clock/gweather-xml.c.orig	2008-01-23 00:51:33.000000000 -0500
-+++ applets/clock/gweather-xml.c	2008-01-23 00:52:35.000000000 -0500
-@@ -359,7 +359,7 @@ gweather_xml_load_locations( GtkTreeView
- #ifdef GWEATHER_XML_LOCATION
-   xml = xmlNewTextReaderFilename (GWEATHER_XML_LOCATION "Locations.xml");
- #else
--  xml = xmlNewTextReaderFilename ("/usr/share/gnome-applets/gweather/Locations.xml");
-+  xml = xmlNewTextReaderFilename ("/usr/local/share/libgweather/Locations.xml");
- #endif
-   if( xml == NULL )
-     goto error_out;
diff --git a/x11/gnome-panel/files/patch-applets_clock_set-timezone.c b/x11/gnome-panel/files/patch-applets_clock_set-timezone.c
deleted file mode 100644
index 3a9fb4ae9fa8..000000000000
--- a/x11/gnome-panel/files/patch-applets_clock_set-timezone.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- trunk/applets/clock/set-timezone.c	2008/02/28 20:48:16	10908
-+++ applets/clock/set-timezone.c	2008/04/02 15:08:34	10972
-@@ -139,6 +139,9 @@
-         DBusError dbus_error;
- 	gint res = 0;
- 
-+        pk_caller = NULL;
-+        pk_action = NULL;
-+
- 	system_bus = dbus_g_connection_get_connection (get_system_bus ());
- 	if (system_bus == NULL)
- 		goto out;
-@@ -147,9 +150,6 @@
- 	if (pk_context == NULL)
- 		goto out;
- 	
--        pk_caller = NULL;
--        pk_action = NULL;
--
-         pk_action = polkit_action_new ();
-         polkit_action_set_action_id (pk_action, pk_action_id);
- 
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 776e004791d3..64030194a50b 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -42,7 +42,6 @@ share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
 %%DATADIR%%/glade/panel-properties-dialog.glade
 %%DATADIR%%/glade/panel-run-dialog.glade
 %%DATADIR%%/glade/panel-test-applets.glade
-%%DATADIR%%/glade/timezone.glade
 %%DATADIR%%/glade/window-list.glade
 %%DATADIR%%/glade/workspace-switcher.glade
 %%DATADIR%%/iso3166.tab
@@ -311,6 +310,7 @@ share/locale/eu/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fa/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/fur/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gu/LC_MESSAGES/gnome-panel-2.0.mo
@@ -607,6 +607,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES