update to 2.18.1

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

8 files changed, 154 insertions, 115 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
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 556bcc211a5..5a436f2b45a 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.76 2007/03/21 12:05:56 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2007/04/11 17:48:09 drochner Exp $
 #
 
-DISTNAME=	control-center-2.16.2
+DISTNAME=	control-center-2.18.1
 PKGNAME=	gnome2-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.16/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.18/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -35,8 +34,8 @@ INSTALL_MAKE_FLAGS+=	vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE}
 GCONF2_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas
 GCONF2_SCHEMAS+=	apps_gnome_settings_daemon_keybindings.schemas
 GCONF2_SCHEMAS+=	apps_gnome_settings_daemon_screensaver.schemas
+GCONF2_SCHEMAS+=	control-center.schemas
 GCONF2_SCHEMAS+=	desktop_gnome_font_rendering.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_peripherals_keyboard_xkb.schemas
 GCONF2_SCHEMAS+=	themus.schemas
 GCONF2_SCHEMAS+=	fontilus.schemas
 
@@ -80,12 +79,15 @@ BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1.2
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../wm/metacity/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
+.include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXxf86misc/buildlink3.mk"
 .include "../../x11/libxklavier/buildlink3.mk"
+.include "../../x11/libgnomekbd/buildlink3.mk"
+.include "../../databases/shared-mime-info/mimedb.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/x11/gnome2-control-center/PLIST b/x11/gnome2-control-center/PLIST
index 9799e592a56..3ea54dbd600 100644
--- a/x11/gnome2-control-center/PLIST
+++ b/x11/gnome2-control-center/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2006/09/15 15:12:40 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.22 2007/04/11 17:48:10 drochner Exp $
 bin/gnome-about-me
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-at-properties
@@ -43,6 +43,7 @@ share/applications/gnome-font-viewer.desktop
 share/applications/gnome-network-preferences.desktop
 share/applications/gnome-settings-mouse.desktop
 share/applications/gnome-settings-sound.desktop
+share/applications/gnome-theme-installer.desktop
 share/applications/gnome-ui-properties.desktop
 share/applications/gnomecc.desktop
 share/applications/gtk-theme-selector.desktop
@@ -50,80 +51,79 @@ share/applications/keybinding.desktop
 share/applications/keyboard.desktop
 share/applications/themus-theme-applier.desktop
 share/applications/window-properties.desktop
