update to 2.18.1

This moves this pkg to the new stable gnome branch, too much to list here.

3 files changed, 48 insertions, 9 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 7ce997bb122..4f0cd596d71 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.85 2007/03/21 12:05:55 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2007/04/11 17:46:46 drochner Exp $
 #
 
-DISTNAME=		gnome-panel-2.16.3
-PKGREVISION=		1
+DISTNAME=		gnome-panel-2.18.1
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.16/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.18/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST
index 1c3b0606d33..224c924e837 100644
--- a/x11/gnome-panel/PLIST
+++ b/x11/gnome-panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2006/10/17 17:25:04 drochner Exp $
+@comment $NetBSD: PLIST,v 1.32 2007/04/11 17:46:46 drochner Exp $
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/panel-test-applets
@@ -18,6 +18,7 @@ libexec/fish-applet-2
 libexec/notification-area-applet
 libexec/wnck-applet
 man/man1/gnome-panel.1
+share/applications/gnome-panel.desktop
 share/gconf/schemas/clock.schemas
 share/gconf/schemas/fish.schemas
 share/gconf/schemas/panel-compatibility.schemas
@@ -64,6 +65,9 @@ share/gnome/help/clock/nl/legal.xml
 share/gnome/help/clock/pa/clock.xml
 share/gnome/help/clock/pa/figures/clock_applet.png
 share/gnome/help/clock/pa/legal.xml
+share/gnome/help/clock/ru/clock.xml
+share/gnome/help/clock/ru/figures/clock_applet.png
+share/gnome/help/clock/ru/legal.xml
 share/gnome/help/clock/sr/clock.xml
 share/gnome/help/clock/sr/figures/clock_applet.png
 share/gnome/help/clock/sr/legal.xml
@@ -146,6 +150,14 @@ share/gnome/help/window-list/ko/figures/window_list_group.png
 share/gnome/help/window-list/ko/figures/window_list_group_applet.png
 share/gnome/help/window-list/ko/legal.xml
 share/gnome/help/window-list/ko/window-list.xml
+share/gnome/help/window-list/pa/figures/window_list_applet.png
+share/gnome/help/window-list/pa/figures/window_list_group_applet.png
+share/gnome/help/window-list/pa/legal.xml
+share/gnome/help/window-list/pa/window-list.xml
+share/gnome/help/window-list/ru/figures/window_list_applet.png
+share/gnome/help/window-list/ru/figures/window_list_group_applet.png
+share/gnome/help/window-list/ru/legal.xml
+share/gnome/help/window-list/ru/window-list.xml
 share/gnome/help/window-list/sv/figures/window_list_applet.png
 share/gnome/help/window-list/sv/figures/window_list_group_applet.png
 share/gnome/help/window-list/sv/legal.xml
@@ -189,6 +201,12 @@ share/gnome/help/workspace-switcher/ko/workspace-switcher.xml
 share/gnome/help/workspace-switcher/nl/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/nl/legal.xml
 share/gnome/help/workspace-switcher/nl/workspace-switcher.xml
+share/gnome/help/workspace-switcher/pa/figures/workspace_switcher_applet.png
+share/gnome/help/workspace-switcher/pa/legal.xml
+share/gnome/help/workspace-switcher/pa/workspace-switcher.xml
+share/gnome/help/workspace-switcher/ru/figures/workspace_switcher_applet.png
+share/gnome/help/workspace-switcher/ru/legal.xml
+share/gnome/help/workspace-switcher/ru/workspace-switcher.xml
 share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/sv/legal.xml
 share/gnome/help/workspace-switcher/sv/workspace-switcher.xml
@@ -239,6 +257,7 @@ share/icons/hicolor/16x16/apps/gnome-panel-clock.png
 share/icons/hicolor/16x16/apps/gnome-panel-drawer.png
 share/icons/hicolor/16x16/apps/gnome-panel-fish.png
 share/icons/hicolor/16x16/apps/gnome-panel-force-quit.png
+share/icons/hicolor/16x16/apps/gnome-panel-launcher.png
 share/icons/hicolor/16x16/apps/gnome-panel-notification-area.png
 share/icons/hicolor/16x16/apps/gnome-panel-separator.png
 share/icons/hicolor/16x16/apps/gnome-panel-window-list.png
@@ -249,6 +268,7 @@ share/icons/hicolor/22x22/apps/gnome-panel-clock.png
 share/icons/hicolor/22x22/apps/gnome-panel-drawer.png
 share/icons/hicolor/22x22/apps/gnome-panel-fish.png
 share/icons/hicolor/22x22/apps/gnome-panel-force-quit.png
+share/icons/hicolor/22x22/apps/gnome-panel-launcher.png
 share/icons/hicolor/22x22/apps/gnome-panel-notification-area.png
 share/icons/hicolor/22x22/apps/gnome-panel-separator.png
 share/icons/hicolor/22x22/apps/gnome-panel-window-list.png
@@ -259,6 +279,7 @@ share/icons/hicolor/24x24/apps/gnome-panel-clock.png
 share/icons/hicolor/24x24/apps/gnome-panel-drawer.png
 share/icons/hicolor/24x24/apps/gnome-panel-fish.png
 share/icons/hicolor/24x24/apps/gnome-panel-force-quit.png
+share/icons/hicolor/24x24/apps/gnome-panel-launcher.png
 share/icons/hicolor/24x24/apps/gnome-panel-notification-area.png
 share/icons/hicolor/24x24/apps/gnome-panel-separator.png
 share/icons/hicolor/24x24/apps/gnome-panel-window-list.png
@@ -269,6 +290,7 @@ share/icons/hicolor/32x32/apps/gnome-panel-clock.png
 share/icons/hicolor/32x32/apps/gnome-panel-drawer.png
 share/icons/hicolor/32x32/apps/gnome-panel-fish.png
 share/icons/hicolor/32x32/apps/gnome-panel-force-quit.png
+share/icons/hicolor/32x32/apps/gnome-panel-launcher.png
 share/icons/hicolor/32x32/apps/gnome-panel-notification-area.png
 share/icons/hicolor/32x32/apps/gnome-panel-separator.png
 share/icons/hicolor/32x32/apps/gnome-panel-window-list.png
@@ -279,6 +301,7 @@ share/icons/hicolor/scalable/apps/gnome-panel-clock.svg
 share/icons/hicolor/scalable/apps/gnome-panel-drawer.svg
 share/icons/hicolor/scalable/apps/gnome-panel-fish.svg
 share/icons/hicolor/scalable/apps/gnome-panel-force-quit.svg
+share/icons/hicolor/scalable/apps/gnome-panel-launcher.svg
 share/icons/hicolor/scalable/apps/gnome-panel-notification-area.svg
 share/icons/hicolor/scalable/apps/gnome-panel-separator.svg
 share/icons/hicolor/scalable/apps/gnome-panel-window-list.svg
@@ -291,6 +314,7 @@ share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-panel-2.0.mo
@@ -379,6 +403,7 @@ share/omf/clock/clock-ja.omf
 share/omf/clock/clock-ko.omf
 share/omf/clock/clock-nl.omf
 share/omf/clock/clock-pa.omf
+share/omf/clock/clock-ru.omf
 share/omf/clock/clock-sr.omf
 share/omf/clock/clock-sv.omf
 share/omf/clock/clock-uk.omf
@@ -408,6 +433,8 @@ share/omf/window-list/window-list-C.omf
 share/omf/window-list/window-list-es.omf
 share/omf/window-list/window-list-fr.omf
 share/omf/window-list/window-list-it.omf
+share/omf/window-list/window-list-pa.omf
+share/omf/window-list/window-list-ru.omf
 share/omf/window-list/window-list-sv.omf
 share/omf/window-list/window-list-uk.omf
 share/omf/window-list/window-list-zh_CN.omf
@@ -416,6 +443,8 @@ share/omf/workspace-switcher/workspace-switcher-es.omf
 share/omf/workspace-switcher/workspace-switcher-fr.omf
 share/omf/workspace-switcher/workspace-switcher-it.omf
 share/omf/workspace-switcher/workspace-switcher-nl.omf
+share/omf/workspace-switcher/workspace-switcher-pa.omf
+share/omf/workspace-switcher/workspace-switcher-ru.omf
 share/omf/workspace-switcher/workspace-switcher-sv.omf
 share/omf/workspace-switcher/workspace-switcher-uk.omf
 @dirrm share/omf/workspace-switcher
@@ -444,6 +473,10 @@ share/omf/workspace-switcher/workspace-switcher-uk.omf
 @dirrm share/gnome/help/workspace-switcher/uk
 @dirrm share/gnome/help/workspace-switcher/sv/figures
 @dirrm share/gnome/help/workspace-switcher/sv
+@dirrm share/gnome/help/workspace-switcher/ru/figures
+@dirrm share/gnome/help/workspace-switcher/ru
+@dirrm share/gnome/help/workspace-switcher/pa/figures
+@dirrm share/gnome/help/workspace-switcher/pa
 @dirrm share/gnome/help/workspace-switcher/nl/figures
 @dirrm share/gnome/help/workspace-switcher/nl
 @dirrm share/gnome/help/workspace-switcher/ko/figures
@@ -469,6 +502,10 @@ share/omf/workspace-switcher/workspace-switcher-uk.omf
 @dirrm share/gnome/help/window-list/uk
 @dirrm share/gnome/help/window-list/sv/figures
 @dirrm share/gnome/help/window-list/sv
+@dirrm share/gnome/help/window-list/ru/figures
+@dirrm share/gnome/help/window-list/ru
+@dirrm share/gnome/help/window-list/pa/figures
+@dirrm share/gnome/help/window-list/pa
 @dirrm share/gnome/help/window-list/ko/figures
 @dirrm share/gnome/help/window-list/ko
 @dirrm share/gnome/help/window-list/ja/figures
@@ -518,6 +555,8 @@ share/omf/workspace-switcher/workspace-switcher-uk.omf
 @dirrm share/gnome/help/clock/sv
 @dirrm share/gnome/help/clock/sr/figures
 @dirrm share/gnome/help/clock/sr
+@dirrm share/gnome/help/clock/ru/figures
+@dirrm share/gnome/help/clock/ru
 @dirrm share/gnome/help/clock/pa/figures
 @dirrm share/gnome/help/clock/pa
 @dirrm share/gnome/help/clock/nl/figures
@@ -541,5 +580,6 @@ share/omf/workspace-switcher/workspace-switcher-uk.omf
 @comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
 @comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf2: @dirrm share/gconf/schemas
+@comment in xdg-dirs: @dirrm share/applications
 @comment in libbonobo: @dirrm lib/bonobo/servers
 @dirrm include/panel-2.0
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index d4c978062e2..7787e38b796 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.33 2007/02/02 20:07:38 wiz Exp $
+$NetBSD: distinfo,v 1.34 2007/04/11 17:46:46 drochner Exp $
 
-SHA1 (gnome-panel-2.16.3.tar.bz2) = 3581ddaf05a75e4a3ed02dee90609b47a5ef346b
-RMD160 (gnome-panel-2.16.3.tar.bz2) = 973587c05bf8c984492aacd32516629272e00171
-Size (gnome-panel-2.16.3.tar.bz2) = 2692203 bytes
+SHA1 (gnome-panel-2.18.1.tar.bz2) = c690833d3e409cb9b22413aa987163b9d6d3b8b4
+RMD160 (gnome-panel-2.18.1.tar.bz2) = 380a87bb366ed788110eea55803e33a3b519ca93
+Size (gnome-panel-2.18.1.tar.bz2) = 2713127 bytes