Update to 1.4.1.1.

3 files changed, 38 insertions, 20 deletions

diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa
index 604dc409f06d..7705958f69a1 100644
--- a/x11/libgnome/files/patch-aa
+++ b/x11/libgnome/files/patch-aa
@@ -1,15 +1,27 @@
---- configure.orig	Tue Aug  1 21:58:10 2000
-+++ configure	Tue Aug  1 21:59:03 2000
-@@ -7214,7 +7214,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Wed Aug 22 16:15:39 2001
++++ configure	Wed Aug 22 16:17:10 2001
+@@ -5416,7 +5416,7 @@
+ else
+   
+   save_LDFLAGS="$LDFLAGBS"
+-  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 @@
    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 7220 "configure"
+ #line 7041 "configure"
  #include "confdefs.h"
-@@ -10208,13 +10208,13 @@
+@@ -10111,13 +10111,13 @@
  SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
  
  ART_LIBS="-lart_lgpl"
@@ -25,7 +37,7 @@
  GNOME_IDLDIR='-I${datadir}/idl'
  
  
-@@ -10609,6 +10609,7 @@
+@@ -10511,6 +10511,7 @@
  s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
  s%@MAINT@%$MAINT%g
  s%@cflags_set@%$cflags_set%g
@@ -33,7 +45,7 @@
  s%@GTK_CONFIG@%$GTK_CONFIG%g
  s%@GTK_CFLAGS@%$GTK_CFLAGS%g
  s%@GTK_LIBS@%$GTK_LIBS%g
-@@ -11079,10 +11080,6 @@
+@@ -10980,10 +10981,6 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/x11/libgnome/files/patch-bi b/x11/libgnome/files/patch-bi
index feb8e007fb1a..2ea8098f7fd2 100644
--- a/x11/libgnome/files/patch-bi
+++ b/x11/libgnome/files/patch-bi
@@ -1,15 +1,18 @@
---- libart_lgpl/Makefile.in.orig	Wed Apr 28 02:57:51 1999
-+++ libart_lgpl/Makefile.in	Fri Apr 30 00:19:41 1999
-@@ -94,7 +94,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_render_aa.c 	art_svp_vpath.c 	art_svp_vpath_stroke.c 	art_svp_wind.c 	art_svp_wind.h 	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_svp.c
+
+$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_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
- libart_lgplinc_HEADERS =  	art_affine.h 	art_alphagamma.h 	art_bpath.h 	art_filterlevel.h 	art_gray_svp.h 	art_misc.h 	art_pathcode.h 	art_pixbuf.h 	art_point.h 	art_rect.h 	art_rect_svp.h 	art_rect_uta.h 	art_rgb.h 	art_rgb_affine.h 	art_rgb_bitmap_affine.h 	art_rgb_pixbuf_affine.h 	art_rgb_rgba_affine.h 	art_rgb_svp.h 	art_svp.h 	art_svp_ops.h 	art_svp_render_aa.h 	art_svp_vpath.h 	art_svp_vpath_stroke.h 	art_uta.h 	art_uta_ops.h 	art_uta_rect.h 	art_uta_vpath.h 	art_uta_svp.h 	art_vpath.h 	art_vpath_bpath.h 	art_vpath_svp.h
-@@ -115,10 +115,10 @@
+@@ -122,10 +122,10 @@
  testuta_DEPENDENCIES = $(DEPS)
  testuta_LDADD = $(LDADDS) -lm
  
@@ -22,12 +25,12 @@
  confexec_DATA = libartConf.sh
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-@@ -569,7 +569,7 @@
+@@ -656,7 +656,7 @@
  		uninstall-confexecDATA uninstall-m4dataDATA \
  		uninstall-libart_lgplincHEADERS
- uninstall: uninstall-am
+ uninstall: uninstall-recursive
 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
 +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
  		$(HEADERS) config.h
- all-redirect: all-am
+ all-redirect: all-recursive-am
  install-strip:
diff --git a/x11/libgnome/files/patch-bl b/x11/libgnome/files/patch-bl
index a16b56bc3a8b..6e87d04eb50c 100644
--- a/x11/libgnome/files/patch-bl
+++ b/x11/libgnome/files/patch-bl
@@ -1,6 +1,9 @@
---- libgnomeui/gnome-init.c.orig	Sat May  6 10:30:31 2000
-+++ libgnomeui/gnome-init.c	Tue Sep 12 11:34:20 2000
-@@ -200,32 +200,8 @@
+
+$FreeBSD$
+
+--- libgnomeui/gnome-init.c.orig	Thu Aug 16 21:15:48 2001
++++ libgnomeui/gnome-init.c	Wed Aug 22 16:15:00 2001
+@@ -205,32 +205,8 @@
  	switch(reason) {
  	case POPT_CALLBACK_REASON_PRE:
                  {
@@ -26,7 +29,7 @@
 -                                        setme = g_strconcat ("LC_CTYPE=", old_ctype, NULL);
 -                                        g_free(old_ctype);
 -                                } else
--                                        setme = "LC_CTYPE";
+-                                        setme = "LC_CTYPE=";
 -
 -                                putenv (setme);
 -                        }