Update to 2.8.1.20041212 (cvs snapshot)

This is a cvs snapshot from 12/12/2004 for us who are tired of waiting for
an official gnome 2.9 release.


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

18 files changed, 126 insertions, 326 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 45b8dc08e..7ba1a1b7a 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.8.1
-PORTREVISION=	3
+PORTVERSION=	2.8.1.20041212
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.8
-DISTNAME=	control-center-${PORTVERSION}
+MASTER_SITES=	http://people.freebsd.org/~ahze/
+#		${MASTER_SITE_GNOME}
+#MASTER_SITE_SUBDIR=	sources/control-center/2.8
+DISTNAME=	gnome-control-center
+#		control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -38,8 +39,6 @@ GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 		desktop_gnome_peripherals_keyboard_xkb.schemas \
 		fontilus.schemas themus.schemas
 
-BROKEN=	"Does not build with new Nautilus"
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index c420e2166..4bfba79f6 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.8.1.tar.bz2) = 7bd9c12b9abb05b6fcf7b4906b6918ea
-SIZE (gnome2/control-center-2.8.1.tar.bz2) = 2547071
+MD5 (gnome2/gnome-control-center.tar.bz2) = 996c71c19b295a559232e0766578e5f6
+SIZE (gnome2/gnome-control-center.tar.bz2) = 2122851
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
deleted file mode 100644
index 5a6b0ba8f..000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
deleted file mode 100644
index 9c487d7b8..000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- capplets/mouse/gnome-mouse-properties.c.orig	Sat Nov  2 13:40:22 2002
-+++ capplets/mouse/gnome-mouse-properties.c	Sun Dec 22 16:33:36 2002
-@@ -591,7 +591,7 @@
- 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL);
- 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- 	g_free (filename);
--	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf", FALSE, NULL);
-+	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf", FALSE, NULL);
- 
- 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -612,7 +612,7 @@
- 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL);
- 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- 	g_free (filename);
--	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf", FALSE, NULL);
-+	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf", FALSE, NULL);
- 
- 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -633,7 +633,7 @@
- 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL);
- 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- 	g_free (filename);
--	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
-+	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
- 
- 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 44a777897..f9e0648a5 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Mar 11 03:09:48 2004
-+++ configure	Thu Mar 11 03:12:25 2004
-@@ -21373,6 +21373,7 @@
+--- configure.orig	Mon Dec 13 00:32:14 2004
++++ configure	Mon Dec 13 00:37:30 2004
+@@ -22217,6 +22217,7 @@
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -8,7 +8,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21461,6 +21462,7 @@
+@@ -22612,6 +22613,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
@@ -16,7 +16,7 @@
   have_ngettext=yes
  fi
  done
-@@ -26257,7 +26259,7 @@
+@@ -27817,7 +27819,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
new file mode 100644
index 000000000..c92d8a8fb
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
@@ -0,0 +1,11 @@
+--- gnome-settings-daemon/actions/Makefile.in.orig	Mon Dec 13 01:38:04 2004
++++ gnome-settings-daemon/actions/Makefile.in	Mon Dec 13 01:38:27 2004
+@@ -343,7 +343,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 = \
+ 	acme-volume-alsa.c acme-volume-alsa.h	\
diff --git a/sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_config.c b/sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_config.c
deleted file mode 100644
index 02e95c1e6..000000000
--- a/sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_config.c
+++ /dev/null
@@ -1,72 +0,0 @@
---- libgswitchit/gswitchit_config.c.orig	Thu Oct 14 14:44:52 2004
-+++ libgswitchit/gswitchit_config.c	Wed Nov 24 00:26:59 2004
-@@ -380,44 +380,6 @@
- }
- 
- static gboolean
--_GSwitchItXkbConfigDoWithSettings (GSwitchItXkbConfig *
--				   xkbConfig,
--				   gboolean activate,
--				   const char *psFileName)
--{
--	gboolean rv = FALSE;
--
--	XklConfigRec data;
--	XklConfigRecInit (&data);
--
--	_GSwitchItXkbConfigCopyToXklConfig (xkbConfig, &data);
--
--	if (activate) {
--		rv = XklConfigActivate (&data, NULL);
--	} else {
--		char *home = getenv ("HOME");
--		char xkmFileName[PATH_MAX];
--		char cmd[PATH_MAX * 2 + 20];
--		int status;
--		g_snprintf (xkmFileName, sizeof (xkmFileName),
--			    "%s/.gnome_private/xkbpreview.xkm", home);
--		rv = XklConfigWriteXKMFile (xkmFileName, &data, NULL);
--		if (rv) {
--			g_snprintf (cmd, sizeof (cmd),
--				    "xkbprint -full -color %s %s",
--				    xkmFileName, psFileName);
--			status = system (cmd);
--			XklDebug (100, "Res: [%d]\n", status);
--			//unlink( xkmFileName );
--		} else {
--			XklDebug (10, "Could not create XKM file!\n");
--		}
--	}
--	XklConfigRecDestroy (&data);
--	return rv;
--}
--
--static gboolean
- _GSListStrEqual (GSList * l1, GSList * l2)
- {
- 	if (l1 == l2)
-@@ -752,15 +714,16 @@
- gboolean
- GSwitchItXkbConfigActivate (GSwitchItXkbConfig * xkbConfig)
- {
--	return _GSwitchItXkbConfigDoWithSettings (xkbConfig, TRUE, NULL);
--}
-+	gboolean rv = FALSE;
- 
--gboolean
--GSwitchItXkbConfigDumpSettings (GSwitchItXkbConfig * xkbConfig,
--				const char *fileName)
--{
--	return _GSwitchItXkbConfigDoWithSettings (xkbConfig, FALSE,
--						  fileName);
-+	XklConfigRec data;
-+	XklConfigRecInit (&data);
-+
-+	_GSwitchItXkbConfigCopyToXklConfig (xkbConfig, &data);
-+
-+	rv = XklConfigActivate (&data);
-+	XklConfigRecDestroy (&data);
-+	return rv;
- }
- 
- void
diff --git a/sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_util.c b/sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_util.c
new file mode 100644
index 000000000..484a3e5f4
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_util.c
@@ -0,0 +1,11 @@
+--- libgswitchit/gswitchit_util.c.orig	Mon Dec 13 01:09:01 2004
++++ libgswitchit/gswitchit_util.c	Mon Dec 13 01:15:31 2004
+@@ -60,7 +60,7 @@
+ 		      int level, const char format[], va_list args)
+ {
+ 	time_t now = time (NULL);
+-	g_log (NULL, G_LOG_LEVEL_DEBUG, "[%08ld,%03d,%s:%s/] \t", now,
++	g_log (NULL, G_LOG_LEVEL_DEBUG, "[%08ld,%03d,%s:%s/] \t", (long) now,
+ 	       level, file, function);
+ 	g_logv (NULL, G_LOG_LEVEL_DEBUG, format, args);
+ }
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index ddf578890..be4d1b389 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -22,37 +22,35 @@ 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/bonobo/libthemus-theme-properties-view.so
 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/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/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/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/default-applications.desktop
-share/gnome/control-center-2.0/capplets/display-properties.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/window-properties.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
 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
@@ -75,8 +73,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/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
@@ -86,8 +82,6 @@ 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-cursor.png
 share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
@@ -115,23 +109,16 @@ 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/gnome-2.0/ui/gnomecc-ui.xml
 share/gnome/idl/ConfigArchiver.idl
 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/control-center2.png
 share/gnome/pixmaps/display-capplet.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/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/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
@@ -176,6 +163,7 @@ share/locale/nb/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
@@ -196,12 +184,15 @@ share/locale/vi/LC_MESSAGES/control-center-2.0.mo
 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
+@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/vfolders
 @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
 @dirrm share/gnome/control-center-2.0/icons
+@dirrm share/gnome/control-center-2.0
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 45b8dc08e..7ba1a1b7a 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.8.1
-PORTREVISION=	3
+PORTVERSION=	2.8.1.20041212
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.8
-DISTNAME=	control-center-${PORTVERSION}
+MASTER_SITES=	http://people.freebsd.org/~ahze/
+#		${MASTER_SITE_GNOME}
+#MASTER_SITE_SUBDIR=	sources/control-center/2.8
+DISTNAME=	gnome-control-center
+#		control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -38,8 +39,6 @@ GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 		desktop_gnome_peripherals_keyboard_xkb.schemas \
 		fontilus.schemas themus.schemas
 
-BROKEN=	"Does not build with new Nautilus"
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index c420e2166..4bfba79f6 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.8.1.tar.bz2) = 7bd9c12b9abb05b6fcf7b4906b6918ea
-SIZE (gnome2/control-center-2.8.1.tar.bz2) = 2547071
+MD5 (gnome2/gnome-control-center.tar.bz2) = 996c71c19b295a559232e0766578e5f6
+SIZE (gnome2/gnome-control-center.tar.bz2) = 2122851
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in
deleted file mode 100644
index 5a6b0ba8f..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
deleted file mode 100644
index 9c487d7b8..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- capplets/mouse/gnome-mouse-properties.c.orig	Sat Nov  2 13:40:22 2002
-+++ capplets/mouse/gnome-mouse-properties.c	Sun Dec 22 16:33:36 2002
-@@ -591,7 +591,7 @@
- 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL);
- 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- 	g_free (filename);
--	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf", FALSE, NULL);
-+	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf", FALSE, NULL);
- 
- 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -612,7 +612,7 @@
- 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL);
- 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- 	g_free (filename);
--	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf", FALSE, NULL);
-+	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf", FALSE, NULL);
- 
- 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -633,7 +633,7 @@
- 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL);
- 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- 	g_free (filename);
--	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
-+	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
- 
- 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
index 44a777897..f9e0648a5 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Mar 11 03:09:48 2004
-+++ configure	Thu Mar 11 03:12:25 2004
-@@ -21373,6 +21373,7 @@
+--- configure.orig	Mon Dec 13 00:32:14 2004
++++ configure	Mon Dec 13 00:37:30 2004
+@@ -22217,6 +22217,7 @@
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -8,7 +8,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21461,6 +21462,7 @@
+@@ -22612,6 +22613,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
@@ -16,7 +16,7 @@
   have_ngettext=yes
  fi
  done
