Update to 2.3.2. Note, you _MUST_ delete fontilus and themus before updating

to this version.  Those modules are now included in the Control Center.


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

18 files changed, 250 insertions, 92 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index f939a9fb8..700d0a640 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.3
@@ -14,7 +14,7 @@ DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Control center for GNOME 2.0 project
+COMMENT=	Control center for GNOME 2 project
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -22,13 +22,15 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop metacity
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 2e861c97c..27367a434 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.3.1.tar.bz2) = af8ce6e9a6337708fbfd23a282ee926e
+MD5 (gnome2/control-center-2.3.2.tar.bz2) = d2dfe082624a5ac7294e8bb1a64fe6c3
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 1f63c8a48..83ef8876c 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,13 +1,5 @@
 --- configure.orig	Wed Dec 18 16:10:09 2002
 +++ configure	Sun Dec 22 16:36:03 2002
-@@ -8516,6 +8516,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 @@ -12607,7 +12608,7 @@
  
  
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
deleted file mode 100644
index e8984e700..000000000
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-settings-daemon/Makefile.in.orig	Fri May  9 11:57:23 2003
-+++ gnome-settings-daemon/Makefile.in	Fri May  9 11:57:49 2003
-@@ -160,7 +160,7 @@
- 
- #	$(AccessX_files)		
- 
--gnome_settings_daemon_LDADD =  	$(GNOME_SETTINGS_DAEMON_LIBS)						$(top_builddir)/libbackground/libbackground.la				$(top_builddir)/libsounds/libsounds.a					-L$(top_builddir)/libwindow-settings/ -lgnome-window-settings 		$(XF86MISC_LIBS)
-+gnome_settings_daemon_LDADD =  	$(GNOME_SETTINGS_DAEMON_LIBS)						$(top_builddir)/libbackground/libbackground.la				$(top_builddir)/libsounds/libsounds.a					-L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings 		$(XF86MISC_LIBS)
- 
- 
- #AccessX_files = \
diff --git a/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in b/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in
deleted file mode 100644
index 3431fb5d4..000000000
--- a/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbackground/Makefile.in.orig	Fri May  9 11:05:19 2003
-+++ libbackground/Makefile.in	Fri May  9 11:05:45 2003
-@@ -151,7 +151,7 @@
- 
- EXTRA_DIST = ChangeLog
- 
--INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
- 
- 
- noinst_LTLIBRARIES = libbackground.la
diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in
deleted file mode 100644
index 97ce0db1a..000000000
--- a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwindow-settings/Makefile.in.orig	Fri May  9 11:06:25 2003
-+++ libwindow-settings/Makefile.in	Fri May  9 11:07:00 2003
-@@ -151,7 +151,7 @@
- 
- WM_MODULE_DIR = $(libdir)/window-manager-settings
- 
--INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" 	-I$(top_srcdir)/							@CAPPLET_CFLAGS@							-DMETACITY_THEME_DIR=\""$(datadir)/themes"\"
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" 	-I$(top_srcdir)/							@CAPPLET_CFLAGS@							-DMETACITY_THEME_DIR=\""$(datadir)/themes"\"
- 
- 
- lib_LTLIBRARIES = libgnome-window-settings.la
diff --git a/sysutils/gnome-control-center/files/patch-ltmain.sh b/sysutils/gnome-control-center/files/patch-ltmain.sh
new file mode 100644
index 000000000..8afc42e39
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Fri Apr 25 15:18:44 2003
++++ ltmain.sh	Sun May 11 02:27:13 2003
+@@ -1061,7 +1061,7 @@
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1071,8 +1071,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
+ 	;;
+ 
+@@ -2471,6 +2479,9 @@
+ 	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4280,10 +4291,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-vfs_methods_themus_theme-method.c b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c
new file mode 100644
index 000000000..45a72ff27
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c
@@ -0,0 +1,20 @@
+--- vfs-methods/themus/theme-method.c.orig	Thu May 22 01:42:21 2003
++++ vfs-methods/themus/theme-method.c	Thu May 22 01:44:13 2003
+@@ -19,6 +19,7 @@
+ 
+ #include <string.h>
+ #include <errno.h>
++#include <libintl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
+@@ -528,8 +529,8 @@
+ 		return GNOME_VFS_OK;
+ 	}
+ 	else {
+-		g_free (path);
+ 		GnomeThemeMetaInfo *theme;
++		g_free (path);
+ 		
+ 		theme = theme_meta_info_find (uri);
+ 		if (theme)
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 997e1deec..c751426b4 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -5,6 +5,7 @@ bin/gnome-default-applications-properties
 bin/gnome-display-properties
 bin/gnome-file-types-properties
 bin/gnome-font-properties
+bin/gnome-font-viewer
 bin/gnome-keybinding-properties
 bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
@@ -12,27 +13,55 @@ bin/gnome-network-preferences
 bin/gnome-settings-daemon
 bin/gnome-sound-properties
 bin/gnome-theme-manager
+bin/gnome-theme-thumbnailer
+bin/gnome-thumbnail-font
 bin/gnome-ui-properties
 bin/gnome-window-properties
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
 etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
 etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
 etc/gconf/schemas/desktop_gnome_font_rendering.schemas
+etc/gconf/schemas/fontilus.schemas
+etc/gconf/schemas/themus.schemas
+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-component.so
+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/window-manager-settings/libmetacity.a
 lib/window-manager-settings/libmetacity.so
 libdata/bonobo/servers/GNOME_SettingsDaemon.server
+libdata/bonobo/servers/Themus_Component.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
+share/gnome/application-registry/fontilus.applications
 share/gnome/applications/gnomecc.desktop
 share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
 share/gnome/control-center-2.0/capplets/background.desktop
@@ -108,6 +137,8 @@ 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/pixmaps/accessibility-keyboard-capplet.png
 share/gnome/pixmaps/background-capplet.png
 share/gnome/pixmaps/behavior-capplet.png
@@ -126,6 +157,8 @@ share/gnome/pixmaps/sound-capplet.png
 share/gnome/pixmaps/window-capplet.png
 share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
+share/gnome/vfolders/font-method.directory
+share/gnome/vfolders/theme-method.directory
 share/locale/am/LC_MESSAGES/control-center-2.0.mo
 share/locale/ar/LC_MESSAGES/control-center-2.0.mo
 share/locale/az/LC_MESSAGES/control-center-2.0.mo
@@ -167,6 +200,8 @@ 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/sq/LC_MESSAGES/control-center-2.0.mo
+share/locale/sr/LC_MESSAGES/control-center-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
 share/locale/sv/LC_MESSAGES/control-center-2.0.mo
 share/locale/ta/LC_MESSAGES/control-center-2.0.mo
 share/locale/tr/LC_MESSAGES/control-center-2.0.mo
@@ -184,10 +219,22 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index f939a9fb8..700d0a640 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.3
@@ -14,7 +14,7 @@ DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Control center for GNOME 2.0 project
+COMMENT=	Control center for GNOME 2 project
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -22,13 +22,15 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop metacity
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 2e861c97c..27367a434 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.3.1.tar.bz2) = af8ce6e9a6337708fbfd23a282ee926e
+MD5 (gnome2/control-center-2.3.2.tar.bz2) = d2dfe082624a5ac7294e8bb1a64fe6c3
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
index 1f63c8a48..83ef8876c 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -1,13 +1,5 @@
 --- configure.orig	Wed Dec 18 16:10:09 2002
 +++ configure	Sun Dec 22 16:36:03 2002
