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

documentation improvements.

16 files changed, 337 insertions, 331 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index ee3e8e43e51..b6728f0c4c2 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2000/09/03 13:46:46 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2000/10/17 23:57:43 jlam Exp $
 
-DISTNAME=		gnome-libs-1.2.3
+DISTNAME=		gnome-libs-1.2.5
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-libs/}
 
@@ -20,7 +20,8 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
-			--with-glib-prefix=${LOCALBASE}
+			--with-glib-prefix=${LOCALBASE} \
+			--with-kde-datadir=${X11PREFIX}/share/kde
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" \
 			LOCALBASE=${LOCALBASE} \
 			X11BASE=${X11BASE}
@@ -35,37 +36,48 @@ PLIST_SUBST+=		LOCALBASE=${LOCALBASE} \
 
 .include "../../mk/bsd.prefs.mk"
 
+# XXX This is a kludge to get libgnome to work on a.out systems.
+#
+.if (${OBJECT_FMT} == a.out)
+LIBGNOME_LTCOMPILE_FLAGS=	-static
+LIBGNOME_LTLINK_FLAGS=		-all-static
+.else
+LIBGNOME_LTCOMPILE_FLAGS=
+LIBGNOME_LTLINK_FLAGS=
+.endif
+MAKE_ENV+=		LIBGNOME_LTCOMPILE_FLAGS="${LIBGNOME_LTCOMPILE_FLAGS}"
+MAKE_ENV+=		LIBGNOME_LTLINK_FLAGS="${LIBGNOME_LTLINK_FLAGS}"
+
 .if ${OPSYS} == "SunOS"
 DEPENDS+=		db-*:../../databases/db
 CPPFLAGS+=		-I${LOCALBASE}/include/db2
 
 pre-configure:
 	${MV} ${WRKSRC}/configure ${WRKSRC}/configure-pre-db-sub && \
-		${SED} -e 's|-ldb|-ldb2|g' ${WRKSRC}/configure-pre-db-sub > ${WRKSRC}/configure && \
+		${SED} -e 's|-ldb|-ldb2|g' \
+			< ${WRKSRC}/configure-pre-db-sub \
+			> ${WRKSRC}/configure && \
 		${CHMOD} 0755 ${WRKSRC}/configure
 .endif
 
 post-patch:
 	${MV} ${WRKSRC}/gnome-config.in ${WRKSRC}/gnome-config.in-pre-lpath && \
-	${SED} -e "s|XXXLOCALBASEXXX|${LOCALBASE}|" \
-		${WRKSRC}/gnome-config.in-pre-lpath >${WRKSRC}/gnome-config.in
+		${SED} -e "s|@LOCALBASE@|${LOCALBASE}|g" \
+			< ${WRKSRC}/gnome-config.in-pre-lpath \
+			> ${WRKSRC}/gnome-config.in
 
 pre-build:
-	cd ${WRKSRC}/support; ${GMAKE} gnomesupport.h
+	cd ${WRKSRC}/support && \
+		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} gnomesupport.h
 
 post-install:
-	${RMDIR} ${PREFIX}/share/gnome/html/zvt
 	${MKDIR} ${PREFIX}/etc/CORBA/servers
 	${TOUCH} ${PREFIX}/etc/CORBA/servers/.directory
-	${MKDIR} ${LOCALSTATEDIR}
 	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	cd ${PREFIX}; ${FIND} lib -name 'libgnome.so.*.*' >>${PLIST_SRC}