-@@ -26257,7 +26259,7 @@
+@@ -27817,7 +27819,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
new file mode 100644
index 000000000..c92d8a8fb
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
@@ -0,0 +1,11 @@
+--- gnome-settings-daemon/actions/Makefile.in.orig	Mon Dec 13 01:38:04 2004
++++ gnome-settings-daemon/actions/Makefile.in	Mon Dec 13 01:38:27 2004
+@@ -343,7 +343,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 = \
+ 	acme-volume-alsa.c acme-volume-alsa.h	\
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_config.c b/sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_config.c
deleted file mode 100644
index 02e95c1e6..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_config.c
+++ /dev/null
@@ -1,72 +0,0 @@
---- libgswitchit/gswitchit_config.c.orig	Thu Oct 14 14:44:52 2004
-+++ libgswitchit/gswitchit_config.c	Wed Nov 24 00:26:59 2004
-@@ -380,44 +380,6 @@
- }
- 
- static gboolean
--_GSwitchItXkbConfigDoWithSettings (GSwitchItXkbConfig *
--				   xkbConfig,
--				   gboolean activate,
--				   const char *psFileName)
--{
--	gboolean rv = FALSE;
--
--	XklConfigRec data;
--	XklConfigRecInit (&data);
--
--	_GSwitchItXkbConfigCopyToXklConfig (xkbConfig, &data);
--
--	if (activate) {
--		rv = XklConfigActivate (&data, NULL);
--	} else {
--		char *home = getenv ("HOME");
--		char xkmFileName[PATH_MAX];
--		char cmd[PATH_MAX * 2 + 20];
--		int status;
--		g_snprintf (xkmFileName, sizeof (xkmFileName),
--			    "%s/.gnome_private/xkbpreview.xkm", home);
--		rv = XklConfigWriteXKMFile (xkmFileName, &data, NULL);
--		if (rv) {
--			g_snprintf (cmd, sizeof (cmd),
--				    "xkbprint -full -color %s %s",
--				    xkmFileName, psFileName);
--			status = system (cmd);
--			XklDebug (100, "Res: [%d]\n", status);
--			//unlink( xkmFileName );
--		} else {
--			XklDebug (10, "Could not create XKM file!\n");
--		}
--	}
--	XklConfigRecDestroy (&data);
--	return rv;
--}
--
--static gboolean
- _GSListStrEqual (GSList * l1, GSList * l2)
- {
- 	if (l1 == l2)
-@@ -752,15 +714,16 @@
- gboolean
- GSwitchItXkbConfigActivate (GSwitchItXkbConfig * xkbConfig)
- {
--	return _GSwitchItXkbConfigDoWithSettings (xkbConfig, TRUE, NULL);
--}
-+	gboolean rv = FALSE;
- 
--gboolean
--GSwitchItXkbConfigDumpSettings (GSwitchItXkbConfig * xkbConfig,
--				const char *fileName)
--{
--	return _GSwitchItXkbConfigDoWithSettings (xkbConfig, FALSE,
--						  fileName);
-+	XklConfigRec data;
-+	XklConfigRecInit (&data);
-+
-+	_GSwitchItXkbConfigCopyToXklConfig (xkbConfig, &data);
-+
-+	rv = XklConfigActivate (&data);
-+	XklConfigRecDestroy (&data);
-+	return rv;
- }
- 
- void
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_util.c b/sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_util.c
new file mode 100644
index 000000000..484a3e5f4
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_util.c
@@ -0,0 +1,11 @@
+--- libgswitchit/gswitchit_util.c.orig	Mon Dec 13 01:09:01 2004
++++ libgswitchit/gswitchit_util.c	Mon Dec 13 01:15:31 2004
+@@ -60,7 +60,7 @@
+ 		      int level, const char format[], va_list args)
+ {
+ 	time_t now = time (NULL);
+-	g_log (NULL, G_LOG_LEVEL_DEBUG, "[%08ld,%03d,%s:%s/] \t", now,
++	g_log (NULL, G_LOG_LEVEL_DEBUG, "[%08ld,%03d,%s:%s/] \t", (long) now,
+ 	       level, file, function);
+ 	g_logv (NULL, G_LOG_LEVEL_DEBUG, format, args);
+ }
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index ddf578890..be4d1b389 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -22,37 +22,35 @@ 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/bonobo/libthemus-theme-properties-view.so
 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/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/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/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/default-applications.desktop
-share/gnome/control-center-2.0/capplets/display-properties.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/window-properties.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
 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
@@ -75,8 +73,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/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
@@ -86,8 +82,6 @@ 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-cursor.png
 share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
@@ -115,23 +109,16 @@ 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/gnome-2.0/ui/gnomecc-ui.xml
 share/gnome/idl/ConfigArchiver.idl
 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/control-center2.png
 share/gnome/pixmaps/display-capplet.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/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/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
@@ -176,6 +163,7 @@ share/locale/nb/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
@@ -196,12 +184,15 @@ share/locale/vi/LC_MESSAGES/control-center-2.0.mo
 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
+@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/vfolders
 @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
 @dirrm share/gnome/control-center-2.0/icons
+@dirrm share/gnome/control-center-2.0
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0