-@@ -8516,6 +8516,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 @@ -12607,7 +12608,7 @@
  
  
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
deleted file mode 100644
index e8984e700..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-settings-daemon/Makefile.in.orig	Fri May  9 11:57:23 2003
-+++ gnome-settings-daemon/Makefile.in	Fri May  9 11:57:49 2003
-@@ -160,7 +160,7 @@
- 
- #	$(AccessX_files)		
- 
--gnome_settings_daemon_LDADD =  	$(GNOME_SETTINGS_DAEMON_LIBS)						$(top_builddir)/libbackground/libbackground.la				$(top_builddir)/libsounds/libsounds.a					-L$(top_builddir)/libwindow-settings/ -lgnome-window-settings 		$(XF86MISC_LIBS)
-+gnome_settings_daemon_LDADD =  	$(GNOME_SETTINGS_DAEMON_LIBS)						$(top_builddir)/libbackground/libbackground.la				$(top_builddir)/libsounds/libsounds.a					-L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings 		$(XF86MISC_LIBS)
- 
- 
- #AccessX_files = \
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in
deleted file mode 100644
index 3431fb5d4..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbackground/Makefile.in.orig	Fri May  9 11:05:19 2003
-+++ libbackground/Makefile.in	Fri May  9 11:05:45 2003
-@@ -151,7 +151,7 @@
- 
- EXTRA_DIST = ChangeLog
- 
--INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
- 
- 
- noinst_LTLIBRARIES = libbackground.la
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in
deleted file mode 100644
index 97ce0db1a..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwindow-settings/Makefile.in.orig	Fri May  9 11:06:25 2003
-+++ libwindow-settings/Makefile.in	Fri May  9 11:07:00 2003
-@@ -151,7 +151,7 @@
- 
- WM_MODULE_DIR = $(libdir)/window-manager-settings
- 
--INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" 	-I$(top_srcdir)/							@CAPPLET_CFLAGS@							-DMETACITY_THEME_DIR=\""$(datadir)/themes"\"
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" 	-I$(top_srcdir)/							@CAPPLET_CFLAGS@							-DMETACITY_THEME_DIR=\""$(datadir)/themes"\"
- 
- 
- lib_LTLIBRARIES = libgnome-window-settings.la
diff --git a/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
new file mode 100644
index 000000000..8afc42e39
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Fri Apr 25 15:18:44 2003
++++ ltmain.sh	Sun May 11 02:27:13 2003
+@@ -1061,7 +1061,7 @@
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1071,8 +1071,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
+ 	;;
+ 
+@@ -2471,6 +2479,9 @@
+ 	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4280,10 +4291,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-vfs_methods_themus_theme-method.c b/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c
new file mode 100644
index 000000000..45a72ff27
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c
@@ -0,0 +1,20 @@
+--- vfs-methods/themus/theme-method.c.orig	Thu May 22 01:42:21 2003
++++ vfs-methods/themus/theme-method.c	Thu May 22 01:44:13 2003
+@@ -19,6 +19,7 @@
+ 
+ #include <string.h>
+ #include <errno.h>
++#include <libintl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
+@@ -528,8 +529,8 @@
+ 		return GNOME_VFS_OK;
+ 	}
+ 	else {
+-		g_free (path);
+ 		GnomeThemeMetaInfo *theme;
++		g_free (path);
+ 		
+ 		theme = theme_meta_info_find (uri);
+ 		if (theme)
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 997e1deec..c751426b4 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -5,6 +5,7 @@ bin/gnome-default-applications-properties
 bin/gnome-display-properties
 bin/gnome-file-types-properties
 bin/gnome-font-properties
+bin/gnome-font-viewer
 bin/gnome-keybinding-properties
 bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
@@ -12,27 +13,55 @@ bin/gnome-network-preferences
 bin/gnome-settings-daemon
 bin/gnome-sound-properties
 bin/gnome-theme-manager
+bin/gnome-theme-thumbnailer
+bin/gnome-thumbnail-font
 bin/gnome-ui-properties
 bin/gnome-window-properties
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
 etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
 etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
 etc/gconf/schemas/desktop_gnome_font_rendering.schemas
+etc/gconf/schemas/fontilus.schemas
+etc/gconf/schemas/themus.schemas
+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-component.so
+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/window-manager-settings/libmetacity.a
 lib/window-manager-settings/libmetacity.so
 libdata/bonobo/servers/GNOME_SettingsDaemon.server
+libdata/bonobo/servers/Themus_Component.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
+share/gnome/application-registry/fontilus.applications
 share/gnome/applications/gnomecc.desktop
 share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
 share/gnome/control-center-2.0/capplets/background.desktop
@@ -108,6 +137,8 @@ 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/pixmaps/accessibility-keyboard-capplet.png
 share/gnome/pixmaps/background-capplet.png
 share/gnome/pixmaps/behavior-capplet.png
@@ -126,6 +157,8 @@ share/gnome/pixmaps/sound-capplet.png
 share/gnome/pixmaps/window-capplet.png
 share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
+share/gnome/vfolders/font-method.directory
+share/gnome/vfolders/theme-method.directory
 share/locale/am/LC_MESSAGES/control-center-2.0.mo
 share/locale/ar/LC_MESSAGES/control-center-2.0.mo
 share/locale/az/LC_MESSAGES/control-center-2.0.mo
@@ -167,6 +200,8 @@ 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/sq/LC_MESSAGES/control-center-2.0.mo
+share/locale/sr/LC_MESSAGES/control-center-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
 share/locale/sv/LC_MESSAGES/control-center-2.0.mo
 share/locale/ta/LC_MESSAGES/control-center-2.0.mo
 share/locale/tr/LC_MESSAGES/control-center-2.0.mo
@@ -184,10 +219,22 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor