Update to 2.3.6.

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

8 files changed, 6 insertions, 108 deletions

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 989be8206..5bb2b1db9 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.3.3.1
+PORTVERSION=	2.3.6
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index d1450dae1..2a37c9dec 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnome-2.3.3.1.tar.bz2) = 7e7abbef0f4088c9df45ddecd5cb6452
+MD5 (gnome2/libgnome-2.3.6.tar.bz2) = a4afbe112fb6468db0594ea1690eb67a
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);
-                         }
-                 }
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index afcee3206..fbd64ffd3 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -59,7 +59,6 @@ etc/gconf/schemas/desktop_gnome_sound.schemas
 etc/gconf/schemas/desktop_gnome_thumbnailers.schemas
 etc/gconf/schemas/desktop_gnome_typing_break.schemas
 etc/gconf/schemas/desktop_gnome_url_handlers.schemas
-etc/gnome-vfs-2.0/modules/help-methods.conf
 etc/sound/events/gnome-2.soundlist
 etc/sound/events/gtk-events-2.soundlist
 include/libgnome-2.0/libgnome/gnome-config.h
@@ -78,15 +77,11 @@ include/libgnome-2.0/libgnome/gnome-util.h
 include/libgnome-2.0/libgnome/libgnome.h
 include/libgnome-2.0/libgnome/libgnometypebuiltins.h
 lib/bonobo/monikers/libmoniker_extra_2.so
-lib/gnome-vfs-2.0/modules/libvfs-help.so
 lib/libgnome-2.a
 lib/libgnome-2.so
-lib/libgnome-2.so.303
+lib/libgnome-2.so.306
 libdata/bonobo/servers/GNOME_Moniker_std.server
 libdata/pkgconfig/libgnome-2.0.pc
-libexec/gnome2-db2html
-libexec/gnome2-info2html
-libexec/gnome2-man2html
 share/doc/libgnome/ch01s02.html
 share/doc/libgnome/ch01s03.html
 share/doc/libgnome/ch01s04.html
@@ -112,9 +107,6 @@ share/doc/libgnome/libgnome.devhelp
 share/doc/libgnome/libgnome.html
 share/doc/libgnome/right.png
 share/doc/libgnome/up.png
-share/gnome/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
-share/gnome/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
-share/gnome/sgml/docbook/gnome-customization-0.1/l10n.xml
 share/locale/am/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ar/LC_MESSAGES/libgnome-2.0.mo
 share/locale/az/LC_MESSAGES/libgnome-2.0.mo