Update to 2.11.1.

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

5 files changed, 132 insertions, 0 deletions

diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag
new file mode 100644
index 000000000..8500944fb
--- /dev/null
+++ b/x11/libgnome/files/patch-ag
@@ -0,0 +1,22 @@
+
+$FreeBSD: ports/x11/libgnome/files/patch-ag,v 1.13 2005/03/12 10:39:19 marcus Exp $
+
+--- libgnome/gnome-util.c	2002/03/19 17:16:21	1.1
++++ libgnome/gnome-util.c	2002/03/19 17:21:31
+@@ -67,11 +67,11 @@
+ 	static char *shells [] = {
+ 		/* Note that on some systems shells can also
+ 		 * be installed in /usr/bin */
+-		"/bin/bash", "/usr/bin/bash",
+-		"/bin/zsh", "/usr/bin/zsh",
+-		"/bin/tcsh", "/usr/bin/tcsh",
+-		"/bin/ksh", "/usr/bin/ksh",
+-		"/bin/csh", "/bin/sh", NULL
++		"/bin/csh", "/bin/sh",
++		LOCALBASE "/bin/bash",
++		LOCALBASE "/bin/zsh",
++		LOCALBASE "/bin/ksh",
++		0
+ 	};
+ 
+ 	if (geteuid () == getuid () &&
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
new file mode 100644
index 000000000..5a240a06a
--- /dev/null
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -0,0 +1,12 @@
+--- libgnome/Makefile.in.orig	Mon May 31 16:33:14 2004
++++ libgnome/Makefile.in	Mon May 31 16:33:45 2004
+@@ -211,6 +211,9 @@
+ libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
+ 
+ INCLUDES = \
++	-DPREFIX=\""$(PREFIX)"\"				\
++	-DLOCALBASE=\""$(LOCALBASE)"\"				\
++	-DX11BASE=\""$(X11BASE)"\"				\
+ 	-I..							\
+ 	-I$(srcdir)/..						\
+ 	$(WARN_CFLAGS)						\
diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c
new file mode 100644
index 000000000..9dd33f9c2
--- /dev/null
+++ b/x11/libgnome/files/patch-libgnome_gnome-program.c
@@ -0,0 +1,70 @@
+--- libgnome/gnome-program.c.orig	Mon May 31 16:37:02 2004
++++ libgnome/gnome-program.c	Mon May 31 16:37:05 2004
+@@ -895,17 +895,17 @@
+ 	attr_rel = "";
+ 	break;
+     case GNOME_FILE_DOMAIN_DATADIR:
+-	prefix_rel = "/share";
++	prefix_rel = "/share/gnome";
+ 	attr_name = GNOME_PARAM_GNOME_DATADIR;
+ 	attr_rel = "";
+ 	break;
+     case GNOME_FILE_DOMAIN_SOUND:
+-	prefix_rel = "/share/sounds";
++	prefix_rel = "/share/gnome/sounds";
+ 	attr_name = GNOME_PARAM_GNOME_DATADIR;
+ 	attr_rel = "/sounds";
+ 	break;
+     case GNOME_FILE_DOMAIN_PIXMAP:
+-	prefix_rel = "/share/pixmaps";
++	prefix_rel = "/share/gnome/pixmaps";
+ 	attr_name = GNOME_PARAM_GNOME_DATADIR;
+ 	attr_rel = "/pixmaps";
+ 	break;
+@@ -917,7 +917,7 @@
+     case GNOME_FILE_DOMAIN_HELP:
+ 	prefix_rel = "/share/gnome/help";
+ 	attr_name = GNOME_PARAM_GNOME_DATADIR;
+-	attr_rel = "/gnome/help";
++	attr_rel = "/help";
+ 	break;
+     case GNOME_FILE_DOMAIN_APP_LIBDIR:
+ 	prefix_rel = "/lib";
+@@ -926,19 +926,19 @@
+ 	search_path = FALSE;
+ 	break;
+     case GNOME_FILE_DOMAIN_APP_DATADIR:
+-	prefix_rel = "/share";
++	prefix_rel = "/share/gnome";
+ 	attr_name = GNOME_PARAM_APP_DATADIR;
+ 	attr_rel = "";
+ 	search_path = FALSE;
+ 	break;
+     case GNOME_FILE_DOMAIN_APP_SOUND:
+-	prefix_rel = "/share/sounds";
++	prefix_rel = "/share/gnome/sounds";
+ 	attr_name = GNOME_PARAM_APP_DATADIR;
+ 	attr_rel = "/sounds";
+ 	search_path = FALSE;
+ 	break;
+     case GNOME_FILE_DOMAIN_APP_PIXMAP:
+-	prefix_rel = "/share/pixmaps";
++	prefix_rel = "/share/gnome/pixmaps";
+ 	attr_name = GNOME_PARAM_APP_DATADIR;
+ 	attr_rel = "/pixmaps";
+ 	search_path = FALSE;
+@@ -959,12 +959,12 @@
+ 
+ 	attr_name = GNOME_PARAM_APP_DATADIR;
+ 
+-	len = strlen ("/gnome/help/") + 
++	len = strlen ("/help/") + 
+ 		strlen (program->_priv->app_id) + 1;
+ 	attr_rel = g_alloca (len);
+ 	if (attr_rel == NULL /* bad things */)
+ 		return NULL;
+-	g_snprintf (attr_rel, len, "/gnome/help/%s", program->_priv->app_id);
++	g_snprintf (attr_rel, len, "/help/%s", program->_priv->app_id);
+ 
+ 	search_path = FALSE;
+ 	break;
diff --git a/x11/libgnome/files/patch-libgnome_libgnome-2.0.pc.in b/x11/libgnome/files/patch-libgnome_libgnome-2.0.pc.in
new file mode 100644
index 000000000..8d376a4b8
--- /dev/null
+++ b/x11/libgnome/files/patch-libgnome_libgnome-2.0.pc.in
@@ -0,0 +1,9 @@
+--- libgnome/libgnome-2.0.pc.in.orig	Mon Apr 18 16:54:21 2005
++++ libgnome/libgnome-2.0.pc.in	Mon Apr 18 16:54:41 2005
+@@ -8,5 +8,5 @@
+ Description: libgnome
+ Requires: glib-2.0 ORBit-2.0 libbonobo-2.0 gconf-2.0 gnome-vfs-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} -lgnome-2 -lpopt
++Libs: -L${libdir} -L%%LOCALBASE%%/lib -lgnome-2 -lpopt
+ Cflags: -I${includedir}/libgnome-2.0
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
new file mode 100644
index 000000000..91ad756cd
--- /dev/null
+++ b/x11/libgnome/files/pkg-deinstall.in
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/x11/libgnome/files/pkg-deinstall.in,v 1.1 2005/05/17 17:23:35 jylefort Exp $
+#
+# Restore gconf keys of gnomevfs2.
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+	exit 0
+fi
+
+SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_default_applications.schemas
+
+if [ -f ${SCHEMAS} ]; then
+	env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \
+	%%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
+		> /dev/null || /usr/bin/true
+fi
+
+exit 0