Update to 1.4.1.3.

6 files changed, 77 insertions, 46 deletions

diff --git a/x11/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa
index 470d7bb71d40..d8cf6b134f16 100644
--- a/x11/gnomelibs/files/patch-aa
+++ b/x11/gnomelibs/files/patch-aa
@@ -1,27 +1,27 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Oct  5 10:53:42 2001
-+++ configure	Fri Oct  5 12:02:38 2001
-@@ -5416,7 +5416,7 @@
+--- configure.orig	Mon Jan 14 11:58:21 2002
++++ configure	Mon Jan 14 12:00:15 2002
+@@ -8775,7 +8775,7 @@
  else
    
-   save_LDFLAGS="$LDFLAGBS"
+   save_LDFLAGS="$LDFLAGS"
 -  LDFLAGS="$LDFLAGS `glib-config --libs gmodule`"
 +  LDFLAGS="$LDFLAGS `$GLIB_CONFIG --libs gmodule`"
    if test "$cross_compiling" = yes; then
    ac_cv_gmodule=yes
  else
-@@ -7035,7 +7035,7 @@
+@@ -10394,7 +10394,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff -ljpeg -lz -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 7041 "configure"
+ #line 10400 "configure"
  #include "confdefs.h"
-@@ -10111,13 +10111,13 @@
+@@ -13483,13 +13483,13 @@
  SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
  
  ART_LIBS="-lart_lgpl"
@@ -32,12 +32,12 @@ $FreeBSD$
  ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
  
  GNOME_LIBDIR='-L${libdir}'
--GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
-+GNOME_INCLUDEDIR='-I${includedir}/gnome-1.0 -I${includedir} -DNEED_GNOMESUPPORT_H'
+-GNOME_INCLUDEDIR='-I${includedir}/gnome-1.0 -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
++GNOME_INCLUDEDIR='-I${includedir}/gnome-1.0 -I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
  GNOME_IDLDIR='-I${datadir}/idl'
  
  
-@@ -10511,6 +10511,7 @@
+@@ -13887,6 +13887,7 @@
  s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
  s%@MAINT@%$MAINT%g
  s%@cflags_set@%$cflags_set%g
@@ -45,7 +45,7 @@ $FreeBSD$
  s%@GTK_CONFIG@%$GTK_CONFIG%g
  s%@GTK_CFLAGS@%$GTK_CFLAGS%g
  s%@GTK_LIBS@%$GTK_LIBS%g
-@@ -10980,10 +10981,6 @@
+@@ -14356,10 +14357,6 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/x11/gnomelibs/files/patch-bb b/x11/gnomelibs/files/patch-bb
index 0aa856f77061..a1daaf14fc52 100644
--- a/x11/gnomelibs/files/patch-bb
+++ b/x11/gnomelibs/files/patch-bb
@@ -1,16 +1,19 @@
---- gtk-xmhtml/Makefile.in.orig	Thu Oct  7 11:34:58 1999
-+++ gtk-xmhtml/Makefile.in	Wed Oct 13 21:15:01 1999
-@@ -147,7 +147,7 @@
+
+$FreeBSD$
+
+--- gtk-xmhtml/Makefile.in.orig	Mon Jan 14 12:02:33 2002
++++ gtk-xmhtml/Makefile.in	Mon Jan 14 12:03:13 2002
+@@ -151,7 +151,7 @@
+ libgtkxmhtmlincludedir = $(includedir)/gnome-1.0/gtk-xmhtml
  
- libgtkxmhtmlincludedir = $(includedir)/gtk-xmhtml
- 
--INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) @GTK_CFLAGS@            -DWITH_GTK -DDEBUG -DGNOME_LIB
-+INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) @GTK_CFLAGS@            -DWITH_GTK -DGNOME_LIB
+ INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) @GTK_CFLAGS@ \
+-           -DWITH_GTK -DDEBUG -DGNOME_LIB
++           -DWITH_GTK -DGNOME_LIB
  
  
  lib_LTLIBRARIES = libgtkxmhtml.la
-@@ -158,7 +158,7 @@
- libgtkxmhtmlinclude_HEADERS =  	miniparse.h			HTML.h				XmHTML.h			XmHTMLI.h			XmHTMLP.h			gtk-xmhtml-p.h			gtk-xmhtml.h			toolkit.h
+@@ -204,7 +204,7 @@
+ 	toolkit.h
  
  
 -libgtkxmhtml_la_LDFLAGS = -version-info 1:1:0 -rpath $(libdir)
@@ -18,7 +21,7 @@
  libgtkxmhtml_la_LIBADD = $(LIBGTKXMHTML_LIBS)
  
  noinst_PROGRAMS = htmltest
-@@ -463,7 +463,7 @@
+@@ -520,7 +520,7 @@
  uninstall-am: uninstall-libLTLIBRARIES \
  		uninstall-libgtkxmhtmlincludeHEADERS
  uninstall: uninstall-am
diff --git a/x11/gnomelibs/files/patch-bi b/x11/gnomelibs/files/patch-bi
index 2ea8098f7fd2..1debdb2d3658 100644
--- a/x11/gnomelibs/files/patch-bi
+++ b/x11/gnomelibs/files/patch-bi
@@ -1,18 +1,18 @@
 
 $FreeBSD$
 
---- libart_lgpl/Makefile.in.orig	Wed Aug 22 16:07:43 2001
-+++ libart_lgpl/Makefile.in	Wed Aug 22 16:11:07 2001
-@@ -100,7 +100,7 @@
- libart_lgpl_la_SOURCES =  	art_affine.c 	art_alphagamma.c 	art_bpath.c 	art_gray_svp.c 	art_misc.c 	art_pixbuf.c 	art_rect.c 	art_rect_svp.c 	art_rect_uta.c 	art_rgb.c 	art_rgb_affine.c 	art_rgb_affine_private.c 	art_rgb_affine_private.h 	art_rgb_bitmap_affine.c 	art_rgb_pixbuf_affine.c 	art_rgb_rgba_affine.c 	art_rgb_svp.c 	art_svp.c 	art_svp_ops.c 	art_svp_point.c 	art_svp_render_aa.c 	art_svp_vpath.c 	art_svp_vpath_stroke.c 	art_svp_wind.c 	art_uta.c 	art_uta_ops.c 	art_uta_rect.c 	art_uta_vpath.c 	art_uta_svp.c 	art_vpath.c 	art_vpath_bpath.c 	art_vpath_dash.c 	art_vpath_svp.c		libart-features.c
+--- libart_lgpl/Makefile.in.orig	Mon Jan 14 12:04:21 2002
++++ libart_lgpl/Makefile.in	Mon Jan 14 12:05:37 2002
+@@ -145,7 +145,7 @@
+ 	libart-features.c
  
  
 -libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@
 +libart_lgpl_la_LDFLAGS = -version-info 5:0:0
  libart_lgpl_la_LIBADD = -lm
  
- libart_lgplincdir = $(includedir)/libart_lgpl
-@@ -122,10 +122,10 @@
+ libart_lgplincdir = $(includedir)/gnome-1.0/libart_lgpl
+@@ -204,10 +204,10 @@
  testuta_DEPENDENCIES = $(DEPS)
  testuta_LDADD = $(LDADDS) -lm
  
@@ -25,12 +25,12 @@ $FreeBSD$
  confexec_DATA = libartConf.sh
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-@@ -656,7 +656,7 @@
- 		uninstall-confexecDATA uninstall-m4dataDATA \
- 		uninstall-libart_lgplincHEADERS
+@@ -790,7 +790,7 @@
+ 		uninstall-man uninstall-confexecDATA \
+ 		uninstall-m4dataDATA uninstall-libart_lgplincHEADERS
  uninstall: uninstall-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
-+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
++all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
  		$(HEADERS) config.h
  all-redirect: all-recursive-am
  install-strip:
diff --git a/x11/gnomelibs/files/patch-gtk-xmhtml::images.c b/x11/gnomelibs/files/patch-gtk-xmhtml::images.c
deleted file mode 100644
index 6e24a95c4b67..000000000000
--- a/x11/gnomelibs/files/patch-gtk-xmhtml::images.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- gtk-xmhtml/images.c	2001/12/15 05:19:03	1.1
-+++ gtk-xmhtml/images.c	2001/12/15 05:19:22
-@@ -2393,7 +2393,7 @@
- 		{
- 			if(!html->html.xcc)
- 				_XmHTMLCheckXCC(html);
--			image->xcc = html->html.xcc;
-+			xcc = image->xcc = html->html.xcc;
- 		}
- 	}
- 
diff --git a/x11/gnomelibs/files/patch-ltmain.sh b/x11/gnomelibs/files/patch-ltmain.sh
new file mode 100644
index 000000000000..98cb05e4ddb3
--- /dev/null
+++ b/x11/gnomelibs/files/patch-ltmain.sh
@@ -0,0 +1,28 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -2408,6 +2408,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4175,10 +4178,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11/gnomelibs/files/patch-po::Makefile.in.in b/x11/gnomelibs/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..68b6a8c98491
--- /dev/null
+++ b/x11/gnomelibs/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2002/01/14 11:02:35	1.1
++++ po/Makefile.in.in	2002/01/14 11:02:49
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \