Add some more patch fixes.

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

12 files changed, 112 insertions, 4 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 285f72ad6..58b0e629e 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomecontrolcenter2
 PORTVERSION=	2.1.0.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.1
diff --git a/sysutils/gnome-control-center/files/patch-capplets_theme-switcher_Makefile.in b/sysutils/gnome-control-center/files/patch-capplets_theme-switcher_Makefile.in
new file mode 100644
index 000000000..659e3c9da
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_theme-switcher_Makefile.in
@@ -0,0 +1,11 @@
+--- capplets/theme-switcher/Makefile.in.orig	Thu Oct 10 17:26:56 2002
++++ capplets/theme-switcher/Makefile.in	Thu Oct 10 17:27:46 2002
+@@ -159,7 +159,7 @@
+ gladedir = $(GNOMECC_GLADE_DIR)
+ glade_DATA = theme-properties.glade theme-install.glade
+ 
+-INCLUDES =  	-I$(top_srcdir)				$(GNOMECC_CAPPLETS_CFLAGS)		-DGLADEDIR=\""$(gladedir)"\"
++INCLUDES =  	-I$(top_srcdir)				$(GNOMECC_CAPPLETS_CFLAGS)		-DGLADEDIR=\""$(gladedir)"\" -DMETACITY_THEME_LOCATION=\""$(datadir)/themes"\"
+ 
+ 
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
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
new file mode 100644
index 000000000..67ec99b5a
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_theme-switcher_theme-switcher.c
@@ -0,0 +1,11 @@
+--- 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
index 1b9727167..00e8f06b0 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_windows_Makefile.in
+++ b/sysutils/gnome-control-center/files/patch-capplets_windows_Makefile.in
@@ -1,5 +1,5 @@
---- capplets/windows/Makefile.in.orig	Tue Oct  8 17:37:55 2002
-+++ capplets/windows/Makefile.in	Tue Oct  8 17:38:51 2002
+--- 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
@@ -9,3 +9,12 @@
  
  
  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-libbackground_Makefile.in b/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in
new file mode 100644
index 000000000..0bafec683
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in
@@ -0,0 +1,11 @@
+--- libbackground/Makefile.in.orig	Thu Oct 10 17:34:06 2002
++++ libbackground/Makefile.in	Thu Oct 10 17:34:31 2002
+@@ -145,7 +145,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)/share/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
new file mode 100644
index 000000000..1aabe419e
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in
@@ -0,0 +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@
+ 
+ 
+ lib_LTLIBRARIES = libgnome-window-settings.la
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 285f72ad6..58b0e629e 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomecontrolcenter2
 PORTVERSION=	2.1.0.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.1
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_theme-switcher_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-capplets_theme-switcher_Makefile.in
new file mode 100644
index 000000000..659e3c9da
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_theme-switcher_Makefile.in
@@ -0,0 +1,11 @@
+--- capplets/theme-switcher/Makefile.in.orig	Thu Oct 10 17:26:56 2002
++++ capplets/theme-switcher/Makefile.in	Thu Oct 10 17:27:46 2002
+@@ -159,7 +159,7 @@
+ gladedir = $(GNOMECC_GLADE_DIR)
+ glade_DATA = theme-properties.glade theme-install.glade
+ 
+-INCLUDES =  	-I$(top_srcdir)				$(GNOMECC_CAPPLETS_CFLAGS)		-DGLADEDIR=\""$(gladedir)"\"
++INCLUDES =  	-I$(top_srcdir)				$(GNOMECC_CAPPLETS_CFLAGS)		-DGLADEDIR=\""$(gladedir)"\" -DMETACITY_THEME_LOCATION=\""$(datadir)/themes"\"
+ 
+ 
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_theme-switcher_theme-switcher.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_theme-switcher_theme-switcher.c
new file mode 100644
index 000000000..67ec99b5a
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_theme-switcher_theme-switcher.c
@@ -0,0 +1,11 @@
+--- 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/gnomecontrolcenter2/files/patch-capplets_windows_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-capplets_windows_Makefile.in
index 1b9727167..00e8f06b0 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_windows_Makefile.in
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_windows_Makefile.in
@@ -1,5 +1,5 @@
---- capplets/windows/Makefile.in.orig	Tue Oct  8 17:37:55 2002
-+++ capplets/windows/Makefile.in	Tue Oct  8 17:38:51 2002
+--- 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
@@ -9,3 +9,12 @@
  
  
  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/gnomecontrolcenter2/files/patch-libbackground_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in
new file mode 100644
index 000000000..0bafec683
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in
@@ -0,0 +1,11 @@
+--- libbackground/Makefile.in.orig	Thu Oct 10 17:34:06 2002
++++ libbackground/Makefile.in	Thu Oct 10 17:34:31 2002
+@@ -145,7 +145,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)/share/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
new file mode 100644
index 000000000..1aabe419e
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in
@@ -0,0 +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@
+ 
+ 
+ lib_LTLIBRARIES = libgnome-window-settings.la