diff options
Diffstat (limited to 'x11/libgnome/files')
| -rw-r--r-- | x11/libgnome/files/patch-ag | 22 | ||||
| -rw-r--r-- | x11/libgnome/files/patch-libgnome::Makefile.in | 12 | ||||
| -rw-r--r-- | x11/libgnome/files/patch-libgnome_gnome-program.c | 70 |
3 files changed, 104 insertions, 0 deletions
diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag new file mode 100644 index 000000000..658b694d3 --- /dev/null +++ b/x11/libgnome/files/patch-ag @@ -0,0 +1,22 @@ + +$FreeBSD: ports/x11/libgnome/files/patch-ag,v 1.11 2004/04/05 03:11:34 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", 0 ++ "/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; |