-share/control-center-2.0/icons/display-capplet.png
-share/control-center-2.0/interfaces/acme.glade
-share/control-center-2.0/interfaces/apply-font.glade
-share/control-center-2.0/interfaces/at-enable-dialog.glade
-share/control-center-2.0/interfaces/font-properties.glade
-share/control-center-2.0/interfaces/gnome-about-me.glade
-share/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade
-share/control-center-2.0/interfaces/gnome-background-properties.glade
-share/control-center-2.0/interfaces/gnome-default-applications-properties.glade
-share/control-center-2.0/interfaces/gnome-keybinding-properties.glade
-share/control-center-2.0/interfaces/gnome-keyboard-properties.glade
-share/control-center-2.0/interfaces/gnome-mouse-properties.glade
-share/control-center-2.0/interfaces/gnome-network-preferences.glade
-share/control-center-2.0/interfaces/gnome-ui-properties.glade
-share/control-center-2.0/interfaces/gnome-window-properties.glade
-share/control-center-2.0/interfaces/modmap-dialog.glade
-share/control-center-2.0/interfaces/sound-properties.glade
-share/control-center-2.0/interfaces/theme-properties.glade
-share/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png
-share/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png
-share/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png
-share/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png
-share/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png
-share/control-center-2.0/pixmaps/acme-eject.png
-share/control-center-2.0/pixmaps/at-startup.png
-share/control-center-2.0/pixmaps/at-support.png
-share/control-center-2.0/pixmaps/bar-disabled.png
-share/control-center-2.0/pixmaps/bar-green.png
-share/control-center-2.0/pixmaps/bar-red.png
-share/control-center-2.0/pixmaps/bar.png
-share/control-center-2.0/pixmaps/double-click-maybe.png
-share/control-center-2.0/pixmaps/double-click-off.png
-share/control-center-2.0/pixmaps/double-click-on.png
-share/control-center-2.0/pixmaps/gnome-about-me-lock-open.png
-share/control-center-2.0/pixmaps/gnome-about-me-lock.png
-share/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
-share/control-center-2.0/pixmaps/gnome-speakernotes.png
-share/control-center-2.0/pixmaps/keyboard-bell.png
-share/control-center-2.0/pixmaps/keyboard-cursor.png
-share/control-center-2.0/pixmaps/keyboard-repeat.png
-share/control-center-2.0/pixmaps/keyboard-volume.png
-share/control-center-2.0/pixmaps/mouse-cursor-normal-large.png
-share/control-center-2.0/pixmaps/mouse-cursor-normal.png
-share/control-center-2.0/pixmaps/mouse-cursor-white-large.png
-share/control-center-2.0/pixmaps/mouse-cursor-white.png
-share/control-center-2.0/pixmaps/mouse-left.png
-share/control-center-2.0/pixmaps/mouse-right.png
-share/control-center-2.0/pixmaps/ocean-stripes.png
-share/control-center-2.0/pixmaps/stop.png
-share/control-center-2.0/pixmaps/subpixel-bgr.png
-share/control-center-2.0/pixmaps/subpixel-rgb.png
-share/control-center-2.0/pixmaps/subpixel-vbgr.png
-share/control-center-2.0/pixmaps/subpixel-vrgb.png
-share/control-center-2.0/pixmaps/theme-thumbnailing.png
-share/control-center-2.0/pixmaps/visual-bell.png
-share/control-center-2.0/xrdb/Editres.ad
-share/control-center-2.0/xrdb/Emacs.ad
-share/control-center-2.0/xrdb/General.ad
-share/control-center-2.0/xrdb/Motif.ad
-share/control-center-2.0/xrdb/Tk.ad
-share/control-center-2.0/xrdb/Xaw.ad
+share/control-center/glade/acme.glade
+share/control-center/glade/apply-font.glade
+share/control-center/glade/at-enable-dialog.glade
+share/control-center/glade/font-properties.glade
+share/control-center/glade/gnome-about-me.glade
+share/control-center/glade/gnome-accessibility-keyboard-properties.glade
+share/control-center/glade/gnome-background-properties.glade
+share/control-center/glade/gnome-default-applications-properties.glade
+share/control-center/glade/gnome-keybinding-properties.glade
+share/control-center/glade/gnome-keyboard-properties.glade
+share/control-center/glade/gnome-mouse-properties.glade
+share/control-center/glade/gnome-network-preferences.glade
+share/control-center/glade/gnome-ui-properties.glade
+share/control-center/glade/gnome-window-properties.glade
+share/control-center/glade/modmap-dialog.glade
+share/control-center/glade/sound-properties.glade
+share/control-center/glade/theme-properties.glade
+share/control-center/gnome-default-applications.xml
+share/control-center/icons/display-capplet.png
+share/control-center/pixmaps/accessibility-keyboard-bouncekey.png
+share/control-center/pixmaps/accessibility-keyboard-mousekey.png
+share/control-center/pixmaps/accessibility-keyboard-slowkey.png
+share/control-center/pixmaps/accessibility-keyboard-stickykey.png
+share/control-center/pixmaps/accessibility-keyboard-togglekey.png
+share/control-center/pixmaps/acme-eject.png
+share/control-center/pixmaps/at-startup.png
+share/control-center/pixmaps/at-support.png
+share/control-center/pixmaps/bar-disabled.png
+share/control-center/pixmaps/bar-green.png
+share/control-center/pixmaps/bar-red.png
+share/control-center/pixmaps/bar.png
+share/control-center/pixmaps/double-click-maybe.png
+share/control-center/pixmaps/double-click-off.png
+share/control-center/pixmaps/double-click-on.png
+share/control-center/pixmaps/gnome-about-me-lock-open.png
+share/control-center/pixmaps/gnome-about-me-lock.png
+share/control-center/pixmaps/keyboard-bell.png
+share/control-center/pixmaps/keyboard-cursor.png
+share/control-center/pixmaps/keyboard-repeat.png
+share/control-center/pixmaps/keyboard-volume.png
+share/control-center/pixmaps/mouse-cursor-normal-large.png
+share/control-center/pixmaps/mouse-cursor-normal.png
+share/control-center/pixmaps/mouse-cursor-white-large.png
+share/control-center/pixmaps/mouse-cursor-white.png
+share/control-center/pixmaps/mouse-left.png
+share/control-center/pixmaps/mouse-right.png
+share/control-center/pixmaps/ocean-stripes.png
+share/control-center/pixmaps/stop.png
+share/control-center/pixmaps/subpixel-bgr.png
+share/control-center/pixmaps/subpixel-rgb.png
+share/control-center/pixmaps/subpixel-vbgr.png
+share/control-center/pixmaps/subpixel-vrgb.png
+share/control-center/pixmaps/theme-thumbnailing.png
+share/control-center/pixmaps/visual-bell.png
+share/control-center/xrdb/Editres.ad
+share/control-center/xrdb/Emacs.ad
+share/control-center/xrdb/General.ad
+share/control-center/xrdb/Motif.ad
+share/control-center/xrdb/Tk.ad
+share/control-center/xrdb/Xaw.ad
 share/dbus-1/services/org.gnome.SettingsDaemon.service
 share/desktop-directories/font-method.directory
