diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-08-12 03:43:13 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-08-12 03:43:13 +0800 |
commit | c8bdd2af4ec39357078b8728f49fbf2d366877e1 (patch) | |
tree | 2672623fc400c64c156505ec6a5cc6f3fc335598 /x11/libgnome/files | |
parent | 9170adca9345a4df74020888dc229c76eeb50860 (diff) | |
download | marcuscom-ports-c8bdd2af4ec39357078b8728f49fbf2d366877e1.tar marcuscom-ports-c8bdd2af4ec39357078b8728f49fbf2d366877e1.tar.gz marcuscom-ports-c8bdd2af4ec39357078b8728f49fbf2d366877e1.tar.bz2 marcuscom-ports-c8bdd2af4ec39357078b8728f49fbf2d366877e1.tar.lz marcuscom-ports-c8bdd2af4ec39357078b8728f49fbf2d366877e1.tar.xz marcuscom-ports-c8bdd2af4ec39357078b8728f49fbf2d366877e1.tar.zst marcuscom-ports-c8bdd2af4ec39357078b8728f49fbf2d366877e1.zip |
Update to 2.3.6.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1046 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/libgnome/files')
5 files changed, 3 insertions, 97 deletions
diff --git a/x11/libgnome/files/patch-configure b/x11/libgnome/files/patch-configure index d5a0a23fd..8111dd90a 100644 --- a/x11/libgnome/files/patch-configure +++ b/x11/libgnome/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Fri Nov 1 06:34:11 2002 -+++ configure Sat Nov 9 02:15:02 2002 -@@ -7964,6 +7964,7 @@ +--- configure.orig Mon Aug 11 15:31:05 2003 ++++ configure Mon Aug 11 15:31:06 2003 +@@ -19070,6 +19070,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,12 +8,3 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8335,7 +8336,7 @@ - - - case $host in -- *-linux-gnu | *-irix6*) -+ *-linux-gnu | *-irix6* | *-freebsd*) - cat >>confdefs.h <<\_ACEOF - #define HAVE_MAN_WHEREIS 1 - _ACEOF diff --git a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in deleted file mode 100644 index 173f6be7e..000000000 --- a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- help-converters/gnome-vfs-module/Makefile.in.orig Sat Jun 14 04:50:22 2003 -+++ help-converters/gnome-vfs-module/Makefile.in Sat Jun 14 05:06:51 2003 -@@ -146,7 +146,7 @@ - cxxflags_set = @cxxflags_set@ - gnomelocaledir = @gnomelocaledir@ - --INCLUDES = -I$(top_srcdir) $(HELP_VFS_MODULE_CFLAGS) -DSERVERDIR=\"$(libexecdir)\" -+INCLUDES = -I$(top_srcdir) -DPREFIX=\""$(PREFIX)"\" -DLOCALBASE=\""$(LOCALBASE)"\" -DX11BASE=\""$(X11BASE)"\" $(HELP_VFS_MODULE_CFLAGS) -DSERVERDIR=\"$(libexecdir)\" - - - modules_LTLIBRARIES = libvfs-help.la diff --git a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::help-method.c b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::help-method.c deleted file mode 100644 index 6e3565d74..000000000 --- a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::help-method.c +++ /dev/null @@ -1,38 +0,0 @@ - -$FreeBSD: ports/x11/libgnome/files/patch-help-converters::gnome-vfs-module::help-method.c,v 1.2 2003/02/07 18:42:17 marcus Exp $ - ---- help-converters/gnome-vfs-module/help-method.c.orig Sat Jan 26 17:43:22 2002 -+++ help-converters/gnome-vfs-module/help-method.c Wed Feb 20 20:01:17 2002 -@@ -371,7 +371,7 @@ - else - buf = g_strdup_printf ("gnome/help/%s/%s/%s", base_name, lang, old_uri); - -- new_uri = g_strdup_printf ("/usr/share/%s", buf); -+ new_uri = g_strdup_printf (PREFIX "/share/%s", buf); - /* gnome_unconditional_datadir_file (buf); */ - g_free (buf); - -@@ -394,7 +394,7 @@ - - old_help = g_strdup_printf ("gnome/help/%s/%s/index.html", base_name, lang); - new_uri_with_extension = -- g_strdup_printf ("/usr/share/%s", -+ g_strdup_printf (PREFIX "/share/%s", - old_help); - - /* gnome_unconditional_datadir_file (old_help); */ -@@ -530,10 +530,10 @@ - int i; - - /* Check some hardcoded locations. */ -- if (strncmp (file, "/usr/info/", strlen ("/usr/info/")) == 0 || -- strncmp (file, "/usr/local/info/", strlen ("/usr/local/info/")) || -- strncmp (file, "/usr/gnome/info/", strlen ("/usr/gnome/info/")) || -- strncmp (file, "/usr/share/info/", strlen ("/usr/share/info/"))) { -+ if (strncmp (file, "/usr/share/info/", strlen ("/usr/share/info/")) == 0 || -+ strncmp (file, LOCALBASE "/info/", strlen (LOCALBASE "/info/")) || -+ strncmp (file, X11BASE "/info/", strlen (X11BASE "/info/")) || -+ strncmp (file, PREFIX "/info/", strlen (PREFIX "/info/"))) { - return TRUE; - } - diff --git a/x11/libgnome/files/patch-help-converters::info::Makefile.in b/x11/libgnome/files/patch-help-converters::info::Makefile.in deleted file mode 100644 index 442f804c1..000000000 --- a/x11/libgnome/files/patch-help-converters::info::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD: ports/x11/libgnome/files/patch-help-converters::info::Makefile.in,v 1.2 2003/02/07 18:42:17 marcus Exp $ - ---- help-converters/info/Makefile.in 2002/02/20 18:09:43 1.1 -+++ help-converters/info/Makefile.in 2002/02/20 18:10:02 -@@ -134,7 +134,7 @@ - cxxflags_set = @cxxflags_set@ - gnomelocaledir = @gnomelocaledir@ - --INCLUDES = $(LIBGNOME_CFLAGS) -+INCLUDES = -DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" -DX11BASE="\"$(X11BASE)\"" $(LIBGNOME_CFLAGS) - - bin_PROGRAMS = gnome2-info2html - diff --git a/x11/libgnome/files/patch-help-converters::info::main.c b/x11/libgnome/files/patch-help-converters::info::main.c deleted file mode 100644 index cd3f6f1c8..000000000 --- a/x11/libgnome/files/patch-help-converters::info::main.c +++ /dev/null @@ -1,22 +0,0 @@ ---- help-converters/info/main.c.orig Mon Aug 5 14:06:06 2002 -+++ help-converters/info/main.c Wed Aug 7 01:52:35 2002 -@@ -104,13 +104,15 @@ - char buf[PATH_MAX]; - - /* First, find the directory that the info file is in. */ -- dirs[0] = "/usr/info"; -- dirs[1] = "/usr/share/info"; -+ dirs[0] = "/usr/share/info"; -+ dirs[1] = PREFIX "/info"; -+ dirs[2] = LOCALBASE "/info"; -+ dirs[3] = X11BASE "/info"; - /* We now have at least one directory to look in. This is - * necessary because we may not have an 'INFOPATH' set */ -- ndirs = 2; -+ ndirs = 4; - if(infopath) { -- for (ndirs = 2, ctmp = strtok(infopath, ":"); ndirs < 64 && ctmp; ndirs++, ctmp = strtok(NULL, ":")) { -+ for (ndirs = 4, ctmp = strtok(infopath, ":"); ndirs < 64 && ctmp; ndirs++, ctmp = strtok(NULL, ":")) { - dirs[ndirs] = strdup(ctmp); - } - } |