Add and fix build with new gnome-menu.

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

22 files changed, 1070 insertions, 0 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
new file mode 100644
index 000000000..08722863a
--- /dev/null
+++ b/sysutils/gnome-control-center/Makefile
@@ -0,0 +1,54 @@
+# New ports collection makefile for:	gnomecontrolcenter2
+# Date created:				04 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gnomecontrolcenter2
+PORTVERSION=	2.10.1
+PORTREVISION=	1
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/control-center/2.10
+DISTNAME=	control-center-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Control center for GNOME 2 project
+
+LIB_DEPENDS=	xklavier.10:${PORTSDIR}/x11/libxklavier
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+GNOME_DESKTOP_VERSION=2
+USE_GSTREAMER=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautilus2 \
+		gnomemenus desktopfileutils
+USE_LIBTOOL_VER=15
+INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
+		apps_gnome_settings_daemon_keybindings.schemas \
+		apps_gnome_settings_daemon_screensaver.schemas \
+		desktop_gnome_font_rendering.schemas \
+		desktop_gnome_peripherals_keyboard_xkb.schemas \
+		fontilus.schemas themus.schemas
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
+	@${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \
+		${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c
+	@${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \
+		s|/bin/gzip|/usr/bin/gzip|g' \
+		${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c
+
+post-install:
+	@-update-desktop-database
+
+.include <bsd.port.mk>
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
new file mode 100644
index 000000000..1c42a8a89
--- /dev/null
+++ b/sysutils/gnome-control-center/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/control-center-2.10.1.tar.bz2) = d95a5746aa349536dc0f59c61cdaf19f
+SIZE (gnome2/control-center-2.10.1.tar.bz2) = 2648247
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
new file mode 100644
index 000000000..02374b23a
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
@@ -0,0 +1,33 @@
+--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Wed Jan 19 18:16:13 2005
++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Wed Feb  9 21:33:00 2005
+@@ -242,21 +242,25 @@
+                                          Bool allowMultipleSelection,
+                                          GladeXML * dialog)
+ {
++  gchar *utfGroupName, *titlemarkup;
++  GtkWidget *expander;
++  GtkWidget *vbox;
++  GtkWidget *align;
+   GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
+ 
+   current1stLevelId = configItem->name;
+ 
+-  gchar *utfGroupName = xci_desc_to_utf8 (configItem);
+-  gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
++  utfGroupName = xci_desc_to_utf8 (configItem);
++  titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
+ 
+-  GtkWidget *expander = gtk_expander_new (titlemarkup);
++  expander = gtk_expander_new (titlemarkup);
+   g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
+ 
+   g_free (titlemarkup);
+   gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE);
+-  GtkWidget *align = gtk_alignment_new (0, 0, 1, 1);
++  align = gtk_alignment_new (0, 0, 1, 1);
+   gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
+-  GtkWidget *vbox = gtk_vbox_new (TRUE, 6);
++  vbox = gtk_vbox_new (TRUE, 6);
+   gtk_container_add (GTK_CONTAINER (align), vbox);
+   gtk_container_add (GTK_CONTAINER (expander), align);
+   currentVbox = vbox;
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
new file mode 100644
index 000000000..d8e861724
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig	Thu Jan 13 02:39:28 2005
++++ configure	Thu Jan 13 02:39:28 2005
+@@ -22221,6 +22221,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
+@@ -27490,7 +27491,7 @@
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
++#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
+ _ACEOF
+ 
+ 
diff --git a/sysutils/gnome-control-center/files/patch-control-center_control-center-categories.c b/sysutils/gnome-control-center/files/patch-control-center_control-center-categories.c
new file mode 100644
index 000000000..78baf3c4b
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-control-center_control-center-categories.c
@@ -0,0 +1,179 @@
+--- control-center/control-center-categories.c	2005/02/03 21:59:49	1.5
++++ control-center/control-center-categories.c	2005/05/02 08:05:27	1.9
+@@ -33,8 +33,8 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ 
+-#define MENU_I_KNOW_THIS_IS_UNSTABLE
+-#include <menu-tree.h>
++#define GMENU_I_KNOW_THIS_IS_UNSTABLE
++#include <gmenu-tree.h>
+ 
+ static char *
+ remove_icon_suffix (const char *icon)
+@@ -87,17 +87,17 @@
+ 
+ static ControlCenterEntry *
+ control_center_entry_new (ControlCenterCategory *category,
+-			  MenuTreeEntry         *menu_entry)
++			  GMenuTreeEntry        *menu_entry)
+ {
+ 	ControlCenterEntry *retval;
+ 
+ 	retval = g_new0 (ControlCenterEntry, 1);
+ 
+ 	retval->category      = category;
+-	retval->title         = g_strdup (menu_tree_entry_get_name (menu_entry));
+-	retval->comment       = g_strdup (menu_tree_entry_get_comment (menu_entry));
+-	retval->desktop_entry = g_strdup (menu_tree_entry_get_desktop_file_path (menu_entry));
+-	retval->icon_pixbuf   = load_icon (menu_tree_entry_get_icon (menu_entry));
++	retval->title         = g_strdup (gmenu_tree_entry_get_name (menu_entry));
++	retval->comment       = g_strdup (gmenu_tree_entry_get_comment (menu_entry));
++	retval->desktop_entry = g_strdup (gmenu_tree_entry_get_desktop_file_path (menu_entry));
++	retval->icon_pixbuf   = load_icon (gmenu_tree_entry_get_icon (menu_entry));
+ 
+ 	return retval;
+ }
+@@ -125,25 +125,27 @@
+ 
+ static void
+ populate_category (ControlCenterCategory *category,
+-		   MenuTreeDirectory     *menu_directory)
++		   GMenuTreeDirectory    *menu_directory)
+ {
+-	GSList *menu_entries;
++	GSList *items;
+ 	GSList *entries;
+ 	GSList *l;
+ 
+ 	entries = NULL;
+ 
+-	menu_entries = menu_tree_directory_get_entries (menu_directory);
+-	for (l = menu_entries; l; l = l->next) {
+-		MenuTreeEntry *menu_entry = l->data;
++	items = gmenu_tree_directory_get_contents (menu_directory);
++	for (l = items; l; l = l->next) {
++		GMenuTreeItem *item = l->data;
++
++		if (gmenu_tree_item_get_type (item) == GMENU_TREE_ITEM_ENTRY)
++			entries = g_slist_append (entries,
++						  control_center_entry_new (category,
++									    GMENU_TREE_ENTRY (item)));
+ 
+-		entries = g_slist_prepend (entries,
+-					   control_center_entry_new (category, menu_entry));
+-
+-		menu_tree_entry_unref (menu_entry);
++		gmenu_tree_item_unref (item);
+ 	}
+ 
+-	g_slist_free (menu_entries);
++	g_slist_free (items);
+ 
+ 	if (entries != NULL) {
+ 		GSList *l;
+@@ -160,15 +162,15 @@
+ }
+ 
+ static ControlCenterCategory *
+-control_center_category_new (MenuTreeDirectory *menu_directory,
+-			     const char        *title,
+-			     gboolean           real_category)
++control_center_category_new (GMenuTreeDirectory *menu_directory,
++			     const char         *title,
++			     gboolean            real_category)
+ {
+ 	ControlCenterCategory *retval;
+ 
+ 	retval = g_new0 (ControlCenterCategory, 1);
+ 
+-	retval->title         = g_strdup (title ? title : menu_tree_directory_get_name (menu_directory));
++	retval->title         = g_strdup (title ? title : gmenu_tree_directory_get_name (menu_directory));
+ 	retval->real_category = real_category != FALSE;
+ 
+ 	populate_category (retval, menu_directory);
+@@ -193,25 +195,31 @@
+ }
+ 
+ static GSList *
+-read_categories_from_menu_directory (MenuTreeDirectory *directory,
+-				     GSList            *categories)
++read_categories_from_menu_directory (GMenuTreeDirectory *directory,
++				     GSList             *categories)
+ {
+-	GSList *subdirs;
++	GSList *items;
+ 	GSList *l;
+ 
+-	subdirs = menu_tree_directory_get_subdirs (directory);
+-	for (l = subdirs; l; l = l->next) {
+-		MenuTreeDirectory *subdir = l->data;
++	items = gmenu_tree_directory_get_contents (directory);
++	for (l = items; l; l = l->next) {
++		GMenuTreeItem *item = l->data;
++
++		if (gmenu_tree_item_get_type (item) == GMENU_TREE_ITEM_DIRECTORY) {
++			GMenuTreeDirectory *subdir;
+ 
+-		categories = g_slist_prepend (categories,
+-					      control_center_category_new (subdir, NULL, TRUE));
++			subdir = GMENU_TREE_DIRECTORY (item);
+ 
+-		categories = read_categories_from_menu_directory (subdir, categories);
++			categories = g_slist_prepend (categories,
++						      control_center_category_new (subdir, NULL, TRUE));
++
++			categories = read_categories_from_menu_directory (subdir, categories);
++		}
+ 
+-		menu_tree_directory_unref (subdir);
++		gmenu_tree_item_unref (item);
+ 	}
+ 
+-	g_slist_free (subdirs);
++	g_slist_free (items);
+ 
+ 	return categories;
+ }
+@@ -227,17 +235,17 @@
+ control_center_get_information (void)
+ {
+ 	ControlCenterInformation *information;
+-	MenuTree                 *menu_tree;
+-	MenuTreeDirectory        *menu_root;
++	GMenuTree                *menu_tree;
++	GMenuTreeDirectory       *menu_root;
+ 	GSList                   *categories;
+ 	GSList                   *prev, *curr;
+ 
+ 	information = g_new0 (ControlCenterInformation, 1);
+ 
+-	menu_tree = menu_tree_lookup ("preferences.menu");
++	menu_tree = gmenu_tree_lookup ("preferences.menu", GMENU_TREE_FLAGS_NONE);
+ 
+-	if (!(menu_root = menu_tree_get_root_directory (menu_tree))) {
+-		menu_tree_unref (menu_tree);
++	if (!(menu_root = gmenu_tree_get_root_directory (menu_tree))) {
++		gmenu_tree_unref (menu_tree);
+ 		return information;
+ 	}
+ 
+@@ -257,7 +265,7 @@
+ 		}
+ 	}
+ 
+-	menu_tree_directory_unref (menu_root);
++	gmenu_tree_item_unref (menu_root);
+ 
+ 	if (categories != NULL) {
+ 		GSList *l;
+@@ -272,7 +280,7 @@
+ 		g_slist_free (categories);
+ 	}
+ 
+-	menu_tree_unref (menu_tree);
++	gmenu_tree_unref (menu_tree);
+ 
+ 	return information;
+ }
+
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
new file mode 100644
index 000000000..52a627fb2
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in
@@ -0,0 +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 @@
+ 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 = \
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
new file mode 100644
index 000000000..f66b82c9f
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
@@ -0,0 +1,11 @@
+--- 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 @@
+ 		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:
+ 		execute ("xscreensaver-command -lock", FALSE);
diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c
new file mode 100644
index 000000000..95bbf2ea4
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c
@@ -0,0 +1,11 @@
+--- libwindow-settings/gnome-wm-manager.c.orig	Mon Nov 11 00:42:08 2002
++++ libwindow-settings/gnome-wm-manager.c	Mon Nov 11 00:43:26 2002
+@@ -227,7 +227,7 @@
+ 
+         done_scan = TRUE;
+         
+-        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
++        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
+         scan_wm_directory (tempdir, FALSE);
+         g_free (tempdir);
+         
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
new file mode 100644
index 000000000..149d59a9b
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c
@@ -0,0 +1,11 @@
+--- 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-descr b/sysutils/gnome-control-center/pkg-descr
new file mode 100644
index 000000000..26d4dbe92
--- /dev/null
+++ b/sysutils/gnome-control-center/pkg-descr
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..9bf38dd44
--- /dev/null
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -0,0 +1,203 @@
+bin/gnome-accessibility-keyboard-properties
+bin/gnome-at-properties
+bin/gnome-background-properties
+bin/gnome-control-center
+bin/gnome-default-applications-properties
+bin/gnome-display-properties
+bin/gnome-font-properties
+bin/gnome-font-viewer
+bin/gnome-keybinding-properties
+bin/gnome-keyboard-properties
+bin/gnome-mouse-properties
+bin/gnome-network-preferences
+bin/gnome-sound-properties
+bin/gnome-theme-manager
+bin/gnome-theme-thumbnailer
+bin/gnome-thumbnail-font
+bin/gnome-typing-monitor
+bin/gnome-ui-properties
+bin/gnome-window-properties
+bin/themus-theme-applier
+etc/gnome-vfs-2.0/modules/font-method.conf
+etc/gnome-vfs-2.0/modules/theme-method.conf
+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.so
+lib/gnome-vfs-2.0/modules/libtheme-method.so
+lib/libgnome-window-settings.a
+lib/libgnome-window-settings.so
+lib/libgnome-window-settings.so.1
+lib/nautilus/extensions-1.0/libnautilus-fontilus.so
+lib/nautilus/extensions-1.0/libnautilus-themus.so
+lib/window-manager-settings/libmetacity.a
+lib/window-manager-settings/libmetacity.so
+libdata/bonobo/servers/GNOME_SettingsDaemon.server
+libdata/pkgconfig/gnome-window-settings-2.0.pc
+libexec/gnome-settings-daemon
+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
+share/gnome/applications/gnome-font-viewer.desktop
+share/gnome/applications/gnome-network-preferences.desktop
+share/gnome/applications/gnome-settings-mouse.desktop
+share/gnome/applications/gnome-settings-sound.desktop
+share/gnome/applications/gnome-ui-properties.desktop
+share/gnome/applications/gnomecc.desktop
+share/gnome/applications/gtk-theme-selector.desktop
+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
+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
+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
+share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade
+share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade
+share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade
+share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
+share/gnome/control-center-2.0/interfaces/modmap-dialog.glade
+share/gnome/control-center-2.0/interfaces/sound-properties.glade
+share/gnome/control-center-2.0/interfaces/theme-install.glade
+share/gnome/control-center-2.0/interfaces/theme-properties.glade
+share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png
+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-startup.png
+share/gnome/control-center-2.0/pixmaps/at-support.png
+share/gnome/control-center-2.0/pixmaps/bar-disabled.png
+share/gnome/control-center-2.0/pixmaps/bar-green.png
+share/gnome/control-center-2.0/pixmaps/bar-red.png
+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/keyboard-bell.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
+share/gnome/control-center-2.0/pixmaps/mouse-cursor-normal-large.png
+share/gnome/control-center-2.0/pixmaps/mouse-cursor-normal.png
+share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png
+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/stop.png
+share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png
+share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png
+share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png
+share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png
+share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png
+share/gnome/control-center-2.0/pixmaps/visual-bell.png
+share/gnome/control-center-2.0/xrdb/Editres.ad
+share/gnome/control-center-2.0/xrdb/Emacs.ad
+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/cursor-fonts/cursor-large-white.pcf
+share/gnome/cursor-fonts/cursor-large.pcf
+share/gnome/cursor-fonts/cursor-white.pcf
+share/gnome/idl/ConfigArchiver.idl
+share/gnome/idl/GNOME_SettingsDaemon.idl
+share/gnome/pixmaps/display-capplet.png
+share/gnome/vfolders/font-method.directory
+share/gnome/vfolders/theme-method.directory
+share/icons/gnome/48x48/apps/acme-brightness.png
+share/icons/gnome/48x48/apps/acme-eject.png
+share/icons/gnome/48x48/apps/gnome-speakernotes-muted.png
+share/icons/gnome/48x48/apps/gnome-speakernotes.png
+share/icons/hicolor/48x48/apps/gnome-control-center.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
+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/bs/LC_MESSAGES/control-center-2.0.mo
+share/locale/ca/LC_MESSAGES/control-center-2.0.mo
+share/locale/cs/LC_MESSAGES/control-center-2.0.mo
+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
+share/locale/eu/LC_MESSAGES/control-center-2.0.mo
+share/locale/fa/LC_MESSAGES/control-center-2.0.mo
+share/locale/fi/LC_MESSAGES/control-center-2.0.mo
+share/locale/fr/LC_MESSAGES/control-center-2.0.mo
+share/locale/ga/LC_MESSAGES/control-center-2.0.mo
+share/locale/gl/LC_MESSAGES/control-center-2.0.mo
+share/locale/gu/LC_MESSAGES/control-center-2.0.mo
+share/locale/he/LC_MESSAGES/control-center-2.0.mo
+share/locale/hi/LC_MESSAGES/control-center-2.0.mo
+share/locale/hr/LC_MESSAGES/control-center-2.0.mo
+share/locale/hu/LC_MESSAGES/control-center-2.0.mo
+share/locale/id/LC_MESSAGES/control-center-2.0.mo
+share/locale/is/LC_MESSAGES/control-center-2.0.mo
+share/locale/it/LC_MESSAGES/control-center-2.0.mo
+share/locale/ja/LC_MESSAGES/control-center-2.0.mo
+share/locale/ko/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/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/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/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
+share/locale/ro/LC_MESSAGES/control-center-2.0.mo
+share/locale/ru/LC_MESSAGES/control-center-2.0.mo
+share/locale/rw/LC_MESSAGES/control-center-2.0.mo
+share/locale/sk/LC_MESSAGES/control-center-2.0.mo
+share/locale/sl/LC_MESSAGES/control-center-2.0.mo
+share/locale/sq/LC_MESSAGES/control-center-2.0.mo
+share/locale/sr/LC_MESSAGES/control-center-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
+share/locale/sv/LC_MESSAGES/control-center-2.0.mo
+share/locale/ta/LC_MESSAGES/control-center-2.0.mo
+share/locale/th/LC_MESSAGES/control-center-2.0.mo
+share/locale/tr/LC_MESSAGES/control-center-2.0.mo
+share/locale/uk/LC_MESSAGES/control-center-2.0.mo
+share/locale/vi/LC_MESSAGES/control-center-2.0.mo
+share/locale/wa/LC_MESSAGES/control-center-2.0.mo
+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/nso/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso 2> /dev/null || true
+@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
+@dirrm share/gnome/control-center-2.0/interfaces
+@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
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
new file mode 100644
index 000000000..08722863a
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -0,0 +1,54 @@
+# New ports collection makefile for:	gnomecontrolcenter2
+# Date created:				04 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gnomecontrolcenter2
+PORTVERSION=	2.10.1
+PORTREVISION=	1
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/control-center/2.10
+DISTNAME=	control-center-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Control center for GNOME 2 project
+
+LIB_DEPENDS=	xklavier.10:${PORTSDIR}/x11/libxklavier
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+GNOME_DESKTOP_VERSION=2
+USE_GSTREAMER=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautilus2 \
+		gnomemenus desktopfileutils
+USE_LIBTOOL_VER=15
+INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
+		apps_gnome_settings_daemon_keybindings.schemas \
+		apps_gnome_settings_daemon_screensaver.schemas \
+		desktop_gnome_font_rendering.schemas \
+		desktop_gnome_peripherals_keyboard_xkb.schemas \
+		fontilus.schemas themus.schemas
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
+	@${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \
+		${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c
+	@${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \
+		s|/bin/gzip|/usr/bin/gzip|g' \
+		${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c
+
+post-install:
+	@-update-desktop-database
+
+.include <bsd.port.mk>
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
new file mode 100644
index 000000000..1c42a8a89
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/control-center-2.10.1.tar.bz2) = d95a5746aa349536dc0f59c61cdaf19f
+SIZE (gnome2/control-center-2.10.1.tar.bz2) = 2648247
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
new file mode 100644
index 000000000..02374b23a
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
@@ -0,0 +1,33 @@
+--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Wed Jan 19 18:16:13 2005
++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Wed Feb  9 21:33:00 2005
+@@ -242,21 +242,25 @@
+                                          Bool allowMultipleSelection,
+                                          GladeXML * dialog)
+ {
++  gchar *utfGroupName, *titlemarkup;
++  GtkWidget *expander;
++  GtkWidget *vbox;
++  GtkWidget *align;
+   GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
+ 
+   current1stLevelId = configItem->name;
+ 
+-  gchar *utfGroupName = xci_desc_to_utf8 (configItem);
+-  gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
++  utfGroupName = xci_desc_to_utf8 (configItem);
++  titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
+ 
+-  GtkWidget *expander = gtk_expander_new (titlemarkup);
++  expander = gtk_expander_new (titlemarkup);
+   g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
+ 
+   g_free (titlemarkup);
+   gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE);
+-  GtkWidget *align = gtk_alignment_new (0, 0, 1, 1);
++  align = gtk_alignment_new (0, 0, 1, 1);
+   gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
+-  GtkWidget *vbox = gtk_vbox_new (TRUE, 6);
++  vbox = gtk_vbox_new (TRUE, 6);
+   gtk_container_add (GTK_CONTAINER (align), vbox);
+   gtk_container_add (GTK_CONTAINER (expander), align);
+   currentVbox = vbox;
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
new file mode 100644
index 000000000..d8e861724
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig	Thu Jan 13 02:39:28 2005
++++ configure	Thu Jan 13 02:39:28 2005
+@@ -22221,6 +22221,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
+@@ -27490,7 +27491,7 @@
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
++#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
+ _ACEOF
+ 
+ 
diff --git a/sysutils/gnomecontrolcenter2/files/patch-control-center_control-center-categories.c b/sysutils/gnomecontrolcenter2/files/patch-control-center_control-center-categories.c
new file mode 100644
index 000000000..78baf3c4b
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-control-center_control-center-categories.c
@@ -0,0 +1,179 @@
+--- control-center/control-center-categories.c	2005/02/03 21:59:49	1.5
++++ control-center/control-center-categories.c	2005/05/02 08:05:27	1.9
+@@ -33,8 +33,8 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ 
+-#define MENU_I_KNOW_THIS_IS_UNSTABLE
+-#include <menu-tree.h>
++#define GMENU_I_KNOW_THIS_IS_UNSTABLE
++#include <gmenu-tree.h>
+ 
+ static char *
+ remove_icon_suffix (const char *icon)
+@@ -87,17 +87,17 @@
+ 
+ static ControlCenterEntry *
+ control_center_entry_new (ControlCenterCategory *category,
+-			  MenuTreeEntry         *menu_entry)
++			  GMenuTreeEntry        *menu_entry)
+ {
+ 	ControlCenterEntry *retval;
+ 
+ 	retval = g_new0 (ControlCenterEntry, 1);
+ 
+ 	retval->category      = category;
+-	retval->title         = g_strdup (menu_tree_entry_get_name (menu_entry));
+-	retval->comment       = g_strdup (menu_tree_entry_get_comment (menu_entry));
+-	retval->desktop_entry = g_strdup (menu_tree_entry_get_desktop_file_path (menu_entry));
+-	retval->icon_pixbuf   = load_icon (menu_tree_entry_get_icon (menu_entry));
++	retval->title         = g_strdup (gmenu_tree_entry_get_name (menu_entry));
++	retval->comment       = g_strdup (gmenu_tree_entry_get_comment (menu_entry));
++	retval->desktop_entry = g_strdup (gmenu_tree_entry_get_desktop_file_path (menu_entry));
++	retval->icon_pixbuf   = load_icon (gmenu_tree_entry_get_icon (menu_entry));
+ 
+ 	return retval;
+ }
+@@ -125,25 +125,27 @@
+ 
+ static void
+ populate_category (ControlCenterCategory *category,
+-		   MenuTreeDirectory     *menu_directory)
++		   GMenuTreeDirectory    *menu_directory)
+ {
+-	GSList *menu_entries;
++	GSList *items;
+ 	GSList *entries;
+ 	GSList *l;
+ 
+ 	entries = NULL;
+ 
+-	menu_entries = menu_tree_directory_get_entries (menu_directory);
+-	for (l = menu_entries; l; l = l->next) {
+-		MenuTreeEntry *menu_entry = l->data;
++	items = gmenu_tree_directory_get_contents (menu_directory);
++	for (l = items; l; l = l->next) {
++		GMenuTreeItem *item = l->data;
++
++		if (gmenu_tree_item_get_type (item) == GMENU_TREE_ITEM_ENTRY)
++			entries = g_slist_append (entries,
++						  control_center_entry_new (category,
++									    GMENU_TREE_ENTRY (item)));
+ 
+-		entries = g_slist_prepend (entries,
+-					   control_center_entry_new (category, menu_entry));
+-
+-		menu_tree_entry_unref (menu_entry);
++		gmenu_tree_item_unref (item);
+ 	}
+ 
+-	g_slist_free (menu_entries);
++	g_slist_free (items);
+ 
+ 	if (entries != NULL) {
+ 		GSList *l;
+@@ -160,15 +162,15 @@
+ }
+ 
+ static ControlCenterCategory *
+-control_center_category_new (MenuTreeDirectory *menu_directory,
+-			     const char        *title,
+-			     gboolean           real_category)
++control_center_category_new (GMenuTreeDirectory *menu_directory,
++			     const char         *title,
++			     gboolean            real_category)
+ {
+ 	ControlCenterCategory *retval;
+ 
+ 	retval = g_new0 (ControlCenterCategory, 1);
+ 
+-	retval->title         = g_strdup (title ? title : menu_tree_directory_get_name (menu_directory));
++	retval->title         = g_strdup (title ? title : gmenu_tree_directory_get_name (menu_directory));
+ 	retval->real_category = real_category != FALSE;
+ 
+ 	populate_category (retval, menu_directory);
+@@ -193,25 +195,31 @@
+ }
+ 
+ static GSList *
+-read_categories_from_menu_directory (MenuTreeDirectory *directory,
+-				     GSList            *categories)
++read_categories_from_menu_directory (GMenuTreeDirectory *directory,
++				     GSList             *categories)
+ {
+-	GSList *subdirs;
++	GSList *items;
+ 	GSList *l;
+ 
+-	subdirs = menu_tree_directory_get_subdirs (directory);
+-	for (l = subdirs; l; l = l->next) {
+-		MenuTreeDirectory *subdir = l->data;
++	items = gmenu_tree_directory_get_contents (directory);
++	for (l = items; l; l = l->next) {
++		GMenuTreeItem *item = l->data;
++
++		if (gmenu_tree_item_get_type (item) == GMENU_TREE_ITEM_DIRECTORY) {
++			GMenuTreeDirectory *subdir;
+ 
+-		categories = g_slist_prepend (categories,
+-					      control_center_category_new (subdir, NULL, TRUE));
++			subdir = GMENU_TREE_DIRECTORY (item);
+ 
+-		categories = read_categories_from_menu_directory (subdir, categories);
++			categories = g_slist_prepend (categories,
++						      control_center_category_new (subdir, NULL, TRUE));
++
++			categories = read_categories_from_menu_directory (subdir, categories);
++		}
+ 
+-		menu_tree_directory_unref (subdir);
++		gmenu_tree_item_unref (item);
+ 	}
+ 
+-	g_slist_free (subdirs);
++	g_slist_free (items);
+ 
+ 	return categories;
+ }
+@@ -227,17 +235,17 @@
+ control_center_get_information (void)
+ {
+ 	ControlCenterInformation *information;
+-	MenuTree                 *menu_tree;
+-	MenuTreeDirectory        *menu_root;
++	GMenuTree                *menu_tree;
++	GMenuTreeDirectory       *menu_root;
+ 	GSList                   *categories;
+ 	GSList                   *prev, *curr;
+ 
+ 	information = g_new0 (ControlCenterInformation, 1);
+ 
+-	menu_tree = menu_tree_lookup ("preferences.menu");
++	menu_tree = gmenu_tree_lookup ("preferences.menu", GMENU_TREE_FLAGS_NONE);
+ 
+-	if (!(menu_root = menu_tree_get_root_directory (menu_tree))) {
+-		menu_tree_unref (menu_tree);
++	if (!(menu_root = gmenu_tree_get_root_directory (menu_tree))) {
++		gmenu_tree_unref (menu_tree);
+ 		return information;
+ 	}
+ 
+@@ -257,7 +265,7 @@
+ 		}
+ 	}
+ 
+-	menu_tree_directory_unref (menu_root);
++	gmenu_tree_item_unref (menu_root);
+ 
+ 	if (categories != NULL) {
+ 		GSList *l;
+@@ -272,7 +280,7 @@
+ 		g_slist_free (categories);
+ 	}
+ 
+-	menu_tree_unref (menu_tree);
++	gmenu_tree_unref (menu_tree);
+ 
+ 	return information;
+ }
+
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in
new file mode 100644
index 000000000..52a627fb2
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in
@@ -0,0 +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 @@
+ 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 = \
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
new file mode 100644
index 000000000..f66b82c9f
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
@@ -0,0 +1,11 @@
+--- 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 @@
+ 		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:
+ 		execute ("xscreensaver-command -lock", FALSE);
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_gnome-wm-manager.c b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_gnome-wm-manager.c
new file mode 100644
index 000000000..95bbf2ea4
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_gnome-wm-manager.c
@@ -0,0 +1,11 @@
+--- libwindow-settings/gnome-wm-manager.c.orig	Mon Nov 11 00:42:08 2002
++++ libwindow-settings/gnome-wm-manager.c	Mon Nov 11 00:43:26 2002
+@@ -227,7 +227,7 @@
+ 
+         done_scan = TRUE;
+         
+-        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
++        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
+         scan_wm_directory (tempdir, FALSE);
+         g_free (tempdir);
+         
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c
new file mode 100644
index 000000000..149d59a9b
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c
@@ -0,0 +1,11 @@
+--- 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/gnomecontrolcenter2/pkg-descr b/sysutils/gnomecontrolcenter2/pkg-descr
new file mode 100644
index 000000000..26d4dbe92
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/pkg-descr
@@ -0,0 +1 @@
+Configuration tools tightly integrated within the GNOME 2 desktop.
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
new file mode 100644
index 000000000..9bf38dd44
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -0,0 +1,203 @@
+bin/gnome-accessibility-keyboard-properties
+bin/gnome-at-properties
+bin/gnome-background-properties
+bin/gnome-control-center
+bin/gnome-default-applications-properties
+bin/gnome-display-properties
+bin/gnome-font-properties
+bin/gnome-font-viewer
+bin/gnome-keybinding-properties
+bin/gnome-keyboard-properties
+bin/gnome-mouse-properties
+bin/gnome-network-preferences
+bin/gnome-sound-properties
+bin/gnome-theme-manager
+bin/gnome-theme-thumbnailer
+bin/gnome-thumbnail-font
+bin/gnome-typing-monitor
+bin/gnome-ui-properties
+bin/gnome-window-properties
+bin/themus-theme-applier
+etc/gnome-vfs-2.0/modules/font-method.conf
+etc/gnome-vfs-2.0/modules/theme-method.conf
+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.so
+lib/gnome-vfs-2.0/modules/libtheme-method.so
+lib/libgnome-window-settings.a
+lib/libgnome-window-settings.so
+lib/libgnome-window-settings.so.1
+lib/nautilus/extensions-1.0/libnautilus-fontilus.so
+lib/nautilus/extensions-1.0/libnautilus-themus.so
+lib/window-manager-settings/libmetacity.a
+lib/window-manager-settings/libmetacity.so
+libdata/bonobo/servers/GNOME_SettingsDaemon.server
+libdata/pkgconfig/gnome-window-settings-2.0.pc
+libexec/gnome-settings-daemon
+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
+share/gnome/applications/gnome-font-viewer.desktop
+share/gnome/applications/gnome-network-preferences.desktop
+share/gnome/applications/gnome-settings-mouse.desktop
+share/gnome/applications/gnome-settings-sound.desktop
+share/gnome/applications/gnome-ui-properties.desktop
+share/gnome/applications/gnomecc.desktop
+share/gnome/applications/gtk-theme-selector.desktop
+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
+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
+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
+share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade
+share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade
+share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade
+share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
+share/gnome/control-center-2.0/interfaces/modmap-dialog.glade
+share/gnome/control-center-2.0/interfaces/sound-properties.glade
+share/gnome/control-center-2.0/interfaces/theme-install.glade
+share/gnome/control-center-2.0/interfaces/theme-properties.glade
+share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png
+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-startup.png
+share/gnome/control-center-2.0/pixmaps/at-support.png
+share/gnome/control-center-2.0/pixmaps/bar-disabled.png
+share/gnome/control-center-2.0/pixmaps/bar-green.png
+share/gnome/control-center-2.0/pixmaps/bar-red.png
+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/keyboard-bell.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
+share/gnome/control-center-2.0/pixmaps/mouse-cursor-normal-large.png
+share/gnome/control-center-2.0/pixmaps/mouse-cursor-normal.png
+share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png
+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/stop.png
+share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png
+share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png
+share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png
+share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png
+share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png
+share/gnome/control-center-2.0/pixmaps/visual-bell.png
+share/gnome/control-center-2.0/xrdb/Editres.ad
+share/gnome/control-center-2.0/xrdb/Emacs.ad
+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/cursor-fonts/cursor-large-white.pcf
+share/gnome/cursor-fonts/cursor-large.pcf
+share/gnome/cursor-fonts/cursor-white.pcf
+share/gnome/idl/ConfigArchiver.idl
+share/gnome/idl/GNOME_SettingsDaemon.idl
+share/gnome/pixmaps/display-capplet.png
+share/gnome/vfolders/font-method.directory
+share/gnome/vfolders/theme-method.directory
+share/icons/gnome/48x48/apps/acme-brightness.png
+share/icons/gnome/48x48/apps/acme-eject.png
+share/icons/gnome/48x48/apps/gnome-speakernotes-muted.png
+share/icons/gnome/48x48/apps/gnome-speakernotes.png
+share/icons/hicolor/48x48/apps/gnome-control-center.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
+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/bs/LC_MESSAGES/control-center-2.0.mo
+share/locale/ca/LC_MESSAGES/control-center-2.0.mo
+share/locale/cs/LC_MESSAGES/control-center-2.0.mo
+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
+share/locale/eu/LC_MESSAGES/control-center-2.0.mo
+share/locale/fa/LC_MESSAGES/control-center-2.0.mo
+share/locale/fi/LC_MESSAGES/control-center-2.0.mo
+share/locale/fr/LC_MESSAGES/control-center-2.0.mo
+share/locale/ga/LC_MESSAGES/control-center-2.0.mo
+share/locale/gl/LC_MESSAGES/control-center-2.0.mo
+share/locale/gu/LC_MESSAGES/control-center-2.0.mo
+share/locale/he/LC_MESSAGES/control-center-2.0.mo
+share/locale/hi/LC_MESSAGES/control-center-2.0.mo
+share/locale/hr/LC_MESSAGES/control-center-2.0.mo
+share/locale/hu/LC_MESSAGES/control-center-2.0.mo
+share/locale/id/LC_MESSAGES/control-center-2.0.mo
+share/locale/is/LC_MESSAGES/control-center-2.0.mo
+share/locale/it/LC_MESSAGES/control-center-2.0.mo
+share/locale/ja/LC_MESSAGES/control-center-2.0.mo
+share/locale/ko/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/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/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/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
+share/locale/ro/LC_MESSAGES/control-center-2.0.mo
+share/locale/ru/LC_MESSAGES/control-center-2.0.mo
+share/locale/rw/LC_MESSAGES/control-center-2.0.mo
+share/locale/sk/LC_MESSAGES/control-center-2.0.mo
+share/locale/sl/LC_MESSAGES/control-center-2.0.mo
+share/locale/sq/LC_MESSAGES/control-center-2.0.mo
+share/locale/sr/LC_MESSAGES/control-center-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
+share/locale/sv/LC_MESSAGES/control-center-2.0.mo
+share/locale/ta/LC_MESSAGES/control-center-2.0.mo
+share/locale/th/LC_MESSAGES/control-center-2.0.mo
+share/locale/tr/LC_MESSAGES/control-center-2.0.mo
+share/locale/uk/LC_MESSAGES/control-center-2.0.mo
+share/locale/vi/LC_MESSAGES/control-center-2.0.mo
+share/locale/wa/LC_MESSAGES/control-center-2.0.mo
+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/nso/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso 2> /dev/null || true
+@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
+@dirrm share/gnome/control-center-2.0/interfaces
+@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
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true