Update gnome-libs to 1.2.5. Changes from version 1.2.3 are misc. bugfixes and

documentation improvements.

12 files changed, 72 insertions, 97 deletions

diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa
index 27083739a50..88ca94af06a 100644
--- a/x11/gnome-libs/patches/patch-aa
+++ b/x11/gnome-libs/patches/patch-aa
@@ -1,17 +1,20 @@
-$NetBSD: patch-aa,v 1.11 2000/06/20 23:20:12 jlam Exp $
+$NetBSD: patch-aa,v 1.12 2000/10/17 23:57:45 jlam Exp $
 
---- configure.orig	Sat May 20 20:55:16 2000
-+++ configure	Fri May 26 23:39:02 2000
-@@ -5304,7 +5304,7 @@
+--- configure.orig	Wed Sep 27 17:34:13 2000
++++ configure
+@@ -5301,6 +5301,11 @@
+    rm -f po/POTFILES
+    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ 	< $srcdir/po/POTFILES.in > po/POTFILES
++
++# NetBSD: set DATADIRNAME to "share"
++DATADIRNAME="share"
++INTLDEPS=
++INTLLIBS="-lintl"
    
  # AM_GNOME_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
--gnomelocaledir='${prefix}/${DATADIRNAME}/locale'
-+gnomelocaledir='${prefix}/share/locale'
- 
- 
- echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6
-@@ -10213,7 +10213,7 @@
+@@ -10265,7 +10270,7 @@
  GTKXMHTML_LIBS="-lgtkxmhtml $LIBGTKXMHTML_LIBS"
  ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
  
diff --git a/x11/gnome-libs/patches/patch-ab b/x11/gnome-libs/patches/patch-ab
deleted file mode 100644
index 96e2781e7f3..00000000000
--- a/x11/gnome-libs/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1999/03/07 12:53:25 tron Exp $
-
---- po/Makefile.in.in.orig	Mon Mar  1 20:50:23 1999
-+++ po/Makefile.in.in	Sun Mar  7 13:25:37 1999
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = @gnomelocaledir@
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/x11/gnome-libs/patches/patch-ac b/x11/gnome-libs/patches/patch-ac
index d1d7c2d3692..edb08a957a7 100644
--- a/x11/gnome-libs/patches/patch-ac
+++ b/x11/gnome-libs/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 1999/07/14 20:45:29 tron Exp $
+$NetBSD: patch-ac,v 1.8 2000/10/17 23:57:45 jlam Exp $
 
---- gnome-data/Makefile.in.orig	Tue Jun  1 22:08:52 1999
-+++ gnome-data/Makefile.in	Wed Jul 14 21:45:30 1999
-@@ -160,7 +160,7 @@
+--- gnome-data/Makefile.in.orig	Thu Oct 12 23:04:15 2000
++++ gnome-data/Makefile.in
+@@ -156,7 +156,7 @@
  EXTRA_DIST =  	gnome.soundlist 		gtk-events.soundlist		mime-magic 			gnome.mime 			paper.config			type.convert			postscript.convert		gnome-make-postscript-mimes
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.7 1999/07/14 20:45:29 tron Exp $
  sysconf_DATA = paper.config mime-magic
  
  soundlistdir = $(sysconfdir)/sound/events
-@@ -378,8 +378,8 @@
+@@ -374,8 +374,8 @@
  	$(SHELL) $(srcdir)/gnome-make-postscript-mimes > postscript.convert
  
  install-data-local:
diff --git a/x11/gnome-libs/patches/patch-ad b/x11/gnome-libs/patches/patch-ad
index 81ee979d919..a655df0fb23 100644
--- a/x11/gnome-libs/patches/patch-ad
+++ b/x11/gnome-libs/patches/patch-ad
@@ -1,13 +1,22 @@
-$NetBSD: patch-ad,v 1.7 1999/07/15 07:57:50 tron Exp $
+$NetBSD: patch-ad,v 1.8 2000/10/17 23:57:45 jlam Exp $
 
---- libgnome/Makefile.in.orig	Wed Apr 28 02:57:58 1999
-+++ libgnome/Makefile.in	Tue May  4 19:26:57 1999
-@@ -74,7 +74,7 @@
- AWK = @AWK@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
--CC = @CC@
-+CC = @CC@ ${A_OUT_STATIC}
- DATADIRNAME = @DATADIRNAME@
- DLLTOOL = @DLLTOOL@
- DL_LIB = @DL_LIB@
+--- libgnome/Makefile.in.orig	Thu Oct 12 23:03:30 2000
++++ libgnome/Makefile.in
+@@ -233,7 +233,7 @@
+ gnome_gen_mimedb_LDFLAGS = 
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) ${LIBGNOME_LTCOMPILE_FLAGS} $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ HEADERS =  $(libgnomeinclude_HEADERS) $(noinst_HEADERS)
+ 
+@@ -322,7 +322,7 @@
+ maintainer-clean-libtool:
+ 
+ libgnome.la: $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES)
+-	$(LINK) -rpath $(libdir) $(libgnome_la_LDFLAGS) $(libgnome_la_OBJECTS) $(libgnome_la_LIBADD) $(LIBS)
++	$(LINK) ${LIBGNOME_LTLINK_FLAGS} -rpath $(libdir) $(libgnome_la_LDFLAGS) $(libgnome_la_OBJECTS) $(libgnome_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-binPROGRAMS:
+ 
diff --git a/x11/gnome-libs/patches/patch-ae b/x11/gnome-libs/patches/patch-ae
index e2419820ccc..73d6b462261 100644
--- a/x11/gnome-libs/patches/patch-ae
+++ b/x11/gnome-libs/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.4 1999/09/03 07:19:25 rh Exp $
+$NetBSD: patch-ae,v 1.5 2000/10/17 23:57:45 jlam Exp $
 
---- devel-docs/Makefile.in.orig	Thu Sep  2 09:41:31 1999
-+++ devel-docs/Makefile.in	Thu Sep  2 09:42:37 1999
-@@ -157,7 +157,7 @@
+--- devel-docs/Makefile.in.orig	Thu Oct 12 23:04:00 2000
++++ devel-docs/Makefile.in
+@@ -156,7 +156,7 @@
  EXTRA_DIST =  	TODO.sgml				gnome-doc-framework.txt			$(TEXT_FILES)
  
  
 -docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc/gnome-libs
++docdir = $(datadir)/doc/gnome-libs
  doc_DATA = $(TEXT_FILES)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
diff --git a/x11/gnome-libs/patches/patch-af b/x11/gnome-libs/patches/patch-af
index 478a6732f15..fa849922314 100644
--- a/x11/gnome-libs/patches/patch-af
+++ b/x11/gnome-libs/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 1998/12/29 17:53:11 tron Exp $
+$NetBSD: patch-af,v 1.2 2000/10/17 23:57:45 jlam Exp $
 
---- tools/gnome-doc/Makefile.in.orig	Wed Dec 16 10:56:38 1998
-+++ tools/gnome-doc/Makefile.in	Tue Dec 29 17:56:38 1998
-@@ -139,7 +139,7 @@
+--- tools/gnome-doc/Makefile.in.orig	Thu Oct 12 23:03:18 2000
++++ tools/gnome-doc/Makefile.in
+@@ -146,7 +146,7 @@
  
  EXTRA_DIST = gnome-doc.el gnome-doc mkstub
  
diff --git a/x11/gnome-libs/patches/patch-ag b/x11/gnome-libs/patches/patch-ag
deleted file mode 100644
index 48694475984..00000000000
--- a/x11/gnome-libs/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.5 1999/04/16 21:31:17 tron Exp $
-
---- devel-docs/gnome/Makefile.in.orig	Sat Apr 10 02:31:59 1999
-+++ devel-docs/gnome/Makefile.in	Fri Apr 16 23:12:53 1999
-@@ -158,7 +158,7 @@
- # The directory containing the source code (if it contains documentation).
- DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/libgnome
- 
--HTML_DIR = $(datadir)/gnome/html
-+HTML_DIR = $(datadir)/doc/gnome-libs/html
- 
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- 
diff --git a/x11/gnome-libs/patches/patch-ai b/x11/gnome-libs/patches/patch-ai
deleted file mode 100644
index e767f13a5fb..00000000000
--- a/x11/gnome-libs/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.2 1999/04/04 20:22:12 tron Exp $
-
---- devel-docs/gnomeui/Makefile.in.orig	Sat Mar 13 02:17:49 1999
-+++ devel-docs/gnomeui/Makefile.in	Mon Mar 15 23:55:05 1999
-@@ -159,7 +159,7 @@
- CFLAGS = `gnome-config --cflags gnomeui`
- LDFLAGS = `gnome-config --libs gnomeui`
- 
--HTML_DIR = $(datadir)/gnome/html
-+HTML_DIR = $(datadir)/doc/gnome-libs/html
- 
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- 
diff --git a/x11/gnome-libs/patches/patch-aj b/x11/gnome-libs/patches/patch-aj
index 13b74d472f2..38198b9de0a 100644
--- a/x11/gnome-libs/patches/patch-aj
+++ b/x11/gnome-libs/patches/patch-aj
@@ -1,31 +1,31 @@
-$NetBSD: patch-aj,v 1.3 2000/06/02 12:10:09 drochner Exp $
+$NetBSD: patch-aj,v 1.4 2000/10/17 23:57:46 jlam Exp $
 
---- gnome-config.in.orig	Tue Sep  7 21:25:26 1999
-+++ gnome-config.in	Thu Jun  1 11:06:04 2000
+--- gnome-config.in.orig	Wed Sep 27 19:59:01 2000
++++ gnome-config.in
 @@ -40,6 +40,8 @@
      module_dirs="$extra:$module_dirs"
  done
  
-+module_dirs="XXXLOCALBASEXXX/lib:$module_dirs"
++module_dirs="@LOCALBASE@/lib:$module_dirs"
 +
  usage()
  {
      exit_code=$1
-@@ -169,11 +171,11 @@
+@@ -173,11 +175,11 @@
  	the_flags="$the_flags `gtk-config --cflags`"
  	;;
      gnome)
 -       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
-+       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@ -lintl"
++       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@ @INTLLIBS@"
    	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
  	;;
      gnomeui)
 -	the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@"
