Update to GNOME 2.0 RC2.

13 files changed, 131 insertions, 93 deletions

diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 615f19dad61..90836daed2d 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gconf-editor
 PORTVERSION=	0.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index d7463172f73..76895641ff3 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	1.99.10
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,6 +19,7 @@ LIB_DEPENDS=	gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
@@ -29,11 +29,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -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'
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
+		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \
+		 s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|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 c575e3738f5..00226dd4317 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-1.99.10.tar.bz2) = eea5a5261e3447d01960463755422854
+MD5 (gnome2/control-center-2.0.0.tar.bz2) = aeb1e8ddfd98511baaf73030674813ad
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
index d5ce54f8ce0..0969a7707ff 100644
--- 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
@@ -1,29 +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 @@
+--- 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 @@
  	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);
+-	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf", FALSE, NULL);
  
  	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -553,7 +553,7 @@
+@@ -591,7 +591,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);
+-	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf", FALSE, NULL);
  
  	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -574,7 +574,7 @@
+@@ -612,7 +612,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);
+-	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
  
  	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  	if (cursor_font && ! strcmp (cursor_font, font_path)) {
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 7e44bf49ffc..59539873055 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon May  6 01:33:23 2002
-+++ configure	Mon May  6 01:33:51 2002
-@@ -7353,6 +7353,7 @@
+--- configure.orig	Mon Jun 17 17:54:50 2002
++++ configure	Tue Jun 25 22:10:20 2002
+@@ -8102,6 +8102,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,12 +8,27 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -11337,7 +11338,7 @@
+@@ -12782,7 +12783,7 @@
  fi
  
- 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'
+@@ -13487,11 +13488,11 @@
+ s,@XF86MISC_LIBS@,$XF86MISC_LIBS,;t t
+ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@CAPPLET_CFLAGS@,$CAPPLET_CFLAGS,;t t
+-s,@CAPPLET_LIBS@,$CAPPLET_LIBS,;t t
++s~@CAPPLET_LIBS@~$CAPPLET_LIBS~;t t
+ s,@GNOMECC_CFLAGS@,$GNOMECC_CFLAGS,;t t
+-s,@GNOMECC_LIBS@,$GNOMECC_LIBS,;t t
++s~@GNOMECC_LIBS@~$GNOMECC_LIBS~;t t
+ s,@GNOME_SETTINGS_DAEMON_CFLAGS@,$GNOME_SETTINGS_DAEMON_CFLAGS,;t t
+-s,@GNOME_SETTINGS_DAEMON_LIBS@,$GNOME_SETTINGS_DAEMON_LIBS,;t t
++s~@GNOME_SETTINGS_DAEMON_LIBS@~$GNOME_SETTINGS_DAEMON_LIBS~;t t
+ s,@OLD_CAPPLET_CFLAGS@,$OLD_CAPPLET_CFLAGS,;t t
+ s,@OLD_CAPPLET_LIBS@,$OLD_CAPPLET_LIBS,;t t
+ s,@GNOME_CFLAGS@,$GNOME_CFLAGS,;t t
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 5a2cc754db3..f3419e8bd63 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,6 +1,7 @@
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-background-properties
 bin/gnome-control-center
+bin/gnome-default-applications-properties
 bin/gnome-file-types-properties
 bin/gnome-font-properties
 bin/gnome-keybinding-properties
@@ -12,15 +13,25 @@ bin/gnome-sound-properties
 bin/gnome-theme-properties
 bin/gnome-ui-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/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/schemas/apps_gnome_settings_daemon_default_editor.schemas
 etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.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
 libdata/bonobo/servers/GNOME_SettingsDaemon.server
+libdata/pkgconfig/gnome-window-settings-2.0.pc
 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/default-applications.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
@@ -35,6 +46,7 @@ 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/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
@@ -42,6 +54,7 @@ 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-default-applications-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-keybinding-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade
@@ -68,29 +81,17 @@ 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/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/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/default-applications-capplet.png
 share/gnome/pixmaps/font-capplet.png
 share/gnome/pixmaps/gnomecc-2/active.png
 share/gnome/pixmaps/gnomecc-2/bcg_top.png
@@ -102,7 +103,9 @@ share/gnome/pixmaps/mouse-capplet.png
 share/gnome/pixmaps/sound-capplet.png
 share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
+share/locale/ar/LC_MESSAGES/control-center-2.0.mo
 share/locale/az/LC_MESSAGES/control-center-2.0.mo
+share/locale/bg/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
@@ -141,15 +144,15 @@ 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 share/gnome/applications
+@dirrm include/gnome-window-settings-2.0
 @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/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
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 555bc4a58d7..3abf9fdc8b4 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomesystemmonitor
 PORTVERSION=	2.0.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
 DISTNAME=	gnome-system-monitor-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index d7463172f73..76895641ff3 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	1.99.10
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,6 +19,7 @@ LIB_DEPENDS=	gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
@@ -29,11 +29,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -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'
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
+		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \
+		 s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index c575e3738f5..00226dd4317 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-1.99.10.tar.bz2) = eea5a5261e3447d01960463755422854
+MD5 (gnome2/control-center-2.0.0.tar.bz2) = aeb1e8ddfd98511baaf73030674813ad
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 d5ce54f8ce0..0969a7707ff 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
@@ -1,29 +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 @@
+--- 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 @@
  	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);
+-	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf", FALSE, NULL);
  
  	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -553,7 +553,7 @@
+@@ -591,7 +591,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);
+-	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf", FALSE, NULL);
  
  	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -574,7 +574,7 @@
+@@ -612,7 +612,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);
+-	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
  
  	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  	if (cursor_font && ! strcmp (cursor_font, font_path)) {
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
index 7e44bf49ffc..59539873055 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon May  6 01:33:23 2002
-+++ configure	Mon May  6 01:33:51 2002
-@@ -7353,6 +7353,7 @@
+--- configure.orig	Mon Jun 17 17:54:50 2002
++++ configure	Tue Jun 25 22:10:20 2002
+@@ -8102,6 +8102,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,12 +8,27 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -11337,7 +11338,7 @@
+@@ -12782,7 +12783,7 @@
  fi
  
- 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'
+@@ -13487,11 +13488,11 @@
+ s,@XF86MISC_LIBS@,$XF86MISC_LIBS,;t t
+ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@CAPPLET_CFLAGS@,$CAPPLET_CFLAGS,;t t
+-s,@CAPPLET_LIBS@,$CAPPLET_LIBS,;t t
++s~@CAPPLET_LIBS@~$CAPPLET_LIBS~;t t
+ s,@GNOMECC_CFLAGS@,$GNOMECC_CFLAGS,;t t
+-s,@GNOMECC_LIBS@,$GNOMECC_LIBS,;t t
++s~@GNOMECC_LIBS@~$GNOMECC_LIBS~;t t
+ s,@GNOME_SETTINGS_DAEMON_CFLAGS@,$GNOME_SETTINGS_DAEMON_CFLAGS,;t t
+-s,@GNOME_SETTINGS_DAEMON_LIBS@,$GNOME_SETTINGS_DAEMON_LIBS,;t t
++s~@GNOME_SETTINGS_DAEMON_LIBS@~$GNOME_SETTINGS_DAEMON_LIBS~;t t
+ s,@OLD_CAPPLET_CFLAGS@,$OLD_CAPPLET_CFLAGS,;t t
+ s,@OLD_CAPPLET_LIBS@,$OLD_CAPPLET_LIBS,;t t
+ s,@GNOME_CFLAGS@,$GNOME_CFLAGS,;t t
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 5a2cc754db3..f3419e8bd63 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -1,6 +1,7 @@
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-background-properties
 bin/gnome-control-center
+bin/gnome-default-applications-properties
 bin/gnome-file-types-properties
 bin/gnome-font-properties
 bin/gnome-keybinding-properties
@@ -12,15 +13,25 @@ bin/gnome-sound-properties
 bin/gnome-theme-properties
 bin/gnome-ui-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/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/schemas/apps_gnome_settings_daemon_default_editor.schemas
 etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.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
 libdata/bonobo/servers/GNOME_SettingsDaemon.server
+libdata/pkgconfig/gnome-window-settings-2.0.pc
 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/default-applications.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
@@ -35,6 +46,7 @@ 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/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
@@ -42,6 +54,7 @@ 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-default-applications-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-keybinding-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade
@@ -68,29 +81,17 @@ 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/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/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/default-applications-capplet.png
 share/gnome/pixmaps/font-capplet.png
 share/gnome/pixmaps/gnomecc-2/active.png
 share/gnome/pixmaps/gnomecc-2/bcg_top.png
@@ -102,7 +103,9 @@ share/gnome/pixmaps/mouse-capplet.png
 share/gnome/pixmaps/sound-capplet.png
 share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
+share/locale/ar/LC_MESSAGES/control-center-2.0.mo
 share/locale/az/LC_MESSAGES/control-center-2.0.mo
+share/locale/bg/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
@@ -141,15 +144,15 @@ 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 share/gnome/applications
+@dirrm include/gnome-window-settings-2.0
 @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/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
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 555bc4a58d7..3abf9fdc8b4 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomesystemmonitor
 PORTVERSION=	2.0.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
 DISTNAME=	gnome-system-monitor-${PORTVERSION}
 DIST_SUBDIR=	gnome2