Update to 2.5.0.

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

6 files changed, 123 insertions, 0 deletions

diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
new file mode 100644
index 000000000..9c487d7b8
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
@@ -0,0 +1,29 @@
+--- 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);
+-	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)) {
+@@ -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);
+-	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)) {
+@@ -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);
+-	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
new file mode 100644
index 000000000..83ef8876c
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Dec 18 16:10:09 2002
++++ configure	Sun Dec 22 16:36:03 2002
+@@ -12607,7 +12608,7 @@
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
++#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
+ _ACEOF
+ 
+ GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_gnome-wm-manager.c b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_gnome-wm-manager.c
new file mode 100644
index 000000000..95bbf2ea4
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/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/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c
new file mode 100644
index 000000000..149d59a9b
--- /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/files/patch-ltmain.sh b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
new file mode 100644
index 000000000..49efbb5de
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Thu May  1 11:30:14 2003
++++ ltmain.sh	Mon Aug 11 14:38:46 2003
+@@ -1280,7 +1280,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1290,8 +1290,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -3000,6 +3008,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5428,10 +5439,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c b/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c
new file mode 100644
index 000000000..a9add20e2
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c
@@ -0,0 +1,10 @@
+--- vfs-methods/themus/theme-method.c.orig	Fri Jun 13 07:52:44 2003
++++ vfs-methods/themus/theme-method.c	Sat Jun 28 12:50:39 2003
+@@ -19,6 +19,7 @@
+ 
+ #include <string.h>
+ #include <errno.h>
++#include <libintl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+