Update to 2.16.0:

gnome-control-center 2.16.0

background:
- avoid excess strduping (Kjartan Maraas) (#352252)

keyboard:
- avoid extra key events processing (Matthias Clasen) (#352776)

settings daemon:
- avoid grabbing all keyboard when the key code cannot be retrieved
  (Andre Klapper) (#170318)

theme-switcher:
- add missing maximize button (Thomas Wood) (#331835)

Translations:
- bg (Alexander Shopov)
- bn_IN (Runa Bhattacharjee)
- el (Kostas Papadimas)
- et (Priit Laes)
- fr (Christophe Merlet)
- hi (Rajesh Ranjan)
- hu (Gabor Kelemen)
- ka (Vladimer Sichinava)
- lt (Gintautas Miliauskas)
- lv (Raivis Dejus)
- mk (Jovan Naumovski)
- ml (Ani Peter)
- mr (Rahul Bhalerao)
- or (Subhransu Behera)
- pt (Duarte Loreto)
- pt_BR (Lucas Rocha)
- ru (Leonid Kanter)
- sv (Daniel Nylander)
- ta (I. Felix)
- th (Theppitak Karoonboonyanan)
- zh_HK (Chao-Hsiung Liao, Abel Cheung)
- zh_TW (Chao-Hsiung Liao, Abel Cheung)

------------------------------------------------------------------------------
gnome-control-center 2.15.92

background:
- fix "Background dialogue resizes when shown" (Rodney Dawes) (#332830)

common:
- fix issues with the themes previews (Benjamin Otte, Thomas Wood)
  (#351378, #171634)

display:
- free 'resolution' string after using it, not before
  (Kjartan Maraas, Rodrigo Moya)

mouse:
- also display the default theme (though without a preview
  for technical reasons) (Sven Herzberg) (#322514)

sound:
- fix memory leak (Christian Persch)(#350566)

theme-switcher:
- patches from "generate visible previews first" (Benjamin Otte) (#351521)

Translators:
Rostislav \"zbrox\" Raykov (bg)
Josep Puigdemont (ca)
Jakub Friedl (cs)
Hendrik Richter (de)
Mindu Dorji (dz)
David Lodge (en_GB)
Ivar Smolin (et)
Ilkka Tuohela (fi)
Alastair McKinstry (ga)
Ignacio Casal Quinteiro (gl)
Ankit Patel (gu)
Rajesh Ranjan (hi)
Mate ORY (hu)
Satoru SATOH (ja)
Changwoo Ryu (ko)
Jovan Naumovski (mk)
Ani Peter (ml)
Badral (mn)
Rahul Bhalerao (mr)
Kjartan Maraas (nb)
Wouter Bolsterlee (nl)
Subhransu Behera (or)
A S Alam (pa)
Evandro Fernandes Giovanini (pt_BR)
Dan Damian (ro)
Leonid Kanter (ru)
Steve Murphy (rw)
Matic ´gur (sl)
Daniel Nylander (sv)
Theppitak Karoonboonyanan (th)
Maxim V. Dziumanenko (uk)
Clytie Siddall (vi)
Funda Wang (zh_CN)

------------------------------------------------------------------------------
gnome-control-center 2.15.91

misc:
- require libebook-1.2 1.7.90 for the new API (Sebastien Bacher)

about-me:
- fixed build with the new libebook API (Sebastien Bacher) (#348821)

at-properties:
- fixed X-GNOME-Bugzilla fields in .desktop file (Rodrigo Moya) (#348832)
- use orca screenreader when available (Willie Walker) (#348630)

display:
- fix build with gcc-2.95 (Jens Granseuer) (#347611)
	- fixed X-GNOME-Bugzilla fields in .desktop file (Rodrigo Moya) (#348838)

keybindings:
- don't assume defines are contiguous (Gary Coady) (#333576)

keyboard:
- fixed X-GNOME-Bugzilla fields in .desktop file (Rodrigo Moya) (#348847)

libgswitchit:
- using Unicode subscript for repeating descriptions (Sergey Udaltsov)

network:
- set "label for" and "labelled by" properties for the capplet (Willie Walker)
  (#342121)

sound:
- removed unneeded header file (Klaus Pedersen) (#349254)
- only include libhal if HAL is enabled (Ali Akcaagac) (#348755)

theme-switcher:
- added support for locking down theme (Rob Bradford) (#346041)
- don't attempt to load window manager theme name from an unknown window
  manager (Thomas Wood) (#333276)

typing-break:
- use GtkAboutDialog, not GtkDialog (Vincent Untz) (#348640)
- use GtkStatusIcon instead of libegg (Vincent Untz) (#348639)

ui-properties:
- fixed X-GNOME-Bugzilla fields in .desktop file (Rodrigo Moya) (#348844)

updated translations:
- bg (Alexander Shopov)
- cs (Jakub Friedl)
- es (Francisco Javier F. Serrador)
- fi (Ilkka Tuohela)
- fr (Christophe Merlet)
- gu (Ankit Patel)
- lt (Zygimantas Berucka)
- mk (Jovan Naumovski)
- nb (Kjartan Maraas)
- nl (Vincent van Adrighem)
- th (Theppitak Karoonboonyanan)
- zh_HK (Chao-Hsiung Liao)
- zh_TW (Chao-Hsiung Liao)

------------------------------------------------------------------------------
gnome-control-center 2.15.90

misc:
- add an encoding key to some .directory.in (Vincent Fretin) (#338593)
- don't use the Application category for the .desktops, use
  HardwareSettings for some (Vincent Fretin) (#344321)
- made gconf-property-editor.c use GtkColorButton instead of GnomeColorPicker
  (Kevin Bauder) (#171680)

mouse:
- fix the non-xcursor case for solaris (Sven Herzberg, Glynn Foster) (#319125)
- use ngettext() correctly (Sven Herzberg)

theme-switcher:
- fixed messages wording (Thomas Wood) (#167045)
- removed duplicate check for the tar utility (Thomas Wood)

updated translations:
- ca (Josep Puigdemont i Casamajó)
- cs (Jakub Friedl)
- de (endrik Richter)
- dz (Guntupalli Karunakar)
- el (Kostas Papadimas)
- es (Francisco Javier F. Serrador)
- fi (Ilkka Tuohela)
- fr (Samuel Mutel)
- gu (Ankit Patel)
- id (Ahmad Riza H Nst)
- ja (Satoru SATOH)
- ko (Changwoo Ryu)
- sv (Daniel Nylander)
- th (Theppitak Karoonboonyanan)

------------------------------------------------------------------------------
gnome-control-center 2.15.4

background:
- Removed redundant GNOMELOCALEDIR (Sergey Udaltsov) (345178)

display:
- Replaced deprecated GtkOptionMenu with GtkComboBox (Sven Herzberg) (338468)
- Added rotation support (Sven Herzberg) (324125)

keyboard:
- Massive libgswitchit API change (Sergey Udaltsov)
- Made model chooser button more verbose (Sergey Udaltsov) (335833)

sound:
- Fixed build (Sergey Udaltsov)

theme-switcher:
- Fixed strange wording (Thomas Wood) (167045)

settings daemon:
- Activation is now done via DBUS (Sergey Udaltsov)
- Added DBUS interface for keyboard indication (Sergey Udaltsov)

documentation:
- Initial Russian translation (Nickolay V. Shmyrev)

updated translations:
- bn_IN (Runa Bhattacharjee)
- cs (Jakub Friedl)
- de (Hendrik Richter)
- es (Francisco Javier F. Serrador)
- fi (Ilkka Tuohela)
- fr (Benoît Dejean)
- gu (Ankit Patel)
- he (Yair Hershkovitz)
- hi (Rajesh Ranjan)
- lv (Raivis Dejus)
- mk (Jovan Naumovski)
- nb (Kjartan Maraas)
- ru (Nickolay V. Shmyrev)
- ta (I. Felix)
- th (Theppitak Karoonboonyanan)
- sv (Daniel Nylander)

------------------------------------------------------------------------------
gnome-control-center 2.15.3

about me:
- Fixed typo (Rodrigo Moya) (324971)
- Fixed compilation issues (Rodrigo Moya) (344468)

default applications:
- Added support for Sylpheed (Luca Cavalli) (332659)
- Removed unnecessary gnome-terminal argument (Luca Cavalli) (336700)

keybindings:
- Removed brightness keybindings, now in gnome-power-manager (Bastien Nocera)
  (339857)

keyboard:
- Save/restore layout preview window geometry (Sergey Udaltsov)

mouse:
- Fixed selection when no cursor font is set in GConf (Darren Kenny) (340003)

sound:
- Added sound device selection (Jürg Billeter) (329112)
- Fixed button strings (Rodrigo Moya) (324971)

theme-switcher:
- Removed drag & drop information text (Thomas Wood) (99535)
- Added Install buttons to each tab in the details window (Thomas Wood)
- Remember last browsed or installed from location (Thomas Wood) (138795)
- Don't allow invalid characters in theme names (Thomas Wood) (139692)
- Don't ask user whether to overwrite or not internal files (Thomas Wood) (317375)
- Allow saving background image for custom themes (Thomas Wood) (330302)
- Fixed UI issues in the save dialog (Thomas Wood) (100622)

settings daemon:
- Fixed libxklavier engine initialization logic (Sergey Udaltsov) (333091)
- Removed references to brightness controls (Bastien Nocera) (339857)
- Fixed leaks (Paolo Borelli) (342568, 342570)

general:
- Updated to new libxklavier API (Sergey Udaltsov)

updated translations:
- bg (Alexander Shopov)
- cs (Miloslav Trmac, Lukas Novotny, Jakub Friedl)
- dz (Pema Geyleg)
- es (Francisco Javier F. Serrador)
- fi (Ilkka Tuohela)
- gl (Ignacio Casal Quinteiro)
- gu (Ankit Patel)
- mg (Simos Xenitellis)
- nb (Kjartan Maraas)
- sq (Laurent Dhima)
- sv (Daniel Nylander)
- th (Theppitak Karoonboonyanan)
- vi (Clytie Siddall)
- zh_CN (Funda Wang)
- zh_HK (Chao-Hsiung Liao)
- zh_TW (Chao-Hsiung Liao)

4 files changed, 105 insertions, 27 deletions

diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 7dc1950965c..5b11c249670 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.68 2006/07/26 12:56:13 drochner Exp $
+# $NetBSD: Makefile,v 1.69 2006/09/15 15:12:40 jmmv Exp $
 #
 
-DISTNAME=	control-center-2.14.2
+DISTNAME=	control-center-2.16.0
 PKGNAME=	gnome2-${DISTNAME}
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.14/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.16/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -18,9 +18,16 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 
 CONFIGURE_ARGS+=	--disable-alsa
+CONFIGURE_ARGS+=	--disable-hal
+CONFIGURE_ARGS+=	--enable-aboutme
 CONFIGURE_ARGS+=	--with-gstreamer=0.10
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
+CPPFLAGS+=		-DDBUS_API_SUBJECT_TO_CHANGE
+
+PKGCONFIG_OVERRIDE+=	gnome-settings-daemon/gnome-settings-daemon.pc
+PKGCONFIG_OVERRIDE+=	libwindow-settings/gnome-window-settings-2.0.pc
+
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE}
 
@@ -40,8 +47,11 @@ CONF_FILES=		${EGDIR}/theme-method.conf \
 CONF_FILES+=		${EGDIR}/font-method.conf \
 			${PKG_SYSCONFDIR}/font-method.conf
 
-BUILDLINK_API_DEPENDS.glib2=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.glib2=	glib2>=2.8.0
+BUILDLINK_API_DEPENDS.gstreamer0.10=		gstreamer0.10>=0.10.1.2
+BUILDLINK_API_DEPENDS.gst-plugins0.10-base=	gst-plugins0.10-base>=0.10.1.2
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.12
+BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1.2
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -55,10 +65,13 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.12
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
diff --git a/x11/gnome2-control-center/PLIST b/x11/gnome2-control-center/PLIST
index 8b3aada63c4..9799e592a56 100644
--- a/x11/gnome2-control-center/PLIST
+++ b/x11/gnome2-control-center/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.20 2006/05/03 11:25:48 drochner Exp $
+@comment $NetBSD: PLIST,v 1.21 2006/09/15 15:12:40 jmmv Exp $
+bin/gnome-about-me
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-at-properties
 bin/gnome-background-properties
@@ -19,14 +20,15 @@ bin/gnome-typing-monitor
 bin/gnome-ui-properties
 bin/gnome-window-properties
 bin/themus-theme-applier
+include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
 include/gnome-window-settings-2.0/gnome-window-manager.h
 include/gnome-window-settings-2.0/gnome-wm-manager.h
-lib/bonobo/servers/GNOME_SettingsDaemon.server
 lib/gnome-vfs-2.0/modules/libfont-method.la
 lib/gnome-vfs-2.0/modules/libtheme-method.la
 lib/libgnome-window-settings.la
 lib/nautilus/extensions-1.0/libnautilus-fontilus.la
 lib/nautilus/extensions-1.0/libnautilus-themus.la
+lib/pkgconfig/gnome-settings-daemon.pc
 lib/pkgconfig/gnome-window-settings-2.0.pc
 lib/window-manager-settings/libmetacity.la
 libexec/gnome-settings-daemon
@@ -36,6 +38,7 @@ share/applications/background.desktop
 share/applications/default-applications.desktop
 share/applications/display-properties.desktop
 share/applications/font-properties.desktop
+share/applications/gnome-about-me.desktop
 share/applications/gnome-font-viewer.desktop
 share/applications/gnome-network-preferences.desktop
 share/applications/gnome-settings-mouse.desktop
@@ -52,6 +55,7 @@ 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
@@ -63,14 +67,12 @@ 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-install.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-brightness.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
@@ -81,6 +83,8 @@ 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
@@ -107,6 +111,7 @@ 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/dbus-1/services/org.gnome.SettingsDaemon.service
 share/desktop-directories/font-method.directory
 share/desktop-directories/theme-method.directory
 share/examples/gnome2-control-center/font-method.conf
@@ -138,6 +143,10 @@ 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/es/control-center.xml
+share/gnome/help/control-center/fr/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/zh_CN/control-center.xml
 share/icons/hicolor/48x48/apps/gnome-control-center.png
 share/idl/ConfigArchiver.idl
 share/idl/GNOME_SettingsDaemon.idl
@@ -148,6 +157,7 @@ share/locale/az/LC_MESSAGES/control-center-2.0.mo
 share/locale/be/LC_MESSAGES/control-center-2.0.mo
 share/locale/bg/LC_MESSAGES/control-center-2.0.mo
 share/locale/bn/LC_MESSAGES/control-center-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/control-center-2.0.mo
 share/locale/br/LC_MESSAGES/control-center-2.0.mo
 share/locale/bs/LC_MESSAGES/control-center-2.0.mo
 share/locale/ca/LC_MESSAGES/control-center-2.0.mo
@@ -181,16 +191,18 @@ share/locale/ko/LC_MESSAGES/control-center-2.0.mo
 share/locale/ku/LC_MESSAGES/control-center-2.0.mo
 share/locale/lt/LC_MESSAGES/control-center-2.0.mo
 share/locale/lv/LC_MESSAGES/control-center-2.0.mo
+share/locale/mg/LC_MESSAGES/control-center-2.0.mo
 share/locale/mk/LC_MESSAGES/control-center-2.0.mo
 share/locale/ml/LC_MESSAGES/control-center-2.0.mo
 share/locale/mn/LC_MESSAGES/control-center-2.0.mo
+share/locale/mr/LC_MESSAGES/control-center-2.0.mo
 share/locale/ms/LC_MESSAGES/control-center-2.0.mo
 share/locale/nb/LC_MESSAGES/control-center-2.0.mo
 share/locale/ne/LC_MESSAGES/control-center-2.0.mo
 share/locale/nl/LC_MESSAGES/control-center-2.0.mo
 share/locale/nn/LC_MESSAGES/control-center-2.0.mo
-share/locale/no/LC_MESSAGES/control-center-2.0.mo
 share/locale/nso/LC_MESSAGES/control-center-2.0.mo
+share/locale/or/LC_MESSAGES/control-center-2.0.mo
 share/locale/pa/LC_MESSAGES/control-center-2.0.mo
 share/locale/pl/LC_MESSAGES/control-center-2.0.mo
 share/locale/pt/LC_MESSAGES/control-center-2.0.mo
@@ -218,12 +230,21 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 share/locale/zu/LC_MESSAGES/control-center-2.0.mo
 share/omf/control-center/control-center-C.omf
 share/omf/control-center/control-center-es.omf
+share/omf/control-center/control-center-fr.omf
+share/omf/control-center/control-center-ru.omf
+share/omf/control-center/control-center-sv.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 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/sv
+@dirrm share/gnome/help/control-center/ru
+@dirrm share/gnome/help/control-center/fr
 @dirrm share/gnome/help/control-center/es
 @dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
@@ -233,15 +254,17 @@ share/pixmaps/display-capplet.png
 @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/capplets
 @comment in gnome2-dirs: @dirrm share/control-center-2.0
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/window-manager-settings
 @comment in nautilus: @dirrm lib/nautilus/extensions-1.0
 @comment in gnome-vfs2: @dirrm lib/gnome-vfs-2.0/modules
-@comment in libbonobo: @dirrm lib/bonobo/servers
 @dirrm include/gnome-window-settings-2.0
+@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
+@dirrm include/gnome-settings-daemon-2.0
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index 55ffb00f9c3..bb65a2cd30d 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2006/07/26 12:56:13 drochner Exp $
+$NetBSD: distinfo,v 1.28 2006/09/15 15:12:40 jmmv Exp $
 
-SHA1 (control-center-2.14.2.tar.bz2) = 56f9dba38247712af97af6ec27cf6d4c7eca4206
-RMD160 (control-center-2.14.2.tar.bz2) = 7c144f408245cace7c73c13432c900ae66dc190c
-Size (control-center-2.14.2.tar.bz2) = 1864719 bytes
-SHA1 (patch-aa) = 826bd6ef91135a61a86450ff150662156c833ae8
+SHA1 (control-center-2.16.0.tar.bz2) = c73e614c3ba287202ca12f19029f15bab293690b
+RMD160 (control-center-2.16.0.tar.bz2) = 85c8d8de2d9643581c89f468e1714be049c375af
+Size (control-center-2.16.0.tar.bz2) = 1986964 bytes
+SHA1 (patch-aa) = 588d06dfbf0b2cb5e244058a5b80f75a0faa4e29
 SHA1 (patch-ad) = 15aeffd62733036840d402f1ed3a2f1a89c8945d
 SHA1 (patch-af) = 50f179c3d2775f0a058d7644f6f9a0b958f4b531
diff --git a/x11/gnome2-control-center/patches/patch-aa b/x11/gnome2-control-center/patches/patch-aa
index 9aa4aa69af7..88bb107cd0f 100644
--- a/x11/gnome2-control-center/patches/patch-aa
+++ b/x11/gnome2-control-center/patches/patch-aa
@@ -1,12 +1,54 @@
-$NetBSD: patch-aa,v 1.7 2004/11/19 17:32:20 sketch Exp $
+$NetBSD: patch-aa,v 1.8 2006/09/15 15:12:40 jmmv Exp $
 
---- ./capplets/sound/sound-properties-capplet.c.orig	2004-11-19 17:26:20.656307000 +0000
-+++ ./capplets/sound/sound-properties-capplet.c	2004-11-19 17:26:26.264195000 +0000
-@@ -32,7 +32,6 @@
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/XKBlib.h>
--#include <X11/extensions/XKBrules.h>
- 
- #include "capplet-util.h"
- #include "gconf-property-editor.h"
+--- capplets/about-me/gnome-about-me-password.c.orig	2006-06-11 10:50:31.000000000 +0200
++++ capplets/about-me/gnome-about-me-password.c
+@@ -30,6 +30,7 @@
+ /* Are all of these needed? */
+ #include <gnome.h>
+ #include <pwd.h>
++#include <signal.h>
+ #include <stdlib.h>
+ #include <glade/glade.h>
+ #include <unistd.h>
+@@ -183,7 +184,7 @@ spawn_passwd (PasswordDialog *pdialog, G
+ {
+ 	gchar	*argv[2];
+ 	gchar	*envp[1];
+-	gint	stdin, stdout, stderr;
++	gint	fdstdin, fdstdout, fdstderr;
+ 	
+ 	argv[0] = "/usr/bin/passwd";	/* Is it safe to rely on a hard-coded path? */
+ 	argv[1] = NULL;
+@@ -204,9 +205,9 @@ spawn_passwd (PasswordDialog *pdialog, G
+ 								   NULL,						/* Child setup */
+ 								   NULL,						/* Data to child setup */
+ 								   &pdialog->backend_pid,		/* PID */
+-								   &stdin,						/* Stdin */
+-								   &stdout,						/* Stdout */
+-								   &stderr,						/* Stderr */
++								   &fdstdin,						/* Stdin */
++								   &fdstdout,						/* Stdout */
++								   &fdstderr,						/* Stderr */
+ 								   error)) {					/* GError */
+ 		
+ 		/* An error occured */
+@@ -216,7 +217,7 @@ spawn_passwd (PasswordDialog *pdialog, G
+ 	}
+ 	
+ 	/* 2>&1 */
+-	if (dup2 (stderr, stdout) == -1) {
++	if (dup2 (fdstderr, fdstdout) == -1) {
+ 		/* Failed! */
+ 		g_set_error (error,
+ 					 PASSDLG_ERROR, 
+@@ -230,8 +231,8 @@ spawn_passwd (PasswordDialog *pdialog, G
+ 	}
+ 	
+ 	/* Open IO Channels */
+-	pdialog->backend_stdin = g_io_channel_unix_new (stdin);
+-	pdialog->backend_stdout = g_io_channel_unix_new (stdout);
++	pdialog->backend_stdin = g_io_channel_unix_new (fdstdin);
++	pdialog->backend_stdout = g_io_channel_unix_new (fdstdout);
+ 	
+ 	/* Set raw encoding */
+ 	/* Set nonblocking mode */