+share/desktop-directories/gnomecc.directory
 share/desktop-directories/theme-method.directory
 share/examples/gnome2-control-center/font-method.conf
 share/examples/gnome2-control-center/theme-method.conf
 share/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
 share/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
 share/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
+share/gconf/schemas/control-center.schemas
 share/gconf/schemas/desktop_gnome_font_rendering.schemas
-share/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
 share/gconf/schemas/fontilus.schemas
 share/gconf/schemas/themus.schemas
-share/gnome-default-applications/gnome-default-applications.xml
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
@@ -142,14 +142,16 @@ share/gnome/help/control-center/C/config-screensaver.xml
 share/gnome/help/control-center/C/config-sound.xml
 share/gnome/help/control-center/C/config-themes.xml
 share/gnome/help/control-center/C/control-center.xml
+share/gnome/help/control-center/en_GB/control-center.xml
 share/gnome/help/control-center/es/control-center.xml
 share/gnome/help/control-center/fr/control-center.xml
+share/gnome/help/control-center/pa/control-center.xml
 share/gnome/help/control-center/ru/control-center.xml
 share/gnome/help/control-center/sv/control-center.xml
+share/gnome/help/control-center/uk/control-center.xml
 share/gnome/help/control-center/zh_CN/control-center.xml
-share/icons/hicolor/48x48/apps/gnome-control-center.png
-share/idl/ConfigArchiver.idl
-share/idl/GNOME_SettingsDaemon.idl
+share/icons/hicolor/48x48/apps/typing-monitor.png
+share/icons/hicolor/scalable/apps/typing-monitor.svg
 share/locale/af/LC_MESSAGES/control-center-2.0.mo
 share/locale/am/LC_MESSAGES/control-center-2.0.mo
 share/locale/ar/LC_MESSAGES/control-center-2.0.mo
@@ -228,39 +230,46 @@ share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 share/locale/zu/LC_MESSAGES/control-center-2.0.mo
+share/mime/packages/gnome-theme-package.xml
 share/omf/control-center/control-center-C.omf
+share/omf/control-center/control-center-en_GB.omf
 share/omf/control-center/control-center-es.omf
 share/omf/control-center/control-center-fr.omf
+share/omf/control-center/control-center-pa.omf
 share/omf/control-center/control-center-ru.omf
 share/omf/control-center/control-center-sv.omf
+share/omf/control-center/control-center-uk.omf
 share/omf/control-center/control-center-zh_CN.omf
 share/pixmaps/display-capplet.png
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/control-center
 @comment in scrollkeeper: @dirrm share/omf
-@comment in ORBit2: @dirrm share/idl
+@comment in shared-mime-info: @dirrm share/mime/packages
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gnome/help/control-center/zh_CN
+@dirrm share/gnome/help/control-center/uk
 @dirrm share/gnome/help/control-center/sv
 @dirrm share/gnome/help/control-center/ru
+@dirrm share/gnome/help/control-center/pa
 @dirrm share/gnome/help/control-center/fr
 @dirrm share/gnome/help/control-center/es
+@dirrm share/gnome/help/control-center/en_GB
 @dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/gnome/cursor-fonts
-@comment in gnome2-dirs: @dirrm share/gnome-default-applications
 @comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/examples/gnome2-control-center
 @comment in xdg-dirs: @dirrm share/desktop-directories
 @comment in dbus: @dirrm share/dbus-1/services
-@dirrm share/control-center-2.0/xrdb
-@dirrm share/control-center-2.0/pixmaps
-@dirrm share/control-center-2.0/interfaces
-@comment in gnome2-dirs: @dirrm share/control-center-2.0/icons
-@comment in gnome2-dirs: @dirrm share/control-center-2.0
+@dirrm share/control-center/xrdb
+@dirrm share/control-center/pixmaps
+@dirrm share/control-center/icons
+@dirrm share/control-center/glade
+@dirrm share/control-center
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/window-manager-settings
 @comment in nautilus: @dirrm lib/nautilus/extensions-1.0
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index 89c270c1414..4a0bf2059d8 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.31 2007/03/27 21:54:04 wiz Exp $
+$NetBSD: distinfo,v 1.32 2007/04/11 17:48:10 drochner Exp $
 
-SHA1 (control-center-2.16.2.tar.bz2) = 0fafa169a358c2c4fcf7d3eadbb1a980416fae17
-RMD160 (control-center-2.16.2.tar.bz2) = f8a45a1c3cbfc3c04d4bd562482e281deea0682b
-Size (control-center-2.16.2.tar.bz2) = 2022817 bytes
+SHA1 (control-center-2.18.1.tar.bz2) = 4325caeb94de9b77cd57fc210f1ba623458a2aa8
+RMD160 (control-center-2.18.1.tar.bz2) = f3980d2348a699f646d87ec27c61f27057594302
+Size (control-center-2.18.1.tar.bz2) = 2150134 bytes
 SHA1 (patch-aa) = 377d07ac5071fa19063cd3ecd47c589c53b81b5a
 SHA1 (patch-ab) = c0561975640562546f612e252a9d239d6dbc695b
-SHA1 (patch-ac) = cb51b7ef6f06628332e143d5501b699d2853f153
 SHA1 (patch-ad) = 15aeffd62733036840d402f1ed3a2f1a89c8945d
 SHA1 (patch-af) = 50f179c3d2775f0a058d7644f6f9a0b958f4b531
+SHA1 (patch-ag) = f97e70275970b19fba8ef149750798570c7ea7b5
diff --git a/x11/gnome2-control-center/patches/patch-ac b/x11/gnome2-control-center/patches/patch-ac
deleted file mode 100644
index 015ef07e426..00000000000
--- a/x11/gnome2-control-center/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2007/03/27 21:54:05 wiz Exp $
-
---- help/C/control-center.xml.orig	2006-11-20 09:14:02.000000000 +0000
-+++ help/C/control-center.xml
-@@ -22,6 +22,17 @@
-       <year>2001, 2002</year>
-       <holder>Ximian, Inc.</holder>
-     </copyright>
-+
-+    <publisher role="maintainer">
-+      <publishername>GNOME Documentation Project</publishername>
-+    </publisher>
-+
-+    <revhistory>
-+      <revision>
-+        <revnumber>2.14</revnumber>
-+        <date>2006-03</date>
-+      </revision>
-+    </revhistory>
-     
-     <legalnotice id="legalnotice">
-       <para>
diff --git a/x11/gnome2-control-center/patches/patch-ag b/x11/gnome2-control-center/patches/patch-ag
new file mode 100644
index 00000000000..3d891ba8c51
--- /dev/null
+++ b/x11/gnome2-control-center/patches/patch-ag
@@ -0,0 +1,11 @@
+$NetBSD: patch-ag,v 1.3 2007/04/11 17:48:10 drochner Exp $
+
+--- libslab/directory-tile.c.orig	2007-04-05 13:32:36.000000000 +0200
++++ libslab/directory-tile.c
+@@ -644,5 +644,5 @@ static void
+ disown_spawned_child (gpointer user_data)
+ {
+ 	setsid  ();
+-	setpgrp ();
++	setpgid (0, 0);
+ }