Add gnomecontrolcenter2 after repo copy from gnomecontrolcenter. This

is the configuration frontend for the GNOME 2.0 desktop.

33 files changed, 439 insertions, 740 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 49c3e94..9a7264d 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -69,6 +69,7 @@
     SUBDIR += gkrellmouse
     SUBDIR += glload
     SUBDIR += gnomecontrolcenter
+    SUBDIR += gnomecontrolcenter2
     SUBDIR += gnomefind
     SUBDIR += gpart
     SUBDIR += grub
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 06b8969..15590ba 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -1,38 +1,38 @@
-# New ports collection makefile for:	control-center
-# Date created:				29 Dec 1998
-# Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
+# New ports collection makefile for:	gnomecontrolcenter2
+# Date created:				04 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.4.0.5
-PORTREVISION=	1
+PORTNAME=	gnomecontrolcenter2
+PORTVERSION=	1.99.9
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/control-center
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DISTNAME=	control-center-${PORTVERSION}
-DIST_SUBDIR=	gnome
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomecanvas \
-		gnomevfs.0:${PORTSDIR}/devel/gnomevfs
+LIB_DEPENDS=	gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOMELIBS=	yes
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index c018396..30c800f 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (gnome/control-center-1.4.0.5.tar.bz2) = 63e731f7c9f5fca354de5de4f881e952
+MD5 (gnome2/control-center-1.99.9.tar.bz2) = 339cab7a6f0cb812eec342e0d6ac8fbc
diff --git a/sysutils/gnome-control-center/files/patch-Makefile.in b/sysutils/gnome-control-center/files/patch-Makefile.in
deleted file mode 100644
index feb6352..0000000
--- a/sysutils/gnome-control-center/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in	2002/02/05 09:46:12	1.1
-+++ Makefile.in	2002/02/05 09:46:25
-@@ -151,7 +151,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
- 
--always_built_SUBDIRS = control-center capplets idl doc omf-install man
-+always_built_SUBDIRS = control-center capplets idl doc omf-install
- 
- SUBDIRS = intl po macros \
- 	 $(always_built_SUBDIRS)
diff --git a/sysutils/gnome-control-center/files/patch-ad b/sysutils/gnome-control-center/files/patch-ad
deleted file mode 100644
index c27189a..0000000
--- a/sysutils/gnome-control-center/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/wm-properties/wm-list.c.orig	Tue Mar  2 22:53:29 1999
-+++ capplets/wm-properties/wm-list.c	Tue Mar  2 22:53:52 1999
-@@ -210,7 +210,7 @@
-         gchar *tempdir;
-         gchar *name;
-         
--        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/files/patch-bn b/sysutils/gnome-control-center/files/patch-bn
deleted file mode 100644
index 294e18f..0000000
--- a/sysutils/gnome-control-center/files/patch-bn
+++ /dev/null
@@ -1,16 +0,0 @@
---- control-center/Makefile.in.orig	Tue Aug  1 22:42:01 2000
-+++ control-center/Makefile.in	Tue Aug  1 22:45:47 2000
-@@ -162,3 +162,3 @@
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = cappletConf.sh
-@@ -168,3 +168,3 @@
- 
--libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libcapplet_la_LDFLAGS = -version-info 5:0:0
- libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
-@@ -590,2 +590,3 @@
- 	    -e 's?\@ORB_LIBS\@?$(ORB_LIBS)?g' \
-+	    -e 's?\@VERSION\@?$(VERSION)?g' \
- 	    < $(srcdir)/cappletConf.sh.in > cappletConf.tmp \
diff --git a/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig b/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig
index c1c29de..e69de29 100644
--- a/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig
+++ b/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig
@@ -1,7 +0,0 @@
---- capplets/Makefile.in.orig	Sun Feb 10 15:41:49 2002
-+++ capplets/Makefile.in	Wed Feb 13 09:34:28 2002
-@@ -154,3 +154,3 @@
- always_built_SUBDIRS = desktop-links mouse-properties \
--	screensaver-properties background-properties \
-+	background-properties \
-         theme-switcher sound-properties \
diff --git a/sysutils/gnome-control-center/files/patch-capplets::theme-switcher::lister.c b/sysutils/gnome-control-center/files/patch-capplets::theme-switcher::lister.c
deleted file mode 100644
index ce81703..0000000
--- a/sysutils/gnome-control-center/files/patch-capplets::theme-switcher::lister.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- capplets/theme-switcher/lister.c	2002/03/29 12:43:59	1.1
-+++ capplets/theme-switcher/lister.c	2002/03/29 12:45:18
-@@ -115,8 +115,7 @@
-   char *errstring = NULL;
-   int out_fd;
- #ifndef HAVE_GETLINE
--  char line[1024];
--  char *lineptr = line;
-+  char *lineptr = (char *)malloc(1024);
- #else
-   char *lineptr = NULL;
- #endif
diff --git a/sysutils/gnome-control-center/files/patch-capplets_file-types_file-types-icon-entry.c b/sysutils/gnome-control-center/files/patch-capplets_file-types_file-types-icon-entry.c
deleted file mode 100644
index 5b48cd2..0000000
--- a/sysutils/gnome-control-center/files/patch-capplets_file-types_file-types-icon-entry.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/file-types/file-types-icon-entry.c.orig	Sun May  5 16:33:51 2002
-+++ capplets/file-types/file-types-icon-entry.c	Sun May  5 16:34:02 2002
-@@ -424,7 +424,7 @@
- 	result = NULL;
- 	filename = nautilus_mime_type_icon_entry_get_full_filename (NAUTILUS_MIME_ICON_ENTRY (ientry));
- 	if (filename != NULL) {
--		path_parts = g_strsplit (filename, "/share/pixmaps/", 0);
-+		path_parts = g_strsplit (filename, "/share/gnome/pixmaps/", 0);
- 		g_free (filename);
- 
- 		if (path_parts[1] != NULL) {
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
new file mode 100644
index 0000000..d5ce54f8
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
@@ -0,0 +1,29 @@
+--- capplets/mouse/gnome-mouse-properties.c.orig	Sun May  5 01:04:48 2002
++++ capplets/mouse/gnome-mouse-properties.c	Sun May  5 01:05:10 2002
+@@ -532,7 +532,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.gz", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf.gz", FALSE, NULL);
+ 
+ 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
+@@ -553,7 +553,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.gz", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf.gz", FALSE, NULL);
+ 
+ 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
+@@ -574,7 +574,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.gz", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf.gz", 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-ce b/sysutils/gnome-control-center/files/patch-ce
deleted file mode 100644
index b2186ac..0000000
--- a/sysutils/gnome-control-center/files/patch-ce
+++ /dev/null
@@ -1,8 +0,0 @@
---- capplets/wm-properties/wm-desktops/WindowMaker.desktop.orig	Wed May 12 02:56:05 1999
-+++ capplets/wm-properties/wm-desktops/WindowMaker.desktop	Wed May 12 02:56:22 1999
-@@ -5,4 +5,4 @@
- 
- [Window Manager]
- SessionManaged=false
--ConfigExec=/usr/X11R6/lib/GNUstep/Apps/WPrefs.app/WPrefs
-+ConfigExec=/usr/X11R6/share/GNUstep/Apps/WPrefs.app/WPrefs
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 5356635..7e44bf4 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,11 +1,19 @@
---- configure.orig	Sun May  5 16:29:53 2002
-+++ configure	Sun May  5 16:30:05 2002
-@@ -9161,7 +9161,7 @@
+--- configure.orig	Mon May  6 01:33:23 2002
++++ configure	Mon May  6 01:33:51 2002
+@@ -7353,6 +7353,7 @@
  
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
- cat >> confdefs.h <<EOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- EOF
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -11337,7 +11338,7 @@
+ fi
  
