Update to 2.21.5.

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

4 files changed, 19 insertions, 61 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 3d1edd336..9830d5cdd 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.163 2007/11/15 21:41:07 marcus Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.164 2007/12/22 22:01:13 kwm Exp $
 #
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	2.21.4
+PORTVERSION=	2.21.5
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,7 +17,9 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 2 project
 
 LIB_DEPENDS=	xklavier.11:${PORTSDIR}/x11/libxklavier
-RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount
+BUILD_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
+RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
+		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
@@ -68,8 +70,8 @@ pre-everything::
 	@${ECHO_MSG} "===>"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%CDROM%%|${DEFAULT_CDROM_DEVICE}|' \
-		${WRKSRC}/gnome-settings-daemon/gnome-settings-multimedia-keys.c
+#	@${REINPLACE_CMD} -e 's|%%CDROM%%|${DEFAULT_CDROM_DEVICE}|' \
+#		${WRKSRC}/gnome-settings-daemon/gnome-settings-multimedia-keys.c
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 	    	${WRKSRC}/capplets/common/gnome-theme-info.c
 
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 94bf8ecae..cf62d7aa0 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-control-center-2.21.4.tar.bz2) = 0674531ced6f9322251d94c4ad3594a2
-SHA256 (gnome2/gnome-control-center-2.21.4.tar.bz2) = 5fc38894d298a3d2af58acee950e4a34254c2066da3a1e81ea2bbe811a836def
-SIZE (gnome2/gnome-control-center-2.21.4.tar.bz2) = 2345749
+MD5 (gnome2/gnome-control-center-2.21.5.tar.bz2) = 4de7124991cb34828009317a7e5f7c6a
+SHA256 (gnome2/gnome-control-center-2.21.5.tar.bz2) = b018b4c0476fea038d53d5467c17a79d5055feeaad9adb1e5934503c1a7ccc2d
+SIZE (gnome2/gnome-control-center-2.21.5.tar.bz2) = 2201211
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
deleted file mode 100644
index 658f19839..000000000
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	2007-09-18 05:32:43.000000000 -0400
-+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	2007-11-01 08:29:46.987143617 -0400
-@@ -610,7 +610,7 @@
- 	if ((command != NULL) && (strcmp (command, "") != 0))
- 		execute (acme, command, FALSE, FALSE);
- 	else
--		execute (acme, "eject -T", FALSE, FALSE);
-+		execute (acme, "gnome-eject -b --device=%%CDROM%%", FALSE, FALSE);
- 
- 	g_free (command);
- }
-@@ -708,7 +708,7 @@
- 		do_mail_action (acme);
- 		break;
- 	case SLEEP_KEY:
--		do_sleep_action ("apm", "xset dpms force off");
-+		do_sleep_action ("zzz", "xset dpms force off");
- 		break;
- 	case SCREENSAVER_KEY:
- 		if ((cmd = g_find_program_in_path ("gnome-screensaver-command")))
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index f7fed34ee..7ab7b4a32 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,5 +1,4 @@
 %%ABOUTME%%bin/gnome-about-me
-bin/gnome-accessibility-keyboard-properties
 bin/gnome-appearance-properties
 bin/gnome-at-mobility
 bin/gnome-at-properties
@@ -10,7 +9,6 @@ bin/gnome-display-properties
 bin/gnome-font-viewer
 bin/gnome-keybinding-properties
 bin/gnome-keyboard-properties
-bin/gnome-localization-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
 bin/gnome-sound-properties
@@ -23,7 +21,6 @@ etc/gnome-vfs-2.0/modules/font-method.conf
 etc/gnome-vfs-2.0/modules/theme-method.conf
 etc/xdg/menus/gnomecc.menu
 etc/xdg/autostart/gnome-at-session.desktop
-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/gnome-vfs-2.0/modules/libfont-method.a
@@ -36,20 +33,17 @@ lib/libgnome-window-settings.a
 lib/libgnome-window-settings.la
 lib/libgnome-window-settings.so
 lib/libgnome-window-settings.so.1
-lib/nautilus/extensions-1.0/libnautilus-fontilus.a
-lib/nautilus/extensions-1.0/libnautilus-fontilus.la
-lib/nautilus/extensions-1.0/libnautilus-fontilus.so
-lib/nautilus/extensions-1.0/libnautilus-themus.a
-lib/nautilus/extensions-1.0/libnautilus-themus.la
-lib/nautilus/extensions-1.0/libnautilus-themus.so
+lib/nautilus/extensions-2.0/libnautilus-fontilus.a
+lib/nautilus/extensions-2.0/libnautilus-fontilus.la
+lib/nautilus/extensions-2.0/libnautilus-fontilus.so
+lib/nautilus/extensions-2.0/libnautilus-themus.a
+lib/nautilus/extensions-2.0/libnautilus-themus.la
+lib/nautilus/extensions-2.0/libnautilus-themus.so
 lib/window-manager-settings/libmetacity.a
 lib/window-manager-settings/libmetacity.la
 lib/window-manager-settings/libmetacity.so
 libdata/pkgconfig/gnome-keybindings.pc
-libdata/pkgconfig/gnome-settings-daemon.pc
 libdata/pkgconfig/gnome-window-settings-2.0.pc
-libexec/gnome-settings-daemon
-share/applications/accessibility-keyboard.desktop
 share/applications/at-properties.desktop
 share/applications/default-applications.desktop
 share/applications/display-properties.desktop
@@ -63,37 +57,25 @@ share/applications/gnome-theme-installer.desktop
 share/applications/gnomecc.desktop
 share/applications/keybinding.desktop
 share/applications/keyboard.desktop
-share/applications/localization.desktop
 share/applications/themus-theme-applier.desktop
 share/applications/window-properties.desktop
-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
-%%DATADIR%%/glade/acme.glade
 %%DATADIR%%/glade/appearance.glade
 %%DATADIR%%/glade/apply-font.glade
 %%DATADIR%%/glade/at-enable-dialog.glade
 %%ABOUTME%%%%DATADIR%%/glade/gnome-about-me.glade
-%%DATADIR%%/glade/gnome-accessibility-keyboard-properties.glade
 %%DATADIR%%/glade/gnome-default-applications-properties.glade
 %%DATADIR%%/glade/gnome-keybinding-properties.glade
 %%DATADIR%%/glade/gnome-keyboard-properties.glade
 %%DATADIR%%/glade/gnome-mouse-properties.glade
 %%DATADIR%%/glade/gnome-network-preferences.glade
 %%DATADIR%%/glade/gnome-window-properties.glade
-%%DATADIR%%/glade/localization.glade
-%%DATADIR%%/glade/modmap-dialog.glade
 %%DATADIR%%/glade/sound-properties.glade
 %%DATADIR%%/gnome-default-applications.xml
 %%DATADIR%%/keybindings/00-multimedia-key.xml
 %%DATADIR%%/keybindings/01-desktop-key.xml
-%%DATADIR%%/pixmaps/accessibility-keyboard-bouncekey.png
-%%DATADIR%%/pixmaps/accessibility-keyboard-mousekey.png
-%%DATADIR%%/pixmaps/accessibility-keyboard-slowkey.png
-%%DATADIR%%/pixmaps/accessibility-keyboard-stickykey.png
-%%DATADIR%%/pixmaps/accessibility-keyboard-togglekey.png
-%%DATADIR%%/pixmaps/acme-eject.png
 %%DATADIR%%/pixmaps/at-startup.png
 %%DATADIR%%/pixmaps/at-support.png
 %%DATADIR%%/pixmaps/bar-disabled.png
@@ -126,12 +108,6 @@ share/desktop-directories/theme-method.directory
 %%DATADIR%%/pixmaps/theme-thumbnailing.png
 %%DATADIR%%/pixmaps/visual-bell.png
 %%DATADIR%%/pixmaps/window-theme-thumbnailing.png
-%%DATADIR%%/xrdb/Editres.ad
-%%DATADIR%%/xrdb/Emacs.ad
-%%DATADIR%%/xrdb/General.ad
-%%DATADIR%%/xrdb/Motif.ad
-%%DATADIR%%/xrdb/Tk.ad
-%%DATADIR%%/xrdb/Xaw.ad
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
@@ -158,6 +134,7 @@ share/gnome/help/control-center/ja/control-center.xml
 share/gnome/help/control-center/oc/control-center.xml
 share/gnome/help/control-center/pa/control-center.xml
 share/gnome/help/control-center/pt_BR/control-center.xml
+share/gnome/help/control-center/pt/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
@@ -274,6 +251,7 @@ share/omf/control-center/control-center-ja.omf
 share/omf/control-center/control-center-oc.omf
 share/omf/control-center/control-center-pa.omf
 share/omf/control-center/control-center-pt_BR.omf
+share/omf/control-center/control-center-pt.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
@@ -285,6 +263,7 @@ share/omf/control-center/control-center-zh_CN.omf
 @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/pt
 @dirrm share/gnome/help/control-center/pt_BR
 @dirrm share/gnome/help/control-center/pa
 @dirrm share/gnome/help/control-center/oc
@@ -296,14 +275,11 @@ share/omf/control-center/control-center-zh_CN.omf
 @dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
 @dirrm share/gnome/cursor-fonts
-@dirrm %%DATADIR%%/xrdb
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/glade
 @dirrmtry share/desktop-directories
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
-@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-2.0
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true