Update to 2.1.7.

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

10 files changed, 66 insertions, 66 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index e90e1b32f..984751211 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.1.6
+PORTVERSION=	2.1.7
 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 f62d31a07..b2f7fb547 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.1.6.tar.bz2) = d65ab01dcf9f0208a19962f1fd217f69
+MD5 (gnome2/control-center-2.1.7.tar.bz2) = 82f7f9f5e114bd9ca10af5b904890aa5
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
index 2f97e5702..49e81252a 100644
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
@@ -1,11 +1,11 @@
---- gnome-settings-daemon/Makefile.in.orig	Tue Oct  8 17:32:58 2002
-+++ gnome-settings-daemon/Makefile.in	Tue Oct  8 17:34:05 2002
-@@ -152,7 +152,7 @@
+--- 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)
  
- #	$(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
index 0bafec683..d8ece4b30 100644
--- a/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in
+++ b/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in
@@ -1,11 +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
+--- 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/gnome-control-center/files/patch-libwindow-settings_Makefile.in b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in
index e4c395f31..c4d9211b7 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	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
+--- 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/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index e90e1b32f..984751211 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.1.6
+PORTVERSION=	2.1.7
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.1
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index f62d31a07..b2f7fb547 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.1.6.tar.bz2) = d65ab01dcf9f0208a19962f1fd217f69
+MD5 (gnome2/control-center-2.1.7.tar.bz2) = 82f7f9f5e114bd9ca10af5b904890aa5
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
index 2f97e5702..49e81252a 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
+++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
@@ -1,11 +1,11 @@
---- gnome-settings-daemon/Makefile.in.orig	Tue Oct  8 17:32:58 2002
-+++ gnome-settings-daemon/Makefile.in	Tue Oct  8 17:34:05 2002
-@@ -152,7 +152,7 @@
+--- 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)
  
- #	$(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
index 0bafec683..d8ece4b30 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in
+++ b/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in
@@ -1,11 +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
+--- 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
index e4c395f31..c4d9211b7 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in
+++ b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in
@@ -1,11 +1,11 @@
---- 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
+--- 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)/						\