+	${MKDIR} ${LOCALSTATEDIR}
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
 	${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \
 		${LOCALBASE}/share/aclocal/libart.m4
 
 .include "../../mk/bsd.pkg.mk"
-
-.if (${OBJECT_FMT} == a.out)
-MAKE_ENV+=	A_OUT_STATIC=-static
-.endif
diff --git a/x11/gnome-libs/files/md5 b/x11/gnome-libs/files/md5
index 30ca22ab61b..003af20601e 100644
--- a/x11/gnome-libs/files/md5
+++ b/x11/gnome-libs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.17 2000/06/25 19:06:21 rh Exp $
+$NetBSD: md5,v 1.18 2000/10/17 23:57:45 jlam Exp $
 
-MD5 (gnome-libs-1.2.3.tar.gz) = 1e7e92c466a43a821128694c316df488
+MD5 (gnome-libs-1.2.5.tar.gz) = c996aada882f4e0828f9a9f6a1e1f1c6
diff --git a/x11/gnome-libs/files/patch-sum b/x11/gnome-libs/files/patch-sum
index 8f43f33e196..75e7d3ce805 100644
--- a/x11/gnome-libs/files/patch-sum
+++ b/x11/gnome-libs/files/patch-sum
@@ -1,15 +1,12 @@
-$NetBSD: patch-sum,v 1.15 2000/06/20 23:20:12 jlam Exp $
+$NetBSD: patch-sum,v 1.16 2000/10/17 23:57:45 jlam Exp $
 
-MD5 (patch-aa) = 6977c0ce021e60d9e314bb5b596f45af
-MD5 (patch-ab) = 911491cf3e32ffa67008d8d617f24a08
-MD5 (patch-ac) = 2234ccfc4f168c91bb2fc8686ed0590c
-MD5 (patch-ad) = c39cc321a208c5bf22aa8d07af9dd1a4
-MD5 (patch-ae) = 1c36b5b59dd826c0d015d7d5d110ae44
-MD5 (patch-af) = f14189c93bd7152e87cd5520823fc0d5
-MD5 (patch-ag) = 44c356ffb86853b201740f377091e89b
-MD5 (patch-ai) = baca2d5270e60252cf5e9406bd52064d
-MD5 (patch-aj) = 24907d9f09e4eb1694006418a7e6164f
+MD5 (patch-aa) = 304237d9a4a0fbfadd79537c0f67926e
+MD5 (patch-ac) = 503fba99ca4f3eb7273a438068694436
+MD5 (patch-ad) = 908c664c320462b0cfc80953cc4a86c9
+MD5 (patch-ae) = 2bcdc64aaeffac9a304373a21eb7b4a6
+MD5 (patch-af) = 1638838a43170d418746e6129f0f1dcf
+MD5 (patch-aj) = 82c813d934845a43b796a4bea95b3eff
 MD5 (patch-ak) = aef962961191617c236950a2e60a289b
-MD5 (patch-al) = c3b644c6ec492fa08a0f57a203688e8e
-MD5 (patch-an) = dee75a547a668dcb253b23588c7720e1
-MD5 (patch-ao) = 50fb239f98e3985d25fc48be0bf4fae1
+MD5 (patch-al) = 88791beef747b37ab7ac78a8705637c1
+MD5 (patch-an) = f04a6f1ed6b81360a964c60152d8b0e4
+MD5 (patch-ao) = 443ab84138c1d1c8c997a684101baff5
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 */
diff --git a/x11/gnome-libs/pkg/PLIST b/x11/gnome-libs/pkg/PLIST
index 3927b9b20c4..af64c405733 100644
--- a/x11/gnome-libs/pkg/PLIST
+++ b/x11/gnome-libs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2000/07/31 08:12:19 jlam Exp $
+@comment $NetBSD: PLIST,v 1.31 2000/10/17 23:57:46 jlam Exp $
 bin/dns-helper
 bin/gconfigger
 bin/gnome-bug
@@ -62,8 +62,8 @@ include/libart_lgpl/art_vpath.h
 include/libart_lgpl/art_vpath_bpath.h
 include/libart_lgpl/art_vpath_dash.h
 include/libart_lgpl/art_vpath_svp.h
-include/libart_lgpl/libart.h
 include/libart_lgpl/libart-features.h
+include/libart_lgpl/libart.h
 include/libgnome/gnome-config.h
 include/libgnome/gnome-defs.h
 include/libgnome/gnome-dentry.h
@@ -187,7 +187,7 @@ lib/libgnomesupport.la
 lib/libgnomesupport.so.0.0
 lib/libgnomeui.a
 lib/libgnomeui.la
-lib/libgnomeui.so.43.2
+lib/libgnomeui.so.43.4
 lib/libgnorba.a
 lib/libgnorba.la
 lib/libgnorba.so.28.8
@@ -199,7 +199,7 @@ lib/libgtkxmhtml.la
 lib/libgtkxmhtml.so.1.1
 lib/libzvt.a
 lib/libzvt.la
-lib/libzvt.so.4.7
+lib/libzvt.so.4.8
 man/man1/gnome-config.1
 man/man1/gnome.1
 man/man5/gnome-mime.5
@@ -217,185 +217,6 @@ share/doc/gnome-libs/mime-type-handling.txt
 share/doc/gnome-libs/mkstub
 share/doc/gnome-libs/session-management.txt
 share/doc/gnome-libs/suggestions.txt
-share/doc/gnome-libs/html/gnome.html
-share/doc/gnome-libs/html/gnome-decl.txt
-share/doc/gnome-libs/html/gnome-sections.txt
-share/doc/gnome-libs/html/gnome/book1.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-config.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-defs.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-dentry.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-exec.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-fileconvert.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-help.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-history.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-i18n.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-metadata.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-mime-info.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-mime.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-paper.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-popt.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-regex.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-remote.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-score.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-sound.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-triggers.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-url.html
-share/doc/gnome-libs/html/gnome/gnome-gnome-util.html
-share/doc/gnome-libs/html/gnome/gnome-libgnome.html
-share/doc/gnome-libs/html/gnome/libgnome.html
-share/doc/gnome-libs/html/gnomeui.html
-share/doc/gnome-libs/html/gnomeui.hierarchy
-share/doc/gnome-libs/html/gnomeui.types
-share/doc/gnome-libs/html/gnomeui-scan.c
-share/doc/gnome-libs/html/gnomeui-decl.txt
-share/doc/gnome-libs/html/gnomeui-sections.txt
-share/doc/gnome-libs/html/gnomeui/book1.html
-share/doc/gnome-libs/html/gnomeui/gnome-objects.html
-share/doc/gnome-libs/html/gnomeui/gnomeabout.html
-share/doc/gnome-libs/html/gnomeui/gnomeanimator.html
-share/doc/gnome-libs/html/gnomeui/gnomeapp.html
-share/doc/gnome-libs/html/gnomeui/gnomeappbar.html
-share/doc/gnome-libs/html/gnomeui/gnomecalculator.html
-share/doc/gnome-libs/html/gnomeui/gnomecanvas.html
-share/doc/gnome-libs/html/gnomeui/gnomecanvasellipse.html
-share/doc/gnome-libs/html/gnomeui/gnomecanvasgroup.html
-share/doc/gnome-libs/html/gnomeui/gnomecanvasimage.html
-share/doc/gnome-libs/html/gnomeui/gnomecanvasitem.html
-share/doc/gnome-libs/html/gnomeui/gnomecanvasline.html
-share/doc/gnome-libs/html/gnomeui/gnomecanvaspolygon.html
-share/doc/gnome-libs/html/gnomeui/gnomecanvasre.html
-share/doc/gnome-libs/html/gnomeui/gnomecanvasrect.html
-share/doc/gnome-libs/html/gnomeui/gnomedock.html
-share/doc/gnome-libs/html/gnomeui/gnomecanvastext.html
-share/doc/gnome-libs/html/gnomeui/gnomecanvaswidget.html
-share/doc/gnome-libs/html/gnomeui/gnomeclient.html
-share/doc/gnome-libs/html/gnomeui/gnomecolorpicker.html
-share/doc/gnome-libs/html/gnomeui/gnomedateedit.html
-share/doc/gnome-libs/html/gnomeui/gnomedentryedit.html
-share/doc/gnome-libs/html/gnomeui/gnomedialog.html
-share/doc/gnome-libs/html/gnomeui/gnomedockband.html
-share/doc/gnome-libs/html/gnomeui/gnomedockitem.html
-share/doc/gnome-libs/html/gnomeui/gnomedocklayout.html
-share/doc/gnome-libs/html/gnomeui/gnomedruid.html
-share/doc/gnome-libs/html/gnomeui/gnomedruidpage.html
-share/doc/gnome-libs/html/gnomeui/gnomedruidpagefinish.html
-share/doc/gnome-libs/html/gnomeui/gnomedruidpagestandard.html
-share/doc/gnome-libs/html/gnomeui/gnomedruidpagestart.html
-share/doc/gnome-libs/html/gnomeui/gnomeentry.html
-share/doc/gnome-libs/html/gnomeui/gnomefileentry.html
-share/doc/gnome-libs/html/gnomeui/gnomefontpicker.html
-share/doc/gnome-libs/html/gnomeui/gnomefontselector.html
-share/doc/gnome-libs/html/gnomeui/gnomehref.html
-share/doc/gnome-libs/html/gnomeui/gnomeiconentry.html
-share/doc/gnome-libs/html/gnomeui/gnomeiconlist.html
-share/doc/gnome-libs/html/gnomeui/gnomeiconselection.html
-share/doc/gnome-libs/html/gnomeui/gnomeicontextitem.html
-share/doc/gnome-libs/html/gnomeui/gnomeless.html
-share/doc/gnome-libs/html/gnomeui/gnomemdi.html
-share/doc/gnome-libs/html/gnomeui/gnomemdichild.html
-share/doc/gnome-libs/html/gnomeui/gnomemdigenericchild.html
-share/doc/gnome-libs/html/gnomeui/gnomemessagebox.html
-share/doc/gnome-libs/html/gnomeui/gnomenumberentry.html
-share/doc/gnome-libs/html/gnomeui/gnomepaperselector.html
-share/doc/gnome-libs/html/gnomeui/gnomepixmap.html
-share/doc/gnome-libs/html/gnomeui/gnomepixmapentry.html
-share/doc/gnome-libs/html/gnomeui/gnomeprocbar.html
-share/doc/gnome-libs/html/gnomeui/gnomepropertybox.html
-share/doc/gnome-libs/html/gnomeui/gnomescores.html
-share/doc/gnome-libs/html/gnomeui/gnomespell.html
-share/doc/gnome-libs/html/gnomeui/gnomestock.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-app-helper.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-app-util.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-canvas-util.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-dialog-util.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-dns.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-geometry.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-ice.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-icon-text.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-init.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-mdi-session.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-startup.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-popup-help.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-popup-menu.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-preferences.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-properties.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-property-entries.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-types.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-uidefs.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-window-icon.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-winhints.html
-share/doc/gnome-libs/html/gnomeui/gnomeui-gtkcauldron.html
-share/doc/gnome-libs/html/gnomeui/gtkclock.html
-share/doc/gnome-libs/html/gnomeui/gtkdial.html
-share/doc/gnome-libs/html/gnomeui/gtkpixmapmenuitem.html
-share/doc/gnome-libs/html/gnomeui/gtkted.html
-share/doc/gnome-libs/html/gnomeui/libgnomeui.html
-share/doc/gnome-libs/html/architecture.html
-share/doc/gnome-libs/html/archives.html
-share/doc/gnome-libs/html/autoconf.html
-share/doc/gnome-libs/html/compilehelp.html
-share/doc/gnome-libs/html/compilinggnome.html
-share/doc/gnome-libs/html/contactfaq.html
-share/doc/gnome-libs/html/corba.html
-share/doc/gnome-libs/html/credits.html
-share/doc/gnome-libs/html/developinggnome.html
-share/doc/gnome-libs/html/docbook.html
-share/doc/gnome-libs/html/faqissues.html
-share/doc/gnome-libs/html/fhs.html
-share/doc/gnome-libs/html/freesoftware.html
-share/doc/gnome-libs/html/ftpmail.html
-share/doc/gnome-libs/html/gettingdebian.html
-share/doc/gnome-libs/html/gettingfreebsd.html
-share/doc/gnome-libs/html/gettinggnome.html
-share/doc/gnome-libs/html/gettingotherrpm.html
-share/doc/gnome-libs/html/gettingotherunix.html
-share/doc/gnome-libs/html/gettingsuse.html
-share/doc/gnome-libs/html/gettingwindows.html
-share/doc/gnome-libs/html/getttingrh.html
-share/doc/gnome-libs/html/gnomer.html
-share/doc/gnome-libs/html/graphics.html
-share/doc/gnome-libs/html/guile.html
-share/doc/gnome-libs/html/help.html
-share/doc/gnome-libs/html/i18n.html
-share/doc/gnome-libs/html/index.html
-share/doc/gnome-libs/html/libtool.html
-share/doc/gnome-libs/html/mailinglist.html
-share/doc/gnome-libs/html/opensource.html
-share/doc/gnome-libs/html/order.html
-share/doc/gnome-libs/html/overview.html
-share/doc/gnome-libs/html/pronunciation.html
-share/doc/gnome-libs/html/runtimehelp.html
-share/doc/gnome-libs/html/sm.html
-share/doc/gnome-libs/html/trademark.html
-share/doc/gnome-libs/html/uninstall.html
-share/doc/gnome-libs/html/usinggnome.html
-share/doc/gnome-libs/html/whygnome.html
-share/doc/gnome-libs/html/whynot.html
-share/doc/gnome-libs/html/wm.html
-share/doc/gnome-libs/html/x124.html
-share/doc/gnome-libs/html/x137.html
-share/doc/gnome-libs/html/x179.html
-share/doc/gnome-libs/html/x191.html
-share/doc/gnome-libs/html/x238.html
-share/doc/gnome-libs/html/x251.html
-share/doc/gnome-libs/html/x30.html
-share/doc/gnome-libs/html/x359.html
-share/doc/gnome-libs/html/x372.html
-share/doc/gnome-libs/html/x377.html
-share/doc/gnome-libs/html/x394.html
-share/doc/gnome-libs/html/x446.html
-share/doc/gnome-libs/html/x470.html
-share/doc/gnome-libs/html/x484.html
-share/doc/gnome-libs/html/x488.html
-share/doc/gnome-libs/html/x496.html
-share/doc/gnome-libs/html/x70.html
-share/doc/gnome-libs/html/x962.html
-share/doc/gnome-libs/html/x967.html
-share/doc/gnome-libs/html/x975.html
-share/doc/gnome-libs/html/x979.html
-share/doc/gnome-libs/html/x986.html
-share/doc/gnome-libs/html/x992.html
-share/doc/gnome-libs/html/docbook.css
 share/gnome/help/gnome-dev-info/C/addauth.html
 share/gnome/help/gnome-dev-info/C/altpol.html
 share/gnome/help/gnome-dev-info/C/arch.html
@@ -423,10 +244,14 @@ share/gnome/help/gnome-dev-info/C/gnome-client.html
 share/gnome/help/gnome-dev-info/C/gnome-color-selector.html
 share/gnome/help/gnome-dev-info/C/gnome-defs.html
 share/gnome/help/gnome-dev-info/C/gnome-dentry.html
+share/gnome/help/gnome-dev-info/C/gnome-dev-info.html
 share/gnome/help/gnome-dev-info/C/gnome-dialog.html
 share/gnome/help/gnome-dev-info/C/gnome-dns.html
 share/gnome/help/gnome-dev-info/C/gnome-fileconvert.html
 share/gnome/help/gnome-dev-info/C/gnome-font-selector.html
+share/gnome/help/gnome-dev-info/C/gnome-hello-0-basic.jpg
+share/gnome/help/gnome-dev-info/C/gnome-hello-1-menus.jpg
+share/gnome/help/gnome-dev-info/C/gnome-hello-2-i18n.jpg
 share/gnome/help/gnome-dev-info/C/gnome-help.html
 share/gnome/help/gnome-dev-info/C/gnome-history.html
 share/gnome/help/gnome-dev-info/C/gnome-hook.html
@@ -453,6 +278,7 @@ share/gnome/help/gnome-dev-info/C/gnomeappbar.html
 share/gnome/help/gnome-dev-info/C/graphics-contexts.html
 share/gnome/help/gnome-dev-info/C/gtk-clock.html
 share/gnome/help/gnome-dev-info/C/gtk-ted.html
+share/gnome/help/gnome-dev-info/C/index.html
 share/gnome/help/gnome-dev-info/C/intro.html
 share/gnome/help/gnome-dev-info/C/libgnome.html
 share/gnome/help/gnome-dev-info/C/libgnomeui.html
@@ -476,12 +302,208 @@ share/gnome/help/gnome-dev-info/C/x1453.html
 share/gnome/help/gnome-dev-info/C/x2161.html
 share/gnome/help/gnome-dev-info/C/x2674.html
 share/gnome/help/gnome-dev-info/C/x671.html
+share/gnome/html/gnome-decl.txt
+share/gnome/html/gnome-faq/architecture.html
+share/gnome/html/gnome-faq/archives.html
+share/gnome/html/gnome-faq/autoconf.html
+share/gnome/html/gnome-faq/compilehelp.html
+share/gnome/html/gnome-faq/compilinggnome.html
+share/gnome/html/gnome-faq/contactfaq.html
+share/gnome/html/gnome-faq/corba.html
+share/gnome/html/gnome-faq/credits.html
+share/gnome/html/gnome-faq/developinggnome.html
+share/gnome/html/gnome-faq/docbook.css
+share/gnome/html/gnome-faq/docbook.html
+share/gnome/html/gnome-faq/faqissues.html
+share/gnome/html/gnome-faq/fhs.html
+share/gnome/html/gnome-faq/freesoftware.html
+share/gnome/html/gnome-faq/ftpmail.html
+share/gnome/html/gnome-faq/gettingdebian.html
+share/gnome/html/gnome-faq/gettingfreebsd.html
+share/gnome/html/gnome-faq/gettinggnome.html
+share/gnome/html/gnome-faq/gettingotherrpm.html
+share/gnome/html/gnome-faq/gettingotherunix.html
+share/gnome/html/gnome-faq/gettingsuse.html
+share/gnome/html/gnome-faq/gettingwindows.html
+share/gnome/html/gnome-faq/getttingrh.html
+share/gnome/html/gnome-faq/gnomer.html
+share/gnome/html/gnome-faq/graphics.html
+share/gnome/html/gnome-faq/guile.html
+share/gnome/html/gnome-faq/help.html
+share/gnome/html/gnome-faq/i18n.html
+share/gnome/html/gnome-faq/index.html
+share/gnome/html/gnome-faq/libtool.html
+share/gnome/html/gnome-faq/mailinglist.html
+share/gnome/html/gnome-faq/opensource.html
+share/gnome/html/gnome-faq/order.html
+share/gnome/html/gnome-faq/overview.html
+share/gnome/html/gnome-faq/pronunciation.html
+share/gnome/html/gnome-faq/runtimehelp.html
+share/gnome/html/gnome-faq/sm.html
+share/gnome/html/gnome-faq/trademark.html
+share/gnome/html/gnome-faq/uninstall.html
+share/gnome/html/gnome-faq/usinggnome.html
+share/gnome/html/gnome-faq/whygnome.html
+share/gnome/html/gnome-faq/whynot.html
+share/gnome/html/gnome-faq/wm.html
+share/gnome/html/gnome-faq/x124.html
+share/gnome/html/gnome-faq/x137.html
+share/gnome/html/gnome-faq/x179.html
+share/gnome/html/gnome-faq/x191.html
+share/gnome/html/gnome-faq/x238.html
+share/gnome/html/gnome-faq/x251.html
+share/gnome/html/gnome-faq/x30.html
+share/gnome/html/gnome-faq/x359.html
+share/gnome/html/gnome-faq/x372.html
+share/gnome/html/gnome-faq/x377.html
+share/gnome/html/gnome-faq/x394.html
+share/gnome/html/gnome-faq/x446.html
+share/gnome/html/gnome-faq/x470.html
+share/gnome/html/gnome-faq/x484.html
+share/gnome/html/gnome-faq/x488.html
+share/gnome/html/gnome-faq/x496.html
+share/gnome/html/gnome-faq/x70.html
+share/gnome/html/gnome-faq/x962.html
+share/gnome/html/gnome-faq/x967.html
+share/gnome/html/gnome-faq/x975.html
+share/gnome/html/gnome-faq/x979.html
+share/gnome/html/gnome-faq/x986.html
+share/gnome/html/gnome-faq/x992.html
+share/gnome/html/gnome-sections.txt
+share/gnome/html/gnome.html
+share/gnome/html/gnome/book1.html
+share/gnome/html/gnome/gnome-gnome-config.html
+share/gnome/html/gnome/gnome-gnome-defs.html
+share/gnome/html/gnome/gnome-gnome-dentry.html
+share/gnome/html/gnome/gnome-gnome-exec.html
+share/gnome/html/gnome/gnome-gnome-fileconvert.html
+share/gnome/html/gnome/gnome-gnome-help.html
+share/gnome/html/gnome/gnome-gnome-history.html
+share/gnome/html/gnome/gnome-gnome-i18n.html
+share/gnome/html/gnome/gnome-gnome-metadata.html
+share/gnome/html/gnome/gnome-gnome-mime-info.html
+share/gnome/html/gnome/gnome-gnome-mime.html
+share/gnome/html/gnome/gnome-gnome-paper.html
+share/gnome/html/gnome/gnome-gnome-popt.html
+share/gnome/html/gnome/gnome-gnome-regex.html
+share/gnome/html/gnome/gnome-gnome-remote.html
+share/gnome/html/gnome/gnome-gnome-score.html
+share/gnome/html/gnome/gnome-gnome-sound.html
+share/gnome/html/gnome/gnome-gnome-triggers.html
+share/gnome/html/gnome/gnome-gnome-url.html
+share/gnome/html/gnome/gnome-gnome-util.html
+share/gnome/html/gnome/gnome-libgnome.html
+share/gnome/html/gnome/libgnome.html
+share/gnome/html/gnomeui-decl.txt
+share/gnome/html/gnomeui-scan.c
+share/gnome/html/gnomeui-sections.txt
+share/gnome/html/gnomeui.hierarchy
+share/gnome/html/gnomeui.html
+share/gnome/html/gnomeui.types
+share/gnome/html/gnomeui/book1.html
+share/gnome/html/gnomeui/gnome-objects.html
+share/gnome/html/gnomeui/gnomeabout.html
+share/gnome/html/gnomeui/gnomeanimator.html
+share/gnome/html/gnomeui/gnomeapp.html
+share/gnome/html/gnomeui/gnomeappbar.html
+share/gnome/html/gnomeui/gnomecalculator.html
+share/gnome/html/gnomeui/gnomecanvas.html
+share/gnome/html/gnomeui/gnomecanvasellipse.html
+share/gnome/html/gnomeui/gnomecanvasgroup.html
+share/gnome/html/gnomeui/gnomecanvasimage.html
+share/gnome/html/gnomeui/gnomecanvasitem.html
+share/gnome/html/gnomeui/gnomecanvasline.html
+share/gnome/html/gnomeui/gnomecanvaspolygon.html
+share/gnome/html/gnomeui/gnomecanvasre.html
+share/gnome/html/gnomeui/gnomecanvasrect.html
+share/gnome/html/gnomeui/gnomecanvastext.html
+share/gnome/html/gnomeui/gnomecanvaswidget.html
+share/gnome/html/gnomeui/gnomeclient.html
+share/gnome/html/gnomeui/gnomecolorpicker.html
+share/gnome/html/gnomeui/gnomedateedit.html
+share/gnome/html/gnomeui/gnomedentryedit.html
+share/gnome/html/gnomeui/gnomedialog.html
+share/gnome/html/gnomeui/gnomedock.html
+share/gnome/html/gnomeui/gnomedockband.html
+share/gnome/html/gnomeui/gnomedockitem.html
+share/gnome/html/gnomeui/gnomedocklayout.html
+share/gnome/html/gnomeui/gnomedruid.html
+share/gnome/html/gnomeui/gnomedruidpage.html
+share/gnome/html/gnomeui/gnomedruidpagefinish.html
+share/gnome/html/gnomeui/gnomedruidpagestandard.html
+share/gnome/html/gnomeui/gnomedruidpagestart.html
+share/gnome/html/gnomeui/gnomeentry.html
+share/gnome/html/gnomeui/gnomefileentry.html
+share/gnome/html/gnomeui/gnomefontpicker.html
+share/gnome/html/gnomeui/gnomefontselector.html
+share/gnome/html/gnomeui/gnomeguru.html
+share/gnome/html/gnomeui/gnomehref.html
+share/gnome/html/gnomeui/gnomeiconentry.html
+share/gnome/html/gnomeui/gnomeiconlist.html
+share/gnome/html/gnomeui/gnomeiconselection.html
+share/gnome/html/gnomeui/gnomeicontextitem.html
+share/gnome/html/gnomeui/gnomeless.html
+share/gnome/html/gnomeui/gnomemdi.html
+share/gnome/html/gnomeui/gnomemdichild.html
+share/gnome/html/gnomeui/gnomemdigenericchild.html
+share/gnome/html/gnomeui/gnomemessagebox.html
+share/gnome/html/gnomeui/gnomenumberentry.html
+share/gnome/html/gnomeui/gnomepaperselector.html
+share/gnome/html/gnomeui/gnomepixmap.html
+share/gnome/html/gnomeui/gnomepixmapentry.html
+share/gnome/html/gnomeui/gnomeprocbar.html
+share/gnome/html/gnomeui/gnomepropertybox.html
+share/gnome/html/gnomeui/gnomescores.html
+share/gnome/html/gnomeui/gnomespell.html
+share/gnome/html/gnomeui/gnomestock.html
+share/gnome/html/gnomeui/gnomeui-gnome-app-helper.html
+share/gnome/html/gnomeui/gnomeui-gnome-app-util.html
+share/gnome/html/gnomeui/gnomeui-gnome-canvas-util.html
+share/gnome/html/gnomeui/gnomeui-gnome-dialog-util.html
+share/gnome/html/gnomeui/gnomeui-gnome-dns.html
+share/gnome/html/gnomeui/gnomeui-gnome-geometry.html
+share/gnome/html/gnomeui/gnomeui-gnome-ice.html
+share/gnome/html/gnomeui/gnomeui-gnome-icon-text.html
+share/gnome/html/gnomeui/gnomeui-gnome-init.html
+share/gnome/html/gnomeui/gnomeui-gnome-mdi-session.html
+share/gnome/html/gnomeui/gnomeui-gnome-popup-help.html
+share/gnome/html/gnomeui/gnomeui-gnome-popup-menu.html
+share/gnome/html/gnomeui/gnomeui-gnome-preferences.html
+share/gnome/html/gnomeui/gnomeui-gnome-properties.html
+share/gnome/html/gnomeui/gnomeui-gnome-property-entries.html
+share/gnome/html/gnomeui/gnomeui-gnome-startup.html
+share/gnome/html/gnomeui/gnomeui-gnome-types.html
+share/gnome/html/gnomeui/gnomeui-gnome-uidefs.html
+share/gnome/html/gnomeui/gnomeui-gnome-window-icon.html
+share/gnome/html/gnomeui/gnomeui-gnome-winhints.html
+share/gnome/html/gnomeui/gnomeui-gtkcauldron.html
+share/gnome/html/gnomeui/gtkclock.html
+share/gnome/html/gnomeui/gtkdial.html
+share/gnome/html/gnomeui/gtkpixmapmenuitem.html
+share/gnome/html/gnomeui/gtkted.html
+share/gnome/html/gnomeui/libgnomeui.html
 share/gnome/html/gnorba-decl.txt
 share/gnome/html/gnorba-sections.txt
 share/gnome/html/gnorba/book1.html
 share/gnome/html/gnorba/gnorba-gnorba.html
 share/gnome/html/gnorba/gnorba-goad.html
 share/gnome/html/gnorba/libgnorba.html
+share/gnome/html/zvt/book1.html
+share/gnome/html/zvt/x119.html
+share/gnome/html/zvt/x144.html
+share/gnome/html/zvt/x152.html
+share/gnome/html/zvt/x192.html
+share/gnome/html/zvt/x222.html
+share/gnome/html/zvt/x243.html
+share/gnome/html/zvt/x263.html
+share/gnome/html/zvt/x98.html
+share/gnome/html/zvt/zvtterm-future.html
+share/gnome/html/zvt/zvtterm-input-output.html
+share/gnome/html/zvt/zvtterm-notes.html
+share/gnome/html/zvt/zvtterm-properties.html
+share/gnome/html/zvt/zvtterm-reference.html
+share/gnome/html/zvt/zvtterm-window-hints.html
+share/gnome/html/zvt/zvtterm.html
 share/gtkrc
 share/gtkrc.el
 share/gtkrc.eo
@@ -554,35 +576,35 @@ share/pixmaps/yes.xpm
 share/type-convert/gnome-make-postscript-mimes
 share/type-convert/postscript.convert
 share/type-convert/type.convert
-@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/libart.m4 ${LOCALBASE}/share/aclocal/libart.m4
-@unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/libart.m4
-@dirrm etc/sound/events
-@dirrm etc/sound
-@dirrm include/gtk-xmhtml
-@dirrm include/libart_lgpl
-@dirrm include/libgnome
-@dirrm include/libgnomeui
-@dirrm include/libgnorba
-@dirrm include/zvt
-@dirrm lib/gnome-libs/include
-@dirrm lib/gnome-libs
-@dirrm share/doc/gnome-libs/html/gnome
-@dirrm share/doc/gnome-libs/html/gnomeui
-@dirrm share/doc/gnome-libs/html
-@dirrm share/doc/gnome-libs
+@dirrm share/type-convert
+@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrm share/mime-info
+@dirrm share/idl
+@dirrm share/gnome/html/zvt
+@dirrm share/gnome/html/gnorba
+@dirrm share/gnome/html/gnomeui
+@dirrm share/gnome/html/gnome-faq
+@dirrm share/gnome/html/gnome
+@dirrm share/gnome/html
 @dirrm share/gnome/help/gnome-dev-info/C
 @dirrm share/gnome/help/gnome-dev-info
 @dirrm share/gnome/help
-@dirrm share/gnome/html/gnorba
-@dirrm share/gnome/html
 @unexec rmdir %D/share/gnome/apps 2>/dev/null || true
 @unexec rmdir %D/share/gnome 2>/dev/null || true
-@unexec rmdir %D/etc/httpd 2>/dev/null || true
-@dirrm share/idl
-@dirrm share/mime-info
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
-@dirrm share/type-convert
+@dirrm share/doc/gnome-libs
+@dirrm lib/gnome-libs/include
+@dirrm lib/gnome-libs
+@dirrm include/zvt
+@dirrm include/libgnorba
+@dirrm include/libgnomeui
+@dirrm include/libgnome
+@dirrm include/libart_lgpl
+@dirrm include/gtk-xmhtml
+@dirrm etc/sound/events
+@dirrm etc/sound
 @dirrm etc/CORBA/servers
 @dirrm etc/CORBA
+@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/libart.m4 ${LOCALBASE}/share/aclocal/libart.m4
+@unexec test %D = ${LOCALBASE} || rm -f ${LOCALBASE}/share/aclocal/libart.m4
 @exec mkdir -p ${LOCALSTATEDIR}
 @unexec rm -rf ${LOCALSTATEDIR}