6 files changed, 74 insertions, 42 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index ea79decebbdf..2dff803143d3 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,23 +6,24 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.6.0.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.4
+MASTER_SITE_SUBDIR=	sources/control-center/2.6
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 2 project
 
+LIB_DEPENDS=	xklavier.8:${PORTSDIR}/x11/libxklavier
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack gnomehier metacity nautilus2
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack metacity nautilus2
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index ff6267bd5edf..81cab7473379 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.4.0.tar.bz2) = 44115d3174d2f603f34a336ada562bae
-SIZE (gnome2/control-center-2.4.0.tar.bz2) = 2042574
+MD5 (gnome2/control-center-2.6.0.3.tar.bz2) = 7d482e42842dc5b8a52714ae7a0aafed
+SIZE (gnome2/control-center-2.6.0.3.tar.bz2) = 2364656
diff --git a/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in b/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in
new file mode 100644
index 000000000000..5a6b0ba8f2d6
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in
@@ -0,0 +1,11 @@
+--- capplets/desktop-links/Makefile.in.orig	Tue Dec 30 15:55:28 2003
++++ capplets/desktop-links/Makefile.in	Tue Dec 30 15:55:49 2003
+@@ -190,7 +190,7 @@
+ 
+ pixmaps_pre = $(capplets:=-capplet.png)
+ pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png
+-pixmapsdir = $(datadir)/icons/gnome/48x48/apps
++pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps
+ 
+ desktop_files = $(capplets:=.desktop)
+ desktop_in_files = $(desktop_files:.desktop=.desktop.in)
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 83ef8876cbb3..820e1fc4bfb4 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,6 +1,31 @@
---- configure.orig	Wed Dec 18 16:10:09 2002
-+++ configure	Sun Dec 22 16:36:03 2002
-@@ -12607,7 +12608,7 @@
+--- configure.orig	Thu Mar 11 03:09:48 2004
++++ configure	Thu Mar 11 03:12:25 2004
+@@ -21373,6 +21373,7 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  LIBS="-lintl $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21461,6 +21462,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++LIBS="-lintl $LIBS"
+  have_ngettext=yes
+ fi
+ done
+@@ -25595,7 +25597,7 @@
+ if test "x$CATOBJEXT" = "x.mo" ; then
+   localedir=`eval echo "${libdir}/locale"`
+ else
+-  localedir=`eval echo "${datadir}/locale"`
++  localedir=`eval echo "${prefix}/share/locale"`
+ fi
+ prefix="$glib_save_prefix"
+ exec_prefix="$glib_save_exec_prefix"
+@@ -26257,7 +26259,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/sysutils/gnome-control-center/pkg-descr b/sysutils/gnome-control-center/pkg-descr
index 017e3d76e99e..26d4dbe929b2 100644
--- a/sysutils/gnome-control-center/pkg-descr
+++ b/sysutils/gnome-control-center/pkg-descr
@@ -1 +1 @@
-control center for GNOME 2.0 project.
+Configuration tools tightly integrated within the GNOME 2 desktop.
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 00cba32274e8..a1c257fb1b00 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -11,7 +11,6 @@ bin/gnome-keybinding-properties
 bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
-bin/gnome-settings-daemon
 bin/gnome-sound-properties
 bin/themus-theme-applier
 bin/gnome-theme-manager
@@ -22,8 +21,10 @@ bin/gnome-ui-properties
 bin/gnome-window-properties
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/keybindings/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/xkb/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
@@ -32,8 +33,10 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-them
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/keybindings/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/xkb/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
@@ -41,8 +44,10 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-fo
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
 etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
+etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
 etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
 etc/gconf/schemas/desktop_gnome_font_rendering.schemas
+etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
 etc/gconf/schemas/fontilus.schemas
 etc/gconf/schemas/themus.schemas
 etc/gnome-vfs-2.0/modules/font-method.conf
@@ -62,41 +67,33 @@ libdata/bonobo/servers/Themus_Properties_View.server
 libdata/bonobo/servers/fontilus.server
 libdata/pkgconfig/gnome-window-settings-2.0.pc
 libexec/fontilus-context-menu
+libexec/gnome-settings-daemon
 share/gnome/application-registry/fontilus.applications
 share/gnome/application-registry/themus.applications
 share/gnome/applications/gnomecc.desktop
 share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
 share/gnome/control-center-2.0/capplets/at-properties.desktop
 share/gnome/control-center-2.0/capplets/background.desktop
-share/gnome/control-center-2.0/capplets/behavior.desktop
 share/gnome/control-center-2.0/capplets/default-applications.desktop
 share/gnome/control-center-2.0/capplets/display-properties.desktop
 share/gnome/control-center-2.0/capplets/file-types.desktop
 share/gnome/control-center-2.0/capplets/font-properties.desktop
 share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop
+share/gnome/control-center-2.0/capplets/gnome-settings-mouse.desktop
+share/gnome/control-center-2.0/capplets/gnome-settings-sound.desktop
+share/gnome/control-center-2.0/capplets/gnome-ui-properties.desktop
 share/gnome/control-center-2.0/capplets/gtk-theme-selector.desktop
 share/gnome/control-center-2.0/capplets/keybinding.desktop
 share/gnome/control-center-2.0/capplets/keyboard.desktop
-share/gnome/control-center-2.0/capplets/mouse.desktop
-share/gnome/control-center-2.0/capplets/sound.desktop
 share/gnome/control-center-2.0/capplets/window-properties.desktop
-share/gnome/control-center-2.0/icons/accessibility-directory.png
-share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png
-share/gnome/control-center-2.0/icons/at-enable-capplet.png
-share/gnome/control-center-2.0/icons/background-capplet.png
-share/gnome/control-center-2.0/icons/behavior-capplet.png
-share/gnome/control-center-2.0/icons/default-applications-capplet.png
 share/gnome/control-center-2.0/icons/display-capplet.png
-share/gnome/control-center-2.0/icons/font-capplet.png
-share/gnome/control-center-2.0/icons/gnome-network-capplet.png
-share/gnome/control-center-2.0/icons/mouse-capplet.png
-share/gnome/control-center-2.0/icons/sound-capplet.png
-share/gnome/control-center-2.0/icons/window-capplet.png
+share/gnome/control-center-2.0/interfaces/acme.glade
+share/gnome/control-center-2.0/interfaces/apply-font.glade
 share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade
-share/gnome/control-center-2.0/interfaces/background-properties.glade
 share/gnome/control-center-2.0/interfaces/file-types-properties.glade
 share/gnome/control-center-2.0/interfaces/font-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade
+share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-keybinding-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade
@@ -112,7 +109,8 @@ share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png
-share/gnome/control-center-2.0/pixmaps/at-enable-capplet.png
+share/gnome/control-center-2.0/pixmaps/acme-brightness.png
+share/gnome/control-center-2.0/pixmaps/acme-eject.png
 share/gnome/control-center-2.0/pixmaps/at-startup.png
 share/gnome/control-center-2.0/pixmaps/at-support.png
 share/gnome/control-center-2.0/pixmaps/bar-disabled.png
@@ -122,8 +120,9 @@ share/gnome/control-center-2.0/pixmaps/bar.png
 share/gnome/control-center-2.0/pixmaps/double-click-maybe.png
 share/gnome/control-center-2.0/pixmaps/double-click-off.png
 share/gnome/control-center-2.0/pixmaps/double-click-on.png
+share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
+share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png
 share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
-share/gnome/control-center-2.0/pixmaps/keyboard-capplet.png
 share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
 share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
 share/gnome/control-center-2.0/pixmaps/keyboard-volume.png
@@ -134,7 +133,6 @@ share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png
 share/gnome/control-center-2.0/pixmaps/mouse-left.png
 share/gnome/control-center-2.0/pixmaps/mouse-right.png
 share/gnome/control-center-2.0/pixmaps/ocean-stripes.png
-share/gnome/control-center-2.0/pixmaps/sound-capplet.png
 share/gnome/control-center-2.0/pixmaps/stop.png
 share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png
 share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png
@@ -148,7 +146,6 @@ share/gnome/control-center-2.0/xrdb/General.ad
 share/gnome/control-center-2.0/xrdb/Motif.ad
 share/gnome/control-center-2.0/xrdb/Tk.ad
 share/gnome/control-center-2.0/xrdb/Xaw.ad
-share/gnome/control-center/apply-font.glade
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
@@ -158,27 +155,18 @@ share/gnome/idl/GNOME_SettingsDaemon.idl
 share/gnome/mime-info/fontilus.keys
 share/gnome/mime-info/fontilus.mime
 share/gnome/mime-info/themus.keys
-share/gnome/pixmaps/accessibility-keyboard-capplet.png
-share/gnome/pixmaps/at-enable-capplet.png
-share/gnome/pixmaps/background-capplet.png
-share/gnome/pixmaps/behavior-capplet.png
 share/gnome/pixmaps/control-center2.png
-share/gnome/pixmaps/default-applications-capplet.png
 share/gnome/pixmaps/display-capplet.png
-share/gnome/pixmaps/font-capplet.png
-share/gnome/pixmaps/gnome-ccthemes.png
 share/gnome/pixmaps/gnomecc-2/active.png
 share/gnome/pixmaps/gnomecc-2/bcg_top.png
 share/gnome/pixmaps/gnomecc-2/blank.png
 share/gnome/pixmaps/gnomecc-2/title.png
-share/gnome/pixmaps/keyboard-capplet.png
-share/gnome/pixmaps/keyboard-shortcut.png
-share/gnome/pixmaps/mouse-capplet.png
-share/gnome/pixmaps/window-capplet.png
 share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
 share/gnome/vfolders/font-method.directory
 share/gnome/vfolders/theme-method.directory
+share/icons/gnome/48x48/apps/accessibility-directory.png
+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
 share/locale/az/LC_MESSAGES/control-center-2.0.mo
@@ -191,6 +179,7 @@ share/locale/cy/LC_MESSAGES/control-center-2.0.mo
 share/locale/da/LC_MESSAGES/control-center-2.0.mo
 share/locale/de/LC_MESSAGES/control-center-2.0.mo
 share/locale/el/LC_MESSAGES/control-center-2.0.mo
+share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo
 share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
 share/locale/es/LC_MESSAGES/control-center-2.0.mo
 share/locale/et/LC_MESSAGES/control-center-2.0.mo
@@ -217,6 +206,7 @@ share/locale/ms/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/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
 share/locale/pt_BR/LC_MESSAGES/control-center-2.0.mo
@@ -237,6 +227,7 @@ share/locale/wa/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/pixmaps/gnomecc-2
+@dirrm share/gnome/gnome-background-properties
 @dirrm share/gnome/cursor-fonts
 @dirrm share/gnome/control-center-2.0/xrdb
 @dirrm share/gnome/control-center-2.0/pixmaps
@@ -251,8 +242,11 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/xkb
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/keybindings
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
@@ -261,7 +255,8 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/xkb
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/keybindings
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon