diff options
Diffstat (limited to 'x11/libgnome/files')
| -rw-r--r-- | x11/libgnome/files/patch-libgnome::Makefile.in | 12 | ||||
| -rw-r--r-- | x11/libgnome/files/patch-libgnome_gnome-program.c | 55 | ||||
| -rw-r--r-- | x11/libgnome/files/patch-libgnome_gnome-util.c | 19 | ||||
| -rw-r--r-- | x11/libgnome/files/patch-libgnome_libgnome-2.0.pc.in | 9 | ||||
| -rw-r--r-- | x11/libgnome/files/pkg-deinstall.in | 20 |
5 files changed, 115 insertions, 0 deletions
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..70ecbfd8f --- /dev/null +++ b/x11/libgnome/files/patch-libgnome_gnome-program.c @@ -0,0 +1,55 @@ +--- libgnome/gnome-program.c.orig Tue Apr 4 06:55:12 2006 ++++ libgnome/gnome-program.c Mon Apr 10 21:07:02 2006 +@@ -936,17 +936,17 @@ gnome_program_locate_file (GnomeProgram + 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; +@@ -958,7 +958,7 @@ gnome_program_locate_file (GnomeProgram + 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"; +@@ -967,19 +967,19 @@ gnome_program_locate_file (GnomeProgram + 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; diff --git a/x11/libgnome/files/patch-libgnome_gnome-util.c b/x11/libgnome/files/patch-libgnome_gnome-util.c new file mode 100644 index 000000000..1a7e49a84 --- /dev/null +++ b/x11/libgnome/files/patch-libgnome_gnome-util.c @@ -0,0 +1,19 @@ +--- libgnome/gnome-util.c.orig Mon Jul 10 15:25:22 2006 ++++ libgnome/gnome-util.c Mon Jul 10 15:25:55 2006 +@@ -79,11 +79,11 @@ + const char shells [][14] = { + /* 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" ++ LOCALBASE "/bin/bash", ++ LOCALBASE "/bin/zsh", ++ LOCALBASE "/bin/ksh", ++ 0 ++ + }; + + if (geteuid () == getuid () && 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..01ef2102d --- /dev/null +++ b/x11/libgnome/files/pkg-deinstall.in @@ -0,0 +1,20 @@ +#!/bin/sh +# +# $FreeBSD: ports/x11/libgnome/files/pkg-deinstall.in,v 1.4 2006/10/14 08:35:29 marcus Exp $ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.7 2006/07/23 17:22:34 mezz Exp $ +# +# Restore gconf keys of gnomevfs2. + +if [ "$2" != "POST-DEINSTALL" ]; then + exit 0 +fi + +SCHEMAS=%%LOCALBASE%%/etc/gconf/schemas/desktop_default_applications.schemas + +if [ -f ${SCHEMAS} ]; then + env GCONF_CONFIG_SOURCE=xml::%%LOCALBASE%%/etc/gconf/gconf.xml.defaults \ + %%LOCALBASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \ + > /dev/null || /usr/bin/true +fi + +exit 0 |