Update to 2.1.2.

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

7 files changed, 22 insertions, 42 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 49fbecda3..fcfc810ab 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.1
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index d108ccebd..90d90945d 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.1.1.tar.bz2) = 26bc0d9a01ff5aa3ca490165203dc286
+MD5 (gnome2/control-center-2.1.2.tar.bz2) = 4af11b122187b1d4a2b097a0587cb327
diff --git a/sysutils/gnome-control-center/files/patch-capplets_theme-switcher_theme-switcher.c b/sysutils/gnome-control-center/files/patch-capplets_theme-switcher_theme-switcher.c
deleted file mode 100644
index 67ec99b5a..000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_theme-switcher_theme-switcher.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/theme-switcher/theme-switcher.c.orig	Thu Oct 10 17:26:19 2002
-+++ capplets/theme-switcher/theme-switcher.c	Thu Oct 10 17:26:48 2002
-@@ -22,8 +22,6 @@
- 
- /* FIXME: This shouldn't be hardcoded
-  */
--#define METACITY_THEME_LOCATION "/usr/share/themes"
--
- #define GTK_THEME_KEY     "/desktop/gnome/interface/gtk_theme"
- #define WINDOW_THEME_KEY  "/desktop/gnome/applications/window_manager/theme"
- #define METACITY_THEME_DIR "/apps/metacity/general"
diff --git a/sysutils/gnome-control-center/files/patch-capplets_windows_Makefile.in b/sysutils/gnome-control-center/files/patch-capplets_windows_Makefile.in
deleted file mode 100644
index 00e8f06b0..000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_windows_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- capplets/windows/Makefile.in.orig	Thu Oct 10 16:55:02 2002
-+++ capplets/windows/Makefile.in	Thu Oct 10 16:55:20 2002
-@@ -145,7 +145,7 @@
- 
- bin_PROGRAMS = gnome-window-properties
- 
--gnome_window_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) 		-L$(top_builddir)/libwindow-settings/ -lgnome-window-settings
-+gnome_window_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) 		-L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings
- 
- 
- gnome_window_properties_SOURCES =  	gnome-window-properties.c
-@@ -178,7 +178,7 @@
- Desktop_in_files = window-properties.desktop.in
- desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
- 
--INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)						     -I $(top_srcdir)/libwindow-settings 	     -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" 	     -DMETACITY_THEME_DIR=\""$(datadir)/metacity/themes"\"
-+INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)						     -I $(top_srcdir)/libwindow-settings 	     -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" 	     -DMETACITY_THEME_DIR=\""$(datadir)/themes"\"
- 
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
- EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA)
diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in
index 1aabe419e..e4c395f31 100644
--- a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in
+++ b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in
@@ -1,11 +1,11 @@
---- libwindow-settings/Makefile.in.orig	Thu Oct 10 16:46:50 2002
-+++ libwindow-settings/Makefile.in	Thu Oct 10 16:49:14 2002
-@@ -143,7 +143,7 @@
- XF86MISC_LIBS = @XF86MISC_LIBS@
- cxxflags_set = @cxxflags_set@
- 
--INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" 	-I$(top_srcdir)/							@CAPPLET_CFLAGS@
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 			-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" 	-I$(top_srcdir)/							@CAPPLET_CFLAGS@
+--- libwindow-settings/Makefile.in.orig	Mon Nov 11 00:36:25 2002
++++ libwindow-settings/Makefile.in	Mon Nov 11 00:38:07 2002
+@@ -146,7 +146,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=\""${prefix}/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-libwindow-settings_gnome-wm-manager.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c
new file mode 100644
index 000000000..95bbf2ea4
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c
@@ -0,0 +1,11 @@
+--- libwindow-settings/gnome-wm-manager.c.orig	Mon Nov 11 00:42:08 2002
++++ libwindow-settings/gnome-wm-manager.c	Mon Nov 11 00:43:26 2002
+@@ -227,7 +227,7 @@
+ 
+         done_scan = TRUE;
+         
+-        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
++        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
+         scan_wm_directory (tempdir, FALSE);
+         g_free (tempdir);
+         
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index ee682a36e..d33006c46 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -10,7 +10,7 @@ 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