+ cat >>confdefs.h <<EOF
+-#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
++#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
+ EOF
  
+ GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
diff --git a/sysutils/gnome-control-center/files/patch-ltmain.sh b/sysutils/gnome-control-center/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2..0000000
--- a/sysutils/gnome-control-center/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/sysutils/gnome-control-center/files/patch-po::Makefile.in.in b/sysutils/gnome-control-center/files/patch-po::Makefile.in.in
deleted file mode 100644
index 02994b4..0000000
--- a/sysutils/gnome-control-center/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/02/05 08:03:55	1.1
-+++ po/Makefile.in.in	2002/02/05 08:04:08
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/sysutils/gnome-control-center/pkg-comment b/sysutils/gnome-control-center/pkg-comment
index f907c34..7d382af 100644
--- a/sysutils/gnome-control-center/pkg-comment
+++ b/sysutils/gnome-control-center/pkg-comment
@@ -1 +1 @@
-Control center for GNOME project
+Control center for GNOME 2.0 project
diff --git a/sysutils/gnome-control-center/pkg-descr b/sysutils/gnome-control-center/pkg-descr
index b9ead63..017e3d7 100644
--- a/sysutils/gnome-control-center/pkg-descr
+++ b/sysutils/gnome-control-center/pkg-descr
@@ -1 +1 @@
-control center for GNOME project.
+control center for GNOME 2.0 project.
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 851c8c4..b04fd1d 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,206 +1,159 @@
-bin/background-properties-capplet
-bin/default-application-properties-capplet
-bin/file-types-capplet
-bin/gnomecc
-bin/keyboard-properties
-bin/mouse-properties-capplet
-bin/sound-properties
-bin/theme-selector-capplet
-bin/ui-properties
-bin/url-properties
-bin/wm-properties-capplet
-etc/CORBA/servers/gnomecc.gnorba
-etc/cappletConf.sh
-include/libcapplet1/capplet-widget.h
-lib/libcapplet.a
-lib/libcapplet.so
-lib/libcapplet.so.5
-share/gnome/apps/Settings/Desktop/.directory
-share/gnome/apps/Settings/Desktop/background-properties.desktop
-share/gnome/apps/Settings/Desktop/theme-selector.desktop
-share/gnome/apps/Settings/Desktop/wm-properties.desktop
-share/gnome/apps/Settings/Documents/.directory
-share/gnome/apps/Settings/Documents/default-applicaiton-properties.desktop
-share/gnome/apps/Settings/Documents/url-properties.desktop
-share/gnome/apps/Settings/Multimedia/.directory
-share/gnome/apps/Settings/Multimedia/sound-properties.desktop
-share/gnome/apps/Settings/Peripherals/.directory
-share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
-share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
-share/gnome/apps/Settings/Session/.directory
-share/gnome/apps/Settings/UIOptions/.directory
-share/gnome/apps/Settings/file-types-capplet.desktop
-share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/control-center/.directory
-share/gnome/control-center/Desktop/.directory
-share/gnome/control-center/Desktop/background-properties.desktop
-share/gnome/control-center/Desktop/theme-selector.desktop
-share/gnome/control-center/Desktop/wm-properties.desktop
-share/gnome/control-center/Documents/.directory
-share/gnome/control-center/Documents/default-application-properties.desktop
-share/gnome/control-center/Documents/file-types-capplet.desktop
-share/gnome/control-center/Documents/url-properties.desktop
-share/gnome/control-center/Multimedia/.directory
-share/gnome/control-center/Multimedia/sound-properties.desktop
-share/gnome/control-center/Peripherals/.directory
-share/gnome/control-center/Peripherals/keyboard-properties.desktop
-share/gnome/control-center/Peripherals/mouse-properties.desktop
-share/gnome/control-center/Session/.directory
-share/gnome/control-center/UIOptions/.directory
-share/gnome/control-center/UIOptions/application.desktop
-share/gnome/control-center/UIOptions/dialogs.desktop
-share/gnome/control-center/UIOptions/mdi.desktop
-share/gnome/help/control-center/C/control-center.sgml
-share/gnome/help/control-center/C/desktop-intro.html
-share/gnome/help/control-center/C/doc-handlers.html
-share/gnome/help/control-center/C/figures/bg-capplet.png
-share/gnome/help/control-center/C/figures/gccalf.png
-share/gnome/help/control-center/C/figures/gccappdef.png
-share/gnome/help/control-center/C/figures/gccdialog.png
-share/gnome/help/control-center/C/figures/gccedit.png
-share/gnome/help/control-center/C/figures/gcchints.png
-share/gnome/help/control-center/C/figures/gccmdi.png
-share/gnome/help/control-center/C/figures/gccmime.png
-share/gnome/help/control-center/C/figures/gccsession-props.png
-share/gnome/help/control-center/C/figures/gccsessopt.png
-share/gnome/help/control-center/C/figures/gccsound1.png
-share/gnome/help/control-center/C/figures/gccsound2.png
-share/gnome/help/control-center/C/figures/gccstartup.png
-share/gnome/help/control-center/C/figures/gccurl.png
-share/gnome/help/control-center/C/figures/glob_pref_anim.png
-share/gnome/help/control-center/C/figures/keyboard-capplet.png
-share/gnome/help/control-center/C/figures/mouse-capplet.png
-share/gnome/help/control-center/C/figures/screensave-capplet.png
-share/gnome/help/control-center/C/figures/theme-select.png
-share/gnome/help/control-center/C/figures/wm-add.png
-share/gnome/help/control-center/C/figures/wm-main.png
-share/gnome/help/control-center/C/index.html
-share/gnome/help/control-center/C/ln7.html
-share/gnome/help/control-center/C/stylesheet-images/caution.gif
-share/gnome/help/control-center/C/stylesheet-images/home.gif
-share/gnome/help/control-center/C/stylesheet-images/important.gif
-share/gnome/help/control-center/C/stylesheet-images/next.gif
-share/gnome/help/control-center/C/stylesheet-images/note.gif
-share/gnome/help/control-center/C/stylesheet-images/prev.gif
-share/gnome/help/control-center/C/stylesheet-images/tip.gif
-share/gnome/help/control-center/C/stylesheet-images/toc-blank.gif
-share/gnome/help/control-center/C/stylesheet-images/toc-minus.gif
-share/gnome/help/control-center/C/stylesheet-images/toc-plus.gif
-share/gnome/help/control-center/C/stylesheet-images/up.gif
-share/gnome/help/control-center/C/stylesheet-images/warning.gif
-share/gnome/help/control-center/C/topic.dat
-share/gnome/help/control-center/C/usage.html
-share/gnome/help/control-center/eu/control-center.sgml
-share/gnome/help/control-center/eu/desktop-intro.html
-share/gnome/help/control-center/eu/doc-handlers.html
-share/gnome/help/control-center/eu/figures/bg-capplet.png
-share/gnome/help/control-center/eu/figures/gccalf.png
-share/gnome/help/control-center/eu/figures/gccappdef.png
-share/gnome/help/control-center/eu/figures/gccdialog.png
-share/gnome/help/control-center/eu/figures/gccedit.png
-share/gnome/help/control-center/eu/figures/gcchints.png
-share/gnome/help/control-center/eu/figures/gccmdi.png
-share/gnome/help/control-center/eu/figures/gccmime.png
-share/gnome/help/control-center/eu/figures/gccsession-props.png
-share/gnome/help/control-center/eu/figures/gccsessopt.png
-share/gnome/help/control-center/eu/figures/gccsound1.png
-share/gnome/help/control-center/eu/figures/gccsound2.png
-share/gnome/help/control-center/eu/figures/gccstartup.png
-share/gnome/help/control-center/eu/figures/gccurl.png
-share/gnome/help/control-center/eu/figures/glob_pref_anim.png
-share/gnome/help/control-center/eu/figures/keyboard-capplet.png
-share/gnome/help/control-center/eu/figures/mouse-capplet.png
-share/gnome/help/control-center/eu/figures/screensave-capplet.png
-share/gnome/help/control-center/eu/figures/theme-select.png
-share/gnome/help/control-center/eu/figures/wm-add.png
-share/gnome/help/control-center/eu/figures/wm-main.png
-share/gnome/help/control-center/eu/index.html
-share/gnome/help/control-center/eu/ln7.html
-share/gnome/help/control-center/eu/stylesheet-images/caution.gif
-share/gnome/help/control-center/eu/stylesheet-images/home.gif
-share/gnome/help/control-center/eu/stylesheet-images/important.gif
-share/gnome/help/control-center/eu/stylesheet-images/next.gif
-share/gnome/help/control-center/eu/stylesheet-images/note.gif
-share/gnome/help/control-center/eu/stylesheet-images/prev.gif
-share/gnome/help/control-center/eu/stylesheet-images/tip.gif
-share/gnome/help/control-center/eu/stylesheet-images/toc-blank.gif
-share/gnome/help/control-center/eu/stylesheet-images/toc-minus.gif
-share/gnome/help/control-center/eu/stylesheet-images/toc-plus.gif
-share/gnome/help/control-center/eu/stylesheet-images/up.gif
-share/gnome/help/control-center/eu/stylesheet-images/warning.gif
-share/gnome/help/control-center/eu/topic.dat
-share/gnome/help/control-center/eu/usage.html
-share/gnome/idl/control-center.idl
-share/gnome/omf/control-center/control-center-C.omf
-share/gnome/omf/control-center/control-center-eu.omf
-share/gnome/pixmaps/ccsplash.png
-share/gnome/pixmaps/control-center.png
-share/gnome/wm-properties/Enlightenment.desktop
-share/gnome/wm-properties/IceWM.desktop
-share/gnome/wm-properties/Scwm.desktop
-share/gnome/wm-properties/WindowMaker.desktop
-share/gnome/wm-properties/twm.desktop
-share/locale/az/LC_MESSAGES/control-center.mo
-share/locale/bg/LC_MESSAGES/control-center.mo
-share/locale/ca/LC_MESSAGES/control-center.mo
-share/locale/cs/LC_MESSAGES/control-center.mo
-share/locale/da/LC_MESSAGES/control-center.mo
-share/locale/de/LC_MESSAGES/control-center.mo
-share/locale/el/LC_MESSAGES/control-center.mo
-share/locale/en_GB/LC_MESSAGES/control-center.mo
-share/locale/es/LC_MESSAGES/control-center.mo
-share/locale/et/LC_MESSAGES/control-center.mo
-share/locale/eu/LC_MESSAGES/control-center.mo
-share/locale/fi/LC_MESSAGES/control-center.mo
-share/locale/fr/LC_MESSAGES/control-center.mo
-share/locale/ga/LC_MESSAGES/control-center.mo
-share/locale/gl/LC_MESSAGES/control-center.mo
-share/locale/hr/LC_MESSAGES/control-center.mo
-share/locale/hu/LC_MESSAGES/control-center.mo
-share/locale/it/LC_MESSAGES/control-center.mo
-share/locale/ja/LC_MESSAGES/control-center.mo
-share/locale/ko/LC_MESSAGES/control-center.mo
-share/locale/lt/LC_MESSAGES/control-center.mo
-share/locale/nl/LC_MESSAGES/control-center.mo
-share/locale/nn/LC_MESSAGES/control-center.mo
-share/locale/no/LC_MESSAGES/control-center.mo
-share/locale/pl/LC_MESSAGES/control-center.mo
-share/locale/pt/LC_MESSAGES/control-center.mo
-share/locale/pt_BR/LC_MESSAGES/control-center.mo
-share/locale/ro/LC_MESSAGES/control-center.mo
-share/locale/ru/LC_MESSAGES/control-center.mo
-share/locale/sk/LC_MESSAGES/control-center.mo
-share/locale/sl/LC_MESSAGES/control-center.mo
-share/locale/sv/LC_MESSAGES/control-center.mo
-share/locale/tr/LC_MESSAGES/control-center.mo
-share/locale/uk/LC_MESSAGES/control-center.mo
-share/locale/wa/LC_MESSAGES/control-center.mo
-share/locale/zh_CN/LC_MESSAGES/control-center.mo
-share/locale/zh_TW/LC_MESSAGES/control-center.mo
-@dirrm share/gnome/wm-properties
-@dirrm share/gnome/omf/control-center
-@dirrm share/gnome/help/control-center/C/stylesheet-images
-@dirrm share/gnome/help/control-center/C/figures
-@dirrm share/gnome/help/control-center/C
-@dirrm share/gnome/help/control-center/eu/stylesheet-images
-@dirrm share/gnome/help/control-center/eu/figures
-@dirrm share/gnome/help/control-center/eu
-@dirrm share/gnome/help/control-center
-@dirrm share/gnome/control-center/UIOptions
-@dirrm share/gnome/control-center/Session
-@dirrm share/gnome/control-center/Peripherals
-@dirrm share/gnome/control-center/Multimedia
-@dirrm share/gnome/control-center/Documents
-@dirrm share/gnome/control-center/Desktop
-@dirrm share/gnome/control-center
-@dirrm share/gnome/apps/Settings/UIOptions
-@dirrm share/gnome/apps/Settings/Session
-@dirrm share/gnome/apps/Settings/Peripherals
-@dirrm share/gnome/apps/Settings/Multimedia
-@dirrm share/gnome/apps/Settings/Documents
-@dirrm share/gnome/apps/Settings/Desktop
-@dirrm share/gnome/apps/Settings
-@dirrm share/gnome/apps
-@dirrm include/libcapplet1
-@dirrm etc/CORBA/servers
-@dirrm etc/CORBA
+bin/gnome-accessibility-keyboard-properties
+bin/gnome-background-properties
+bin/gnome-control-center
+bin/gnome-file-types-properties
+bin/gnome-font-properties
+bin/gnome-keybinding-properties
+bin/gnome-keyboard-properties
+bin/gnome-mouse-properties
+bin/gnome-network-preferences
+bin/gnome-settings-daemon
+bin/gnome-sound-properties
+bin/gnome-theme-properties
+bin/gnome-ui-properties
+etc/gconf/gconf.xml.defaults/apps/gnome_keybinding_properties/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome_keybinding_properties/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml
+etc/gconf/schemas/apps_gnome_keybinding_properties.schemas
+etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
+libdata/bonobo/servers/GNOME_SettingsDaemon.server
+share/gnome/applications/gnomecc.desktop
+share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
+share/gnome/control-center-2.0/capplets/background.desktop
+share/gnome/control-center-2.0/capplets/behavior.desktop
+share/gnome/control-center-2.0/capplets/file-types.desktop
+share/gnome/control-center-2.0/capplets/font-properties.desktop
+share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop
+share/gnome/control-center-2.0/capplets/gtk-theme-selector.desktop
+share/gnome/control-center-2.0/capplets/keybinding.desktop
+share/gnome/control-center-2.0/capplets/keyboard.desktop
+share/gnome/control-center-2.0/capplets/mouse.desktop
+share/gnome/control-center-2.0/capplets/sound.desktop
+share/gnome/control-center-2.0/icons/accessibility-directory.png
+share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png
+share/gnome/control-center-2.0/icons/advanced-directory.png
+share/gnome/control-center-2.0/icons/background-capplet.png
+share/gnome/control-center-2.0/icons/behavior-capplet.png
+share/gnome/control-center-2.0/icons/control-center.png
+share/gnome/control-center-2.0/icons/font-capplet.png
+share/gnome/control-center-2.0/icons/mouse-capplet.png
+share/gnome/control-center-2.0/icons/sound-capplet.png
+share/gnome/control-center-2.0/interfaces/background-properties.glade
+share/gnome/control-center-2.0/interfaces/file-types-properties.glade
+share/gnome/control-center-2.0/interfaces/font-properties.glade
+share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade2
+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/sound-properties.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/double-click-maybe.png
+share/gnome/control-center-2.0/pixmaps/double-click-off.png
+share/gnome/control-center-2.0/pixmaps/double-click-on.png
+share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
+share/gnome/control-center-2.0/pixmaps/keyboard-capplet.png
+share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
+share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
+share/gnome/control-center-2.0/pixmaps/keyboard-volume.png
+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/cursor-fonts/cursor-large-white.pcf.gz
+share/gnome/cursor-fonts/cursor-large.pcf.gz
+share/gnome/cursor-fonts/cursor-white.pcf.gz
+share/gnome/gnome-2.0/ui/gnomecc-ui.xml
+share/gnome/help/control-center-manual/C/config-accessibility-keyboard.xml
+share/gnome/help/control-center-manual/C/config-background.xml
+share/gnome/help/control-center-manual/C/config-behavior.xml
+share/gnome/help/control-center-manual/C/config-cds.xml
+share/gnome/help/control-center-manual/C/config-file-type.xml
+share/gnome/help/control-center-manual/C/config-hints.xml
+share/gnome/help/control-center-manual/C/config-html.xml
+share/gnome/help/control-center-manual/C/config-kbd.xml
+share/gnome/help/control-center-manual/C/config-keybindings.xml
+share/gnome/help/control-center-manual/C/config-mouse.xml
+share/gnome/help/control-center-manual/C/config-screensaver.xml
+share/gnome/help/control-center-manual/C/config-sound.xml
+share/gnome/help/control-center-manual/C/config-themes.xml
+share/gnome/idl/ConfigArchiver.idl
+share/gnome/idl/GNOME_SettingsDaemon.idl
+share/gnome/pixmaps/accessibility-keyboard-capplet.png
+share/gnome/pixmaps/background-capplet.png
+share/gnome/pixmaps/behavior-capplet.png
+share/gnome/pixmaps/control-center2.png
+share/gnome/pixmaps/font-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/pixmaps/keyboard-capplet.png
+share/gnome/pixmaps/keyboard-shortcut.png
+share/gnome/pixmaps/mouse-capplet.png
+share/gnome/pixmaps/sound-capplet.png
+share/gnome/vfolders/Accessibility.directory
+share/gnome/vfolders/Advanced.directory
+share/locale/az/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/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_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/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/hr/LC_MESSAGES/control-center-2.0.mo
+share/locale/hu/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/ms/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/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/sk/LC_MESSAGES/control-center-2.0.mo
+share/locale/sl/LC_MESSAGES/control-center-2.0.mo
+share/locale/sv/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/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
+@dirrm share/gnome/help/control-center-manual/C/figures
+@dirrm share/gnome/help/control-center-manual/C
+@dirrm share/gnome/help/control-center-manual
+@dirrm share/gnome/cursor-fonts
+@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 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_keybinding_properties
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_keybinding_properties
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 06b8969..15590ba 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -1,38 +1,38 @@
-# New ports collection makefile for:	control-center
-# Date created:				29 Dec 1998
-# Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
+# New ports collection makefile for:	gnomecontrolcenter2
+# Date created:				04 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.4.0.5
-PORTREVISION=	1
+PORTNAME=	gnomecontrolcenter2
+PORTVERSION=	1.99.9
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/control-center
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DISTNAME=	control-center-${PORTVERSION}
-DIST_SUBDIR=	gnome
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomecanvas \
-		gnomevfs.0:${PORTSDIR}/devel/gnomevfs
+LIB_DEPENDS=	gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOMELIBS=	yes
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index c018396..30c800f 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (gnome/control-center-1.4.0.5.tar.bz2) = 63e731f7c9f5fca354de5de4f881e952
+MD5 (gnome2/control-center-1.99.9.tar.bz2) = 339cab7a6f0cb812eec342e0d6ac8fbc
diff --git a/sysutils/gnomecontrolcenter2/files/patch-Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-Makefile.in
deleted file mode 100644
index feb6352..0000000
--- a/sysutils/gnomecontrolcenter2/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in	2002/02/05 09:46:12	1.1
-+++ Makefile.in	2002/02/05 09:46:25
-@@ -151,7 +151,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
- 
--always_built_SUBDIRS = control-center capplets idl doc omf-install man
-+always_built_SUBDIRS = control-center capplets idl doc omf-install
- 
- SUBDIRS = intl po macros \
- 	 $(always_built_SUBDIRS)
diff --git a/sysutils/gnomecontrolcenter2/files/patch-ad b/sysutils/gnomecontrolcenter2/files/patch-ad
deleted file mode 100644
index c27189a..0000000
--- a/sysutils/gnomecontrolcenter2/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/wm-properties/wm-list.c.orig	Tue Mar  2 22:53:29 1999
-+++ capplets/wm-properties/wm-list.c	Tue Mar  2 22:53:52 1999
-@@ -210,7 +210,7 @@
-         gchar *tempdir;
-         gchar *name;
-         
--        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/files/patch-bn b/sysutils/gnomecontrolcenter2/files/patch-bn
deleted file mode 100644
index 294e18f..0000000
--- a/sysutils/gnomecontrolcenter2/files/patch-bn
+++ /dev/null
@@ -1,16 +0,0 @@
---- control-center/Makefile.in.orig	Tue Aug  1 22:42:01 2000
-+++ control-center/Makefile.in	Tue Aug  1 22:45:47 2000
-@@ -162,3 +162,3 @@
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = cappletConf.sh
-@@ -168,3 +168,3 @@
- 
--libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libcapplet_la_LDFLAGS = -version-info 5:0:0
- libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
-@@ -590,2 +590,3 @@
- 	    -e 's?\@ORB_LIBS\@?$(ORB_LIBS)?g' \
-+	    -e 's?\@VERSION\@?$(VERSION)?g' \
- 	    < $(srcdir)/cappletConf.sh.in > cappletConf.tmp \
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in.orig b/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in.orig
index c1c29de..e69de29 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in.orig
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in.orig
@@ -1,7 +0,0 @@
---- capplets/Makefile.in.orig	Sun Feb 10 15:41:49 2002
-+++ capplets/Makefile.in	Wed Feb 13 09:34:28 2002
-@@ -154,3 +154,3 @@
- always_built_SUBDIRS = desktop-links mouse-properties \
--	screensaver-properties background-properties \
-+	background-properties \
-         theme-switcher sound-properties \
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets::theme-switcher::lister.c b/sysutils/gnomecontrolcenter2/files/patch-capplets::theme-switcher::lister.c
deleted file mode 100644
index ce81703..0000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets::theme-switcher::lister.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- capplets/theme-switcher/lister.c	2002/03/29 12:43:59	1.1
-+++ capplets/theme-switcher/lister.c	2002/03/29 12:45:18
-@@ -115,8 +115,7 @@
-   char *errstring = NULL;
-   int out_fd;
- #ifndef HAVE_GETLINE
--  char line[1024];
--  char *lineptr = line;
-+  char *lineptr = (char *)malloc(1024);
- #else
-   char *lineptr = NULL;
- #endif
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_file-types-icon-entry.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_file-types-icon-entry.c
deleted file mode 100644
index 5b48cd2..0000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_file-types-icon-entry.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/file-types/file-types-icon-entry.c.orig	Sun May  5 16:33:51 2002
-+++ capplets/file-types/file-types-icon-entry.c	Sun May  5 16:34:02 2002
-@@ -424,7 +424,7 @@
- 	result = NULL;
- 	filename = nautilus_mime_type_icon_entry_get_full_filename (NAUTILUS_MIME_ICON_ENTRY (ientry));
- 	if (filename != NULL) {
--		path_parts = g_strsplit (filename, "/share/pixmaps/", 0);
-+		path_parts = g_strsplit (filename, "/share/gnome/pixmaps/", 0);
- 		g_free (filename);
- 
- 		if (path_parts[1] != NULL) {
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
new file mode 100644
index 0000000..d5ce54f8
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
@@ -0,0 +1,29 @@
+--- capplets/mouse/gnome-mouse-properties.c.orig	Sun May  5 01:04:48 2002
++++ capplets/mouse/gnome-mouse-properties.c	Sun May  5 01:05:10 2002
+@@ -532,7 +532,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.gz", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf.gz", FALSE, NULL);
+ 
+ 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
+@@ -553,7 +553,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.gz", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf.gz", FALSE, NULL);
+ 
+ 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
+@@ -574,7 +574,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.gz", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf.gz", 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-ce b/sysutils/gnomecontrolcenter2/files/patch-ce
deleted file mode 100644
index b2186ac..0000000
--- a/sysutils/gnomecontrolcenter2/files/patch-ce
+++ /dev/null
@@ -1,8 +0,0 @@
---- capplets/wm-properties/wm-desktops/WindowMaker.desktop.orig	Wed May 12 02:56:05 1999
-+++ capplets/wm-properties/wm-desktops/WindowMaker.desktop	Wed May 12 02:56:22 1999
-@@ -5,4 +5,4 @@
- 
- [Window Manager]
- SessionManaged=false
--ConfigExec=/usr/X11R6/lib/GNUstep/Apps/WPrefs.app/WPrefs
-+ConfigExec=/usr/X11R6/share/GNUstep/Apps/WPrefs.app/WPrefs
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
index 5356635..7e44bf4 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -1,11 +1,19 @@
---- configure.orig	Sun May  5 16:29:53 2002
-+++ configure	Sun May  5 16:30:05 2002
-@@ -9161,7 +9161,7 @@
+--- configure.orig	Mon May  6 01:33:23 2002
++++ configure	Mon May  6 01:33:51 2002
+@@ -7353,6 +7353,7 @@
  
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
- cat >> confdefs.h <<EOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- EOF
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -11337,7 +11338,7 @@
+ fi
  
+ cat >>confdefs.h <<EOF
+-#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
++#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
+ EOF
  
+ GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
diff --git a/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2..0000000
--- a/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/sysutils/gnomecontrolcenter2/files/patch-po::Makefile.in.in b/sysutils/gnomecontrolcenter2/files/patch-po::Makefile.in.in
deleted file mode 100644
index 02994b4..0000000
--- a/sysutils/gnomecontrolcenter2/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/02/05 08:03:55	1.1
-+++ po/Makefile.in.in	2002/02/05 08:04:08
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/sysutils/gnomecontrolcenter2/pkg-comment b/sysutils/gnomecontrolcenter2/pkg-comment
index f907c34..7d382af 100644
--- a/sysutils/gnomecontrolcenter2/pkg-comment
+++ b/sysutils/gnomecontrolcenter2/pkg-comment
@@ -1 +1 @@
-Control center for GNOME project
+Control center for GNOME 2.0 project
diff --git a/sysutils/gnomecontrolcenter2/pkg-descr b/sysutils/gnomecontrolcenter2/pkg-descr
index b9ead63..017e3d7 100644
--- a/sysutils/gnomecontrolcenter2/pkg-descr
+++ b/sysutils/gnomecontrolcenter2/pkg-descr
@@ -1 +1 @@
-control center for GNOME project.
+control center for GNOME 2.0 project.
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 851c8c4..b04fd1d 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -1,206 +1,159 @@
-bin/background-properties-capplet
-bin/default-application-properties-capplet
-bin/file-types-capplet
-bin/gnomecc
-bin/keyboard-properties
-bin/mouse-properties-capplet
-bin/sound-properties
-bin/theme-selector-capplet
-bin/ui-properties
-bin/url-properties
-bin/wm-properties-capplet
-etc/CORBA/servers/gnomecc.gnorba
-etc/cappletConf.sh
-include/libcapplet1/capplet-widget.h
-lib/libcapplet.a
-lib/libcapplet.so
-lib/libcapplet.so.5
-share/gnome/apps/Settings/Desktop/.directory
-share/gnome/apps/Settings/Desktop/background-properties.desktop
-share/gnome/apps/Settings/Desktop/theme-selector.desktop
-share/gnome/apps/Settings/Desktop/wm-properties.desktop
-share/gnome/apps/Settings/Documents/.directory
-share/gnome/apps/Settings/Documents/default-applicaiton-properties.desktop
-share/gnome/apps/Settings/Documents/url-properties.desktop
-share/gnome/apps/Settings/Multimedia/.directory
-share/gnome/apps/Settings/Multimedia/sound-properties.desktop
-share/gnome/apps/Settings/Peripherals/.directory
-share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
-share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
-share/gnome/apps/Settings/Session/.directory
-share/gnome/apps/Settings/UIOptions/.directory
-share/gnome/apps/Settings/file-types-capplet.desktop
-share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/control-center/.directory
-share/gnome/control-center/Desktop/.directory
-share/gnome/control-center/Desktop/background-properties.desktop
-share/gnome/control-center/Desktop/theme-selector.desktop
-share/gnome/control-center/Desktop/wm-properties.desktop
-share/gnome/control-center/Documents/.directory
-share/gnome/control-center/Documents/default-application-properties.desktop
-share/gnome/control-center/Documents/file-types-capplet.desktop
-share/gnome/control-center/Documents/url-properties.desktop
-share/gnome/control-center/Multimedia/.directory
-share/gnome/control-center/Multimedia/sound-properties.desktop
-share/gnome/control-center/Peripherals/.directory
-share/gnome/control-center/Peripherals/keyboard-properties.desktop
-share/gnome/control-center/Peripherals/mouse-properties.desktop
-share/gnome/control-center/Session/.directory
-share/gnome/control-center/UIOptions/.directory
-share/gnome/control-center/UIOptions/application.desktop
-share/gnome/control-center/UIOptions/dialogs.desktop
-share/gnome/control-center/UIOptions/mdi.desktop
-share/gnome/help/control-center/C/control-center.sgml
-share/gnome/help/control-center/C/desktop-intro.html
-share/gnome/help/control-center/C/doc-handlers.html
-share/gnome/help/control-center/C/figures/bg-capplet.png
-share/gnome/help/control-center/C/figures/gccalf.png
-share/gnome/help/control-center/C/figures/gccappdef.png
-share/gnome/help/control-center/C/figures/gccdialog.png
-share/gnome/help/control-center/C/figures/gccedit.png
-share/gnome/help/control-center/C/figures/gcchints.png
-share/gnome/help/control-center/C/figures/gccmdi.png
-share/gnome/help/control-center/C/figures/gccmime.png
-share/gnome/help/control-center/C/figures/gccsession-props.png
-share/gnome/help/control-center/C/figures/gccsessopt.png
-share/gnome/help/control-center/C/figures/gccsound1.png
-share/gnome/help/control-center/C/figures/gccsound2.png
-share/gnome/help/control-center/C/figures/gccstartup.png
-share/gnome/help/control-center/C/figures/gccurl.png
-share/gnome/help/control-center/C/figures/glob_pref_anim.png
-share/gnome/help/control-center/C/figures/keyboard-capplet.png
-share/gnome/help/control-center/C/figures/mouse-capplet.png
-share/gnome/help/control-center/C/figures/screensave-capplet.png
-share/gnome/help/control-center/C/figures/theme-select.png
-share/gnome/help/control-center/C/figures/wm-add.png
-share/gnome/help/control-center/C/figures/wm-main.png
-share/gnome/help/control-center/C/index.html
-share/gnome/help/control-center/C/ln7.html
-share/gnome/help/control-center/C/stylesheet-images/caution.gif
-share/gnome/help/control-center/C/stylesheet-images/home.gif
-share/gnome/help/control-center/C/stylesheet-images/important.gif
-share/gnome/help/control-center/C/stylesheet-images/next.gif
-share/gnome/help/control-center/C/stylesheet-images/note.gif
-share/gnome/help/control-center/C/stylesheet-images/prev.gif
-share/gnome/help/control-center/C/stylesheet-images/tip.gif
-share/gnome/help/control-center/C/stylesheet-images/toc-blank.gif
-share/gnome/help/control-center/C/stylesheet-images/toc-minus.gif
-share/gnome/help/control-center/C/stylesheet-images/toc-plus.gif
-share/gnome/help/control-center/C/stylesheet-images/up.gif
-share/gnome/help/control-center/C/stylesheet-images/warning.gif
-share/gnome/help/control-center/C/topic.dat
-share/gnome/help/control-center/C/usage.html
-share/gnome/help/control-center/eu/control-center.sgml
-share/gnome/help/control-center/eu/desktop-intro.html
-share/gnome/help/control-center/eu/doc-handlers.html
-share/gnome/help/control-center/eu/figures/bg-capplet.png
-share/gnome/help/control-center/eu/figures/gccalf.png
-share/gnome/help/control-center/eu/figures/gccappdef.png
-share/gnome/help/control-center/eu/figures/gccdialog.png
-share/gnome/help/control-center/eu/figures/gccedit.png
-share/gnome/help/control-center/eu/figures/gcchints.png
-share/gnome/help/control-center/eu/figures/gccmdi.png
-share/gnome/help/control-center/eu/figures/gccmime.png
-share/gnome/help/control-center/eu/figures/gccsession-props.png
-share/gnome/help/control-center/eu/figures/gccsessopt.png
-share/gnome/help/control-center/eu/figures/gccsound1.png
-share/gnome/help/control-center/eu/figures/gccsound2.png
-share/gnome/help/control-center/eu/figures/gccstartup.png
-share/gnome/help/control-center/eu/figures/gccurl.png
-share/gnome/help/control-center/eu/figures/glob_pref_anim.png
-share/gnome/help/control-center/eu/figures/keyboard-capplet.png
-share/gnome/help/control-center/eu/figures/mouse-capplet.png
-share/gnome/help/control-center/eu/figures/screensave-capplet.png
-share/gnome/help/control-center/eu/figures/theme-select.png
-share/gnome/help/control-center/eu/figures/wm-add.png
-share/gnome/help/control-center/eu/figures/wm-main.png
-share/gnome/help/control-center/eu/index.html
-share/gnome/help/control-center/eu/ln7.html
-share/gnome/help/control-center/eu/stylesheet-images/caution.gif
-share/gnome/help/control-center/eu/stylesheet-images/home.gif
-share/gnome/help/control-center/eu/stylesheet-images/important.gif
-share/gnome/help/control-center/eu/stylesheet-images/next.gif
-share/gnome/help/control-center/eu/stylesheet-images/note.gif
-share/gnome/help/control-center/eu/stylesheet-images/prev.gif
-share/gnome/help/control-center/eu/stylesheet-images/tip.gif
-share/gnome/help/control-center/eu/stylesheet-images/toc-blank.gif
-share/gnome/help/control-center/eu/stylesheet-images/toc-minus.gif
-share/gnome/help/control-center/eu/stylesheet-images/toc-plus.gif
-share/gnome/help/control-center/eu/stylesheet-images/up.gif
-share/gnome/help/control-center/eu/stylesheet-images/warning.gif
-share/gnome/help/control-center/eu/topic.dat
-share/gnome/help/control-center/eu/usage.html
-share/gnome/idl/control-center.idl
-share/gnome/omf/control-center/control-center-C.omf
-share/gnome/omf/control-center/control-center-eu.omf
-share/gnome/pixmaps/ccsplash.png
-share/gnome/pixmaps/control-center.png
-share/gnome/wm-properties/Enlightenment.desktop
-share/gnome/wm-properties/IceWM.desktop
-share/gnome/wm-properties/Scwm.desktop
-share/gnome/wm-properties/WindowMaker.desktop
-share/gnome/wm-properties/twm.desktop
-share/locale/az/LC_MESSAGES/control-center.mo
-share/locale/bg/LC_MESSAGES/control-center.mo
-share/locale/ca/LC_MESSAGES/control-center.mo
-share/locale/cs/LC_MESSAGES/control-center.mo
-share/locale/da/LC_MESSAGES/control-center.mo
-share/locale/de/LC_MESSAGES/control-center.mo
-share/locale/el/LC_MESSAGES/control-center.mo
-share/locale/en_GB/LC_MESSAGES/control-center.mo
-share/locale/es/LC_MESSAGES/control-center.mo
-share/locale/et/LC_MESSAGES/control-center.mo
-share/locale/eu/LC_MESSAGES/control-center.mo
-share/locale/fi/LC_MESSAGES/control-center.mo
-share/locale/fr/LC_MESSAGES/control-center.mo
-share/locale/ga/LC_MESSAGES/control-center.mo
-share/locale/gl/LC_MESSAGES/control-center.mo
-share/locale/hr/LC_MESSAGES/control-center.mo
-share/locale/hu/LC_MESSAGES/control-center.mo
-share/locale/it/LC_MESSAGES/control-center.mo
-share/locale/ja/LC_MESSAGES/control-center.mo
-share/locale/ko/LC_MESSAGES/control-center.mo
-share/locale/lt/LC_MESSAGES/control-center.mo
-share/locale/nl/LC_MESSAGES/control-center.mo
-share/locale/nn/LC_MESSAGES/control-center.mo
-share/locale/no/LC_MESSAGES/control-center.mo
-share/locale/pl/LC_MESSAGES/control-center.mo
-share/locale/pt/LC_MESSAGES/control-center.mo
-share/locale/pt_BR/LC_MESSAGES/control-center.mo
-share/locale/ro/LC_MESSAGES/control-center.mo
-share/locale/ru/LC_MESSAGES/control-center.mo
-share/locale/sk/LC_MESSAGES/control-center.mo
-share/locale/sl/LC_MESSAGES/control-center.mo
-share/locale/sv/LC_MESSAGES/control-center.mo
-share/locale/tr/LC_MESSAGES/control-center.mo
-share/locale/uk/LC_MESSAGES/control-center.mo
-share/locale/wa/LC_MESSAGES/control-center.mo
-share/locale/zh_CN/LC_MESSAGES/control-center.mo
-share/locale/zh_TW/LC_MESSAGES/control-center.mo
-@dirrm share/gnome/wm-properties
-@dirrm share/gnome/omf/control-center
-@dirrm share/gnome/help/control-center/C/stylesheet-images
-@dirrm share/gnome/help/control-center/C/figures
-@dirrm share/gnome/help/control-center/C
-@dirrm share/gnome/help/control-center/eu/stylesheet-images
-@dirrm share/gnome/help/control-center/eu/figures
-@dirrm share/gnome/help/control-center/eu
-@dirrm share/gnome/help/control-center
-@dirrm share/gnome/control-center/UIOptions
-@dirrm share/gnome/control-center/Session
-@dirrm share/gnome/control-center/Peripherals
-@dirrm share/gnome/control-center/Multimedia
-@dirrm share/gnome/control-center/Documents
-@dirrm share/gnome/control-center/Desktop
-@dirrm share/gnome/control-center
-@dirrm share/gnome/apps/Settings/UIOptions
-@dirrm share/gnome/apps/Settings/Session
-@dirrm share/gnome/apps/Settings/Peripherals
-@dirrm share/gnome/apps/Settings/Multimedia
-@dirrm share/gnome/apps/Settings/Documents
-@dirrm share/gnome/apps/Settings/Desktop
-@dirrm share/gnome/apps/Settings
-@dirrm share/gnome/apps
-@dirrm include/libcapplet1
-@dirrm etc/CORBA/servers
-@dirrm etc/CORBA
+bin/gnome-accessibility-keyboard-properties
+bin/gnome-background-properties
+bin/gnome-control-center
+bin/gnome-file-types-properties
+bin/gnome-font-properties
+bin/gnome-keybinding-properties
+bin/gnome-keyboard-properties
+bin/gnome-mouse-properties
+bin/gnome-network-preferences
+bin/gnome-settings-daemon
+bin/gnome-sound-properties
+bin/gnome-theme-properties
+bin/gnome-ui-properties
+etc/gconf/gconf.xml.defaults/apps/gnome_keybinding_properties/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome_keybinding_properties/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml
+etc/gconf/schemas/apps_gnome_keybinding_properties.schemas
+etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
+libdata/bonobo/servers/GNOME_SettingsDaemon.server
+share/gnome/applications/gnomecc.desktop
+share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
+share/gnome/control-center-2.0/capplets/background.desktop
+share/gnome/control-center-2.0/capplets/behavior.desktop
+share/gnome/control-center-2.0/capplets/file-types.desktop
+share/gnome/control-center-2.0/capplets/font-properties.desktop
+share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop
+share/gnome/control-center-2.0/capplets/gtk-theme-selector.desktop
+share/gnome/control-center-2.0/capplets/keybinding.desktop
+share/gnome/control-center-2.0/capplets/keyboard.desktop
+share/gnome/control-center-2.0/capplets/mouse.desktop
+share/gnome/control-center-2.0/capplets/sound.desktop
+share/gnome/control-center-2.0/icons/accessibility-directory.png
+share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png
+share/gnome/control-center-2.0/icons/advanced-directory.png
+share/gnome/control-center-2.0/icons/background-capplet.png
+share/gnome/control-center-2.0/icons/behavior-capplet.png
+share/gnome/control-center-2.0/icons/control-center.png
+share/gnome/control-center-2.0/icons/font-capplet.png
+share/gnome/control-center-2.0/icons/mouse-capplet.png
+share/gnome/control-center-2.0/icons/sound-capplet.png
+share/gnome/control-center-2.0/interfaces/background-properties.glade
+share/gnome/control-center-2.0/interfaces/file-types-properties.glade
+share/gnome/control-center-2.0/interfaces/font-properties.glade
+share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade2
+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/sound-properties.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/double-click-maybe.png
+share/gnome/control-center-2.0/pixmaps/double-click-off.png
+share/gnome/control-center-2.0/pixmaps/double-click-on.png
+share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
+share/gnome/control-center-2.0/pixmaps/keyboard-capplet.png
+share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
+share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
+share/gnome/control-center-2.0/pixmaps/keyboard-volume.png
+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/cursor-fonts/cursor-large-white.pcf.gz
+share/gnome/cursor-fonts/cursor-large.pcf.gz
+share/gnome/cursor-fonts/cursor-white.pcf.gz
+share/gnome/gnome-2.0/ui/gnomecc-ui.xml
+share/gnome/help/control-center-manual/C/config-accessibility-keyboard.xml
+share/gnome/help/control-center-manual/C/config-background.xml
+share/gnome/help/control-center-manual/C/config-behavior.xml
+share/gnome/help/control-center-manual/C/config-cds.xml
+share/gnome/help/control-center-manual/C/config-file-type.xml
+share/gnome/help/control-center-manual/C/config-hints.xml
+share/gnome/help/control-center-manual/C/config-html.xml
+share/gnome/help/control-center-manual/C/config-kbd.xml
+share/gnome/help/control-center-manual/C/config-keybindings.xml
+share/gnome/help/control-center-manual/C/config-mouse.xml
+share/gnome/help/control-center-manual/C/config-screensaver.xml
+share/gnome/help/control-center-manual/C/config-sound.xml
+share/gnome/help/control-center-manual/C/config-themes.xml
+share/gnome/idl/ConfigArchiver.idl
+share/gnome/idl/GNOME_SettingsDaemon.idl
+share/gnome/pixmaps/accessibility-keyboard-capplet.png
+share/gnome/pixmaps/background-capplet.png
+share/gnome/pixmaps/behavior-capplet.png
+share/gnome/pixmaps/control-center2.png
+share/gnome/pixmaps/font-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/pixmaps/keyboard-capplet.png
+share/gnome/pixmaps/keyboard-shortcut.png
+share/gnome/pixmaps/mouse-capplet.png
+share/gnome/pixmaps/sound-capplet.png
+share/gnome/vfolders/Accessibility.directory
+share/gnome/vfolders/Advanced.directory
+share/locale/az/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/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_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/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/hr/LC_MESSAGES/control-center-2.0.mo
+share/locale/hu/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/ms/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/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/sk/LC_MESSAGES/control-center-2.0.mo
+share/locale/sl/LC_MESSAGES/control-center-2.0.mo
+share/locale/sv/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/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
+@dirrm share/gnome/help/control-center-manual/C/figures
+@dirrm share/gnome/help/control-center-manual/C
+@dirrm share/gnome/help/control-center-manual
+@dirrm share/gnome/cursor-fonts
+@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 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_keybinding_properties
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_keybinding_properties