Update to 2.5.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1568 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 32 insertions, 35 deletions

diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 4f3025195..3eeb1b79c 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.5.0
+PORTVERSION=	2.5.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.5
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 81204bc86..cde1ae51b 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.5.0.tar.bz2) = e0c68e47e730eb92a243c5f423c9791b
+MD5 (gnome2/control-center-2.5.1.tar.bz2) = a603265844fac85eb59b88cd9aa8a30e
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
index 83ef8876c..283bdb126 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig	Wed Dec 18 16:10:09 2002
-+++ configure	Sun Dec 22 16:36:03 2002
-@@ -12607,7 +12608,7 @@
+--- configure.orig	Tue Dec 30 15:29:25 2003
++++ configure	Tue Dec 30 16:00:39 2003
+@@ -25519,7 +25519,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"
+@@ -25791,7 +25791,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 00cba3227..8e5923117 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/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
@@ -23,7 +22,9 @@ 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/screensaver/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%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
@@ -34,6 +35,9 @@ 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/screensaver/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%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
@@ -43,6 +47,7 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gn
 etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.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,36 +67,26 @@ 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/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
@@ -112,7 +107,6 @@ 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/at-startup.png
 share/gnome/control-center-2.0/pixmaps/at-support.png
 share/gnome/control-center-2.0/pixmaps/bar-disabled.png
@@ -123,7 +117,6 @@ 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/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 +127,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
@@ -158,27 +150,17 @@ 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/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
@@ -251,6 +233,9 @@ 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/peripherals/keyboard
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals
 @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/editor
@@ -261,6 +246,9 @@ 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/schemas/desktop/gnome/peripherals/keyboard/xkb
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor