Update to 2.11.90.

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

8 files changed, 50 insertions, 35 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 5f1c2cab0..8a348673d 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/gnomecontrolcenter2/Makefile,v 1.78 2005/07/05 18:40:24 marcus Exp $
+#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.79 2005/07/14 20:36:46 marcus Exp $
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.11.6
+PORTVERSION=	2.11.90
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.11
@@ -29,6 +29,7 @@ WANT_GNOME=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautilus2 \
 		gnomemenus desktopfileutils
 USE_AUTOTOOLS=	libtool:15
+INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 334bf5c92..07f3282ad 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.11.6.tar.bz2) = adf6804249cff2e4d2ed1b3e87035c3d
-SIZE (gnome2/control-center-2.11.6.tar.bz2) = 2758398
+MD5 (gnome2/control-center-2.11.90.tar.bz2) = 6b94f8c671eb3d0e6699ee24b5df4854
+SIZE (gnome2/control-center-2.11.90.tar.bz2) = 1882153
diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c
index 98c92bb99..0d1f85f32 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c
+++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c
@@ -1,6 +1,6 @@
---- capplets/about-me/gnome-about-me.c.orig	Tue Jul  5 14:17:38 2005
-+++ capplets/about-me/gnome-about-me.c	Tue Jul  5 14:20:06 2005
-@@ -260,12 +260,10 @@ about_me_focus_out (GtkWidget *widget, G
+--- capplets/about-me/gnome-about-me.c.orig	Wed Jul 27 13:45:17 2005
++++ capplets/about-me/gnome-about-me.c	Wed Jul 27 13:47:09 2005
+@@ -258,12 +258,10 @@
  static char *
  get_user_login (void)
  {
@@ -16,7 +16,7 @@
  }
  
  /*
-@@ -655,6 +653,7 @@ about_me_setup_dialog (void)
+@@ -664,6 +662,7 @@
  	struct passwd *pwent;
  	char *user = NULL;
  	gchar *str;
@@ -24,7 +24,7 @@
  
  	me = g_new0 (GnomeAboutMe, 1);
  
-@@ -711,7 +710,6 @@ about_me_setup_dialog (void)
+@@ -733,7 +732,6 @@
  				_("Unknown login ID, the user database might be corrupted"));
  		return ;
  	}
diff --git a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
index 78449651b..ab7180f75 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
+++ b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
@@ -1,6 +1,6 @@
---- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Sun May 22 22:57:24 2005
-+++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Sun May 22 22:58:27 2005
-@@ -243,11 +243,12 @@ xkb_options_add_group (const XklConfigIt
+--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Wed Jul 27 13:48:58 2005
++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Wed Jul 27 13:49:37 2005
+@@ -265,11 +265,12 @@
                                           GladeXML * dialog)
  {
    GtkWidget *expander, *align, *vbox;
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in
index 52a627fb2..15281344b 100644
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in
@@ -1,11 +1,11 @@
---- gnome-settings-daemon/actions/Makefile.in.orig	Mon Dec 20 19:19:31 2004
-+++ gnome-settings-daemon/actions/Makefile.in	Mon Dec 20 19:20:45 2004
-@@ -296,7 +296,7 @@
+--- gnome-settings-daemon/actions/Makefile.in.orig	Wed Jul 27 13:38:40 2005
++++ gnome-settings-daemon/actions/Makefile.in	Wed Jul 27 13:38:59 2005
+@@ -375,7 +375,7 @@
+ libacme_la_LIBADD = $(am__append_3) $(am__append_6)
  Datadir = $(datadir)/control-center-2.0/interfaces/
  Data_DATA = acme.glade
- 
 -pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
 +pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps
  pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png
- 
  EXTRA_DIST = \
+ 	acme-volume-alsa.c acme-volume-alsa.h	\
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
index f66b82c9f..ed30cddab 100644
--- 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
@@ -1,6 +1,6 @@
---- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	Thu Oct 14 15:44:21 2004
-+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	Thu Oct 14 15:44:38 2004
-@@ -813,7 +813,7 @@
+--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	Wed Jul 27 13:52:13 2005
++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	Wed Jul 27 13:52:32 2005
+@@ -828,7 +828,7 @@
  		do_mail_action (acme);
  		break;
  	case SLEEP_KEY:
@@ -8,4 +8,4 @@
 +		do_sleep_action ("zzz", "xset dpms force off");
  		break;
  	case SCREENSAVER_KEY:
- 		execute ("xscreensaver-command -lock", FALSE);
+ 		if ((cmd = g_find_program_in_path ("gnome-screensaver-command")))
diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c
deleted file mode 100644
index 149d59a9b..000000000
--- a/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwindow-settings/wm-list.c.orig	Tue Oct  8 17:43:12 2002
-+++ libwindow-settings/wm-list.c	Tue Oct  8 17:43:25 2002
-@@ -251,7 +251,7 @@
-         gchar *name;
- 	GConfClient *client;
- 	
--        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
-+        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
-         wm_list_read_dir (tempdir, FALSE);
-         g_free (tempdir);
-         
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 3a3d7a9a5..02bcd1a28 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -35,13 +35,13 @@ lib/window-manager-settings/libmetacity.so
 libdata/bonobo/servers/GNOME_SettingsDaemon.server
 libdata/pkgconfig/gnome-window-settings-2.0.pc
 libexec/gnome-settings-daemon
-%%ABOUTME%%share/gnome/applications/gnome-about-me.desktop
 share/gnome/applications/accessibility-keyboard.desktop
 share/gnome/applications/at-properties.desktop
 share/gnome/applications/background.desktop
 share/gnome/applications/default-applications.desktop
 share/gnome/applications/display-properties.desktop
 share/gnome/applications/font-properties.desktop
+%%ABOUTME%%share/gnome/applications/gnome-about-me.desktop
 share/gnome/applications/gnome-font-viewer.desktop
 share/gnome/applications/gnome-network-preferences.desktop
 share/gnome/applications/gnome-settings-mouse.desktop
@@ -53,13 +53,12 @@ share/gnome/applications/keybinding.desktop
 share/gnome/applications/keyboard.desktop
 share/gnome/applications/themus-theme-applier.desktop
 share/gnome/applications/window-properties.desktop
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/control-center-2.0/icons/display-capplet.png
-%%ABOUTME%%share/gnome/control-center-2.0/interfaces/gnome-about-me.glade
 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/font-properties.glade
+%%ABOUTME%%share/gnome/control-center-2.0/interfaces/gnome-about-me.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
@@ -116,8 +115,24 @@ share/gnome/control-center-2.0/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
+share/gnome/help/control-center/C/config-accessibility-keyboard.xml
+share/gnome/help/control-center/C/config-background.xml
+share/gnome/help/control-center/C/config-behavior.xml
+share/gnome/help/control-center/C/config-cds.xml
+share/gnome/help/control-center/C/config-default-apps.xml
+share/gnome/help/control-center/C/config-file-type.xml
+share/gnome/help/control-center/C/config-hints.xml
+share/gnome/help/control-center/C/config-html.xml
+share/gnome/help/control-center/C/config-kbd.xml
+share/gnome/help/control-center/C/config-keybindings.xml
+share/gnome/help/control-center/C/config-mouse.xml
+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/idl/ConfigArchiver.idl
 share/gnome/idl/GNOME_SettingsDaemon.idl
+share/gnome/omf/control-center/control-center-C.omf
 share/gnome/pixmaps/display-capplet.png
 share/gnome/vfolders/font-method.directory
 share/gnome/vfolders/theme-method.directory
@@ -195,8 +210,17 @@ share/locale/xh/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
 share/locale/zu/LC_MESSAGES/control-center-2.0.mo
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw 2> /dev/null || true
 @unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/nso 2> /dev/null || true
+@dirrm share/gnome/omf/control-center
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
 @dirrm share/gnome/gnome-background-properties
 @dirrm share/gnome/cursor-fonts
 @dirrm share/gnome/control-center-2.0/xrdb
@@ -205,4 +229,5 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo
 @unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true