-+	the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@ -lintl"
++	the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@ @INTLLIBS@"
  	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
  	;;
      gtkxmhtml)
-@@ -239,7 +241,7 @@
+@@ -253,7 +255,7 @@
      case "$i" in
      # a library, save it for later, in reverse order
      -l*) rev_libs="$i $rev_libs" ;;
diff --git a/x11/gnome-libs/patches/patch-al b/x11/gnome-libs/patches/patch-al
index d60e3193932..37bf7ce6024 100644
--- a/x11/gnome-libs/patches/patch-al
+++ b/x11/gnome-libs/patches/patch-al
@@ -1,15 +1,15 @@
-$NetBSD: patch-al,v 1.1 1999/07/14 20:46:39 tron Exp $
+$NetBSD: patch-al,v 1.2 2000/10/17 23:57:46 jlam Exp $
 
---- gnome-faq/Makefile.in.orig	Tue Jun  1 22:08:57 1999
-+++ gnome-faq/Makefile.in	Wed Jul 14 22:11:26 1999
-@@ -153,8 +153,8 @@
+--- gnome-faq/Makefile.in.orig	Thu Oct 12 23:04:18 2000
++++ gnome-faq/Makefile.in
+@@ -149,8 +149,8 @@
  
  # Make rules for the `gnome-libs' module
  
 -@INSIDE_GNOME_DOCU_TRUE@htmldir = $(datadir)/html
 -@INSIDE_GNOME_DOCU_FALSE@htmldir = $(prefix)/html
-+@INSIDE_GNOME_DOCU_TRUE@htmldir = $(datadir)/doc/gnome-libs/html
-+@INSIDE_GNOME_DOCU_FALSE@htmldir = $(datadir)/doc/gnome-libs/html
++@INSIDE_GNOME_DOCU_TRUE@htmldir = $(datadir)/gnome/html/gnome-faq
++@INSIDE_GNOME_DOCU_FALSE@htmldir = $(prefix)/share/gnome/html/gnome-faq
  
  @INSIDE_GNOME_DOCU_TRUE@html_subdirs = gnome-faq
  
diff --git a/x11/gnome-libs/patches/patch-an b/x11/gnome-libs/patches/patch-an
index 44216a19532..c8020e7aeed 100644
--- a/x11/gnome-libs/patches/patch-an
+++ b/x11/gnome-libs/patches/patch-an
@@ -1,7 +1,8 @@
-$NetBSD: patch-an,v 1.2 2000/02/05 15:45:49 wiz Exp $
---- libgnome/gnome-score..orig	Thu Aug 19 21:35:44 1999
-+++ libgnome/gnome-score.c	Fri Nov 19 01:04:44 1999
-@@ -26,7 +26,7 @@
+$NetBSD: patch-an,v 1.3 2000/10/17 23:57:46 jlam Exp $
+
+--- libgnome/gnome-score.c.orig	Sat Jun 17 12:53:33 2000
++++ libgnome/gnome-score.c
+@@ -27,7 +27,7 @@
  #define NSCORES 10
  #endif
  
diff --git a/x11/gnome-libs/patches/patch-ao b/x11/gnome-libs/patches/patch-ao
index b176aac37a5..17d2d4201f7 100644
--- a/x11/gnome-libs/patches/patch-ao
+++ b/x11/gnome-libs/patches/patch-ao
@@ -1,13 +1,14 @@
-$NetBSD: patch-ao,v 1.1 2000/04/29 04:46:27 mycroft Exp $
+$NetBSD: patch-ao,v 1.2 2000/10/17 23:57:46 jlam Exp $
 
---- zvt/vt.c.orig	Sat Apr 29 00:40:04 2000
-+++ zvt/vt.c	Sat Apr 29 00:41:38 2000
-@@ -1152,7 +1152,7 @@
+--- zvt/vt.c.orig	Sat Mar 18 02:57:13 2000
++++ zvt/vt.c
+@@ -1154,7 +1154,8 @@
  
    for (j = 0; j < vt->argcnt; j++) {
      i = vt->arg.num.intargs[j];
 -    if (i==0 || i==27) {
 +    if (i==0) {
++      /* \E[27m only clears reverse video, not all attributes - mycroft */
        vt->attr=VTATTR_CLEAR;
      } else if (i<9) {
        vt->attr |= mode_map[i];	/* add a mode */