Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

9 files changed, 95 insertions, 19 deletions

diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 6c86e56bdac8..c171fbafba7d 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.0.3.2
+PORTVERSION=	2.2.0.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.0
+MASTER_SITE_SUBDIR=	sources/control-center/2.2
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
+LIB_DEPENDS=	gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop \
+		metacity-private.0:${PORTSDIR}/x11-wm/metacity
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -24,6 +25,7 @@ USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier
 USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
@@ -31,5 +33,7 @@ CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|Xft\.h|Xft2.h|g' \
+		${WRKSRC}/capplets/font/main.c
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 3a383a0b1e7f..0dbd8f05e367 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.0.3.2.tar.bz2) = d359ddd0083cbf88b2511afff859dcfc
+MD5 (gnome2/control-center-2.2.0.1.tar.bz2) = b17bc2ecf9a38614310c54c5f88ffc55
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
index 0969a7707ffd..9c487d7b8e9d 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
@@ -1,6 +1,6 @@
---- capplets/mouse/gnome-mouse-properties.c.orig	Wed May 29 00:14:19 2002
-+++ capplets/mouse/gnome-mouse-properties.c	Tue Jun 25 21:51:30 2002
-@@ -570,7 +570,7 @@
+--- capplets/mouse/gnome-mouse-properties.c.orig	Sat Nov  2 13:40:22 2002
++++ capplets/mouse/gnome-mouse-properties.c	Sun Dec 22 16:33:36 2002
+@@ -591,7 +591,7 @@
  	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL);
  	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
  	g_free (filename);
@@ -9,7 +9,7 @@
  
  	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -591,7 +591,7 @@
+@@ -612,7 +612,7 @@
  	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL);
  	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
  	g_free (filename);
@@ -18,7 +18,7 @@
  
  	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -612,7 +612,7 @@
+@@ -633,7 +633,7 @@
  	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL);
  	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
  	g_free (filename);
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
index f43c53c1ec2b..1f63c8a48e05 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Aug  6 01:33:52 2002
-+++ configure	Wed Aug  7 01:22:14 2002
-@@ -5768,6 +5768,7 @@
+--- 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"
@@ -8,12 +8,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9090,7 +9091,7 @@
- fi
+@@ -12607,7 +12608,7 @@
  
- cat >> confdefs.h <<EOF
+ 
+ cat >>confdefs.h <<_ACEOF
 -#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
 +#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
- EOF
+ _ACEOF
  
  GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
new file mode 100644
index 000000000000..49e81252a028
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
@@ -0,0 +1,11 @@
+--- gnome-settings-daemon/Makefile.in.orig	Fri Jan 17 12:30:39 2003
++++ gnome-settings-daemon/Makefile.in	Fri Jan 17 12:33:06 2003
+@@ -195,7 +195,7 @@
+ 	$(GNOME_SETTINGS_DAEMON_LIBS)					\
+ 	$(top_builddir)/libbackground/libbackground.la			\
+ 	$(top_builddir)/libsounds/libsounds.a				\
+-	-L$(top_builddir)/libwindow-settings/ -lgnome-window-settings 	\
++	-L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings 	\
+ 	$(XF86MISC_LIBS)
+ 
+ 
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in
new file mode 100644
index 000000000000..d8ece4b307ac
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in
@@ -0,0 +1,11 @@
+--- libbackground/Makefile.in.orig	Fri Jan 17 12:33:42 2003
++++ libbackground/Makefile.in	Fri Jan 17 12:34:13 2003
+@@ -151,7 +151,7 @@
+ 
+ INCLUDES = \
+         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 		\
+-	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"			\
++	-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"			\
+ 	-DG_LOG_DOMAIN=\"capplet-common\"				\
+ 	-I$(top_srcdir)/						\
+ 	@CAPPLET_CFLAGS@
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in
new file mode 100644
index 000000000000..c4d9211b70e2
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in
@@ -0,0 +1,11 @@
+--- libwindow-settings/Makefile.in.orig	Fri Jan 17 12:34:44 2003
++++ libwindow-settings/Makefile.in	Fri Jan 17 12:35:43 2003
+@@ -151,7 +151,7 @@
+ 
+ INCLUDES = \
+         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 		\
+-	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"			\
++	-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"			\
+ 	-DG_LOG_DOMAIN=\"capplet-common\"				\
+ 	-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \
+ 	-I$(top_srcdir)/						\
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c
new file mode 100644
index 000000000000..149d59a9b0c8
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c
@@ -0,0 +1,11 @@
+--- libwindow-settings/wm-list.c.orig	Tue Oct  8 17:43:12 2002
++++ libwindow-settings/wm-list.c	Tue Oct  8 17:43:25 2002
+@@ -251,7 +251,7 @@
+         gchar *name;
+ 	GConfClient *client;
+ 	
+-        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
++        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
+         wm_list_read_dir (tempdir, FALSE);
+         g_free (tempdir);
+         
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index ec54a0695607..7619910cb51b 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -10,21 +10,26 @@ bin/gnome-mouse-properties
 bin/gnome-network-preferences
 bin/gnome-settings-daemon
 bin/gnome-sound-properties
-bin/gnome-theme-properties
+bin/gnome-theme-manager
 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/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/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
 include/gnome-window-settings-2.0/gnome-window-manager.h
 include/gnome-window-settings-2.0/gnome-wm-manager.h
 lib/libgnome-window-settings.a
 lib/libgnome-window-settings.so
 lib/libgnome-window-settings.so.1
+lib/window-manager-settings/libmetacity.so
 libdata/bonobo/servers/GNOME_SettingsDaemon.server
 libdata/pkgconfig/gnome-window-settings-2.0.pc
 share/gnome/applications/gnomecc.desktop
@@ -40,6 +45,16 @@ 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/capplets/window-properties.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/background-capplet.png
+share/gnome/control-center-2.0/icons/behavior-capplet.png
+share/gnome/control-center-2.0/icons/default-applications-capplet.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/icons/window-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
@@ -53,6 +68,7 @@ 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-install.glade
 share/gnome/control-center-2.0/interfaces/theme-properties.glade
+share/gnome/control-center-2.0/interfaces/gnome-window-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
@@ -72,15 +88,18 @@ share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png
 share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png
 share/gnome/control-center-2.0/pixmaps/mouse-left.png
 share/gnome/control-center-2.0/pixmaps/mouse-right.png
+share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png
+share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png
+share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png
+share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png
+share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
 share/gnome/gnome-2.0/ui/gnomecc-ui.xml
 share/gnome/idl/ConfigArchiver.idl
 share/gnome/idl/GNOME_SettingsDaemon.idl
-share/gnome/pixmaps/accessibility-directory.png
 share/gnome/pixmaps/accessibility-keyboard-capplet.png
-share/gnome/pixmaps/advanced-directory.png
 share/gnome/pixmaps/background-capplet.png
 share/gnome/pixmaps/behavior-capplet.png
 share/gnome/pixmaps/control-center2.png
@@ -94,8 +113,10 @@ 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/pixmaps/window-capplet.png
 share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.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
 share/locale/be/LC_MESSAGES/control-center-2.0.mo
@@ -112,6 +133,7 @@ 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/he/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
@@ -119,6 +141,8 @@ share/locale/ja/LC_MESSAGES/control-center-2.0.mo
 share/locale/ko/LC_MESSAGES/control-center-2.0.mo
 share/locale/lt/LC_MESSAGES/control-center-2.0.mo
 share/locale/lv/LC_MESSAGES/control-center-2.0.mo
+share/locale/mk/LC_MESSAGES/control-center-2.0.mo
+share/locale/mn/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
@@ -142,11 +166,15 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @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 share/gnome/applications
+@dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
+@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/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon