9 files changed, 261 insertions, 228 deletions

diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 4b9c17432728..a388815f2071 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomelibs
-PORTVERSION=	1.4.1.2
-PORTREVISION=	2
+PORTVERSION=	1.4.1.3
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-libs
@@ -26,22 +25,25 @@ USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_IMLIB=	yes
 USE_ESOUND=	yes
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-LIBTOOLFILES=	configure libart_lgpl/configure
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--disable-test-gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		gnome.1 gnome-config.1
+MAN1=		dns-helper.1 gconfigger.1 gnome-config.1 gnome-doc.1 \
+		gnome-dump-metadata.1 gnome-gen-mimedb.1 gnome-mkstub.1 \
+		gnome-moz-remote.1 gnome-name-service.1 gnome-pty-helper.1 \
+		gnome.1 gnome_segv.1 goad-browser.1 libart-config.1 \
+		loadshlib.1 new-object.1
 MAN5=		gnome-mime.5
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/x11/gnomelibs/distinfo b/x11/gnomelibs/distinfo
index accc3fda87be..25d2de6dfe14 100644
--- a/x11/gnomelibs/distinfo
+++ b/x11/gnomelibs/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-1.4.1.2.tar.gz) = ce61fade4cfbc5c73717433ce0154452
+MD5 (gnome-libs-1.4.1.3.tar.gz) = 88faed9e64b06bd05dde35ab42fe7ee7
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 \
diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist
index 4e72060ec742..8cf7bbc74d3f 100644
--- a/x11/gnomelibs/pkg-plist
+++ b/x11/gnomelibs/pkg-plist
@@ -19,164 +19,164 @@ etc/mime-magic.dat
 etc/paper.config
 etc/sound/events/gnome.soundlist
 etc/sound/events/gtk-events.soundlist
-include/gnome.h
+include/gnome-1.0/gnome.h
+include/gnome-1.0/gtk-xmhtml/HTML.h
+include/gnome-1.0/gtk-xmhtml/XmHTML.h
+include/gnome-1.0/gtk-xmhtml/XmHTMLI.h
+include/gnome-1.0/gtk-xmhtml/XmHTMLP.h
+include/gnome-1.0/gtk-xmhtml/gtk-xmhtml-p.h
+include/gnome-1.0/gtk-xmhtml/gtk-xmhtml.h
+include/gnome-1.0/gtk-xmhtml/miniparse.h
+include/gnome-1.0/gtk-xmhtml/toolkit.h
+include/gnome-1.0/libart_lgpl/art_affine.h
+include/gnome-1.0/libart_lgpl/art_alphagamma.h
+include/gnome-1.0/libart_lgpl/art_bpath.h
+include/gnome-1.0/libart_lgpl/art_config.h
+include/gnome-1.0/libart_lgpl/art_filterlevel.h
+include/gnome-1.0/libart_lgpl/art_gray_svp.h
+include/gnome-1.0/libart_lgpl/art_misc.h
+include/gnome-1.0/libart_lgpl/art_pathcode.h
+include/gnome-1.0/libart_lgpl/art_pixbuf.h
+include/gnome-1.0/libart_lgpl/art_point.h
+include/gnome-1.0/libart_lgpl/art_rect.h
+include/gnome-1.0/libart_lgpl/art_rect_svp.h
+include/gnome-1.0/libart_lgpl/art_rect_uta.h
+include/gnome-1.0/libart_lgpl/art_rgb.h
+include/gnome-1.0/libart_lgpl/art_rgb_affine.h
+include/gnome-1.0/libart_lgpl/art_rgb_bitmap_affine.h
+include/gnome-1.0/libart_lgpl/art_rgb_pixbuf_affine.h
+include/gnome-1.0/libart_lgpl/art_rgb_rgba_affine.h
+include/gnome-1.0/libart_lgpl/art_rgb_svp.h
+include/gnome-1.0/libart_lgpl/art_svp.h
+include/gnome-1.0/libart_lgpl/art_svp_ops.h
+include/gnome-1.0/libart_lgpl/art_svp_point.h
+include/gnome-1.0/libart_lgpl/art_svp_render_aa.h
+include/gnome-1.0/libart_lgpl/art_svp_vpath.h
+include/gnome-1.0/libart_lgpl/art_svp_vpath_stroke.h
+include/gnome-1.0/libart_lgpl/art_svp_wind.h
+include/gnome-1.0/libart_lgpl/art_uta.h
+include/gnome-1.0/libart_lgpl/art_uta_ops.h
+include/gnome-1.0/libart_lgpl/art_uta_rect.h
+include/gnome-1.0/libart_lgpl/art_uta_svp.h
+include/gnome-1.0/libart_lgpl/art_uta_vpath.h
+include/gnome-1.0/libart_lgpl/art_vpath.h
+include/gnome-1.0/libart_lgpl/art_vpath_bpath.h
+include/gnome-1.0/libart_lgpl/art_vpath_dash.h
+include/gnome-1.0/libart_lgpl/art_vpath_svp.h
+include/gnome-1.0/libart_lgpl/libart-features.h
+include/gnome-1.0/libart_lgpl/libart.h
+include/gnome-1.0/libgnome/gnome-config.h
+include/gnome-1.0/libgnome/gnome-defs.h
+include/gnome-1.0/libgnome/gnome-dentry.h
+include/gnome-1.0/libgnome/gnome-exec.h
+include/gnome-1.0/libgnome/gnome-fileconvert.h
+include/gnome-1.0/libgnome/gnome-help.h
+include/gnome-1.0/libgnome/gnome-history.h
+include/gnome-1.0/libgnome/gnome-i18n.h
+include/gnome-1.0/libgnome/gnome-magic.h
+include/gnome-1.0/libgnome/gnome-metadata.h
+include/gnome-1.0/libgnome/gnome-mime-info.h
+include/gnome-1.0/libgnome/gnome-mime.h
+include/gnome-1.0/libgnome/gnome-paper.h
+include/gnome-1.0/libgnome/gnome-popt.h
+include/gnome-1.0/libgnome/gnome-regex.h
+include/gnome-1.0/libgnome/gnome-remote.h
+include/gnome-1.0/libgnome/gnome-score.h
+include/gnome-1.0/libgnome/gnome-sound.h
+include/gnome-1.0/libgnome/gnome-triggers.h
+include/gnome-1.0/libgnome/gnome-url.h
+include/gnome-1.0/libgnome/gnome-util.h
+include/gnome-1.0/libgnome/libgnome.h
+include/gnome-1.0/libgnomeui/gnome-about.h
+include/gnome-1.0/libgnomeui/gnome-animator.h
+include/gnome-1.0/libgnomeui/gnome-app-helper.h
+include/gnome-1.0/libgnomeui/gnome-app-util.h
+include/gnome-1.0/libgnomeui/gnome-app.h
+include/gnome-1.0/libgnomeui/gnome-appbar.h
+include/gnome-1.0/libgnomeui/gnome-calculator.h
+include/gnome-1.0/libgnomeui/gnome-canvas-image.h
+include/gnome-1.0/libgnomeui/gnome-canvas-line.h
+include/gnome-1.0/libgnomeui/gnome-canvas-load.h
+include/gnome-1.0/libgnomeui/gnome-canvas-polygon.h
+include/gnome-1.0/libgnomeui/gnome-canvas-rect-ellipse.h
+include/gnome-1.0/libgnomeui/gnome-canvas-text.h
+include/gnome-1.0/libgnomeui/gnome-canvas-util.h
+include/gnome-1.0/libgnomeui/gnome-canvas-widget.h
+include/gnome-1.0/libgnomeui/gnome-canvas.h
+include/gnome-1.0/libgnomeui/gnome-client.h
+include/gnome-1.0/libgnomeui/gnome-color-picker.h
+include/gnome-1.0/libgnomeui/gnome-compat.h
+include/gnome-1.0/libgnomeui/gnome-dateedit.h
+include/gnome-1.0/libgnomeui/gnome-dentry-edit.h
+include/gnome-1.0/libgnomeui/gnome-dialog-util.h
+include/gnome-1.0/libgnomeui/gnome-dialog.h
+include/gnome-1.0/libgnomeui/gnome-dns.h
+include/gnome-1.0/libgnomeui/gnome-dock-band.h
+include/gnome-1.0/libgnomeui/gnome-dock-item.h
+include/gnome-1.0/libgnomeui/gnome-dock-layout.h
+include/gnome-1.0/libgnomeui/gnome-dock.h
+include/gnome-1.0/libgnomeui/gnome-druid-page-finish.h
+include/gnome-1.0/libgnomeui/gnome-druid-page-standard.h
+include/gnome-1.0/libgnomeui/gnome-druid-page-start.h
+include/gnome-1.0/libgnomeui/gnome-druid-page.h
+include/gnome-1.0/libgnomeui/gnome-druid.h
+include/gnome-1.0/libgnomeui/gnome-entry.h
+include/gnome-1.0/libgnomeui/gnome-file-entry.h
+include/gnome-1.0/libgnomeui/gnome-font-picker.h
+include/gnome-1.0/libgnomeui/gnome-font-selector.h
+include/gnome-1.0/libgnomeui/gnome-geometry.h
+include/gnome-1.0/libgnomeui/gnome-guru.h
+include/gnome-1.0/libgnomeui/gnome-href.h
+include/gnome-1.0/libgnomeui/gnome-ice.h
+include/gnome-1.0/libgnomeui/gnome-icon-entry.h
+include/gnome-1.0/libgnomeui/gnome-icon-item.h
+include/gnome-1.0/libgnomeui/gnome-icon-list.h
+include/gnome-1.0/libgnomeui/gnome-icon-sel.h
+include/gnome-1.0/libgnomeui/gnome-icon-text.h
+include/gnome-1.0/libgnomeui/gnome-init.h
+include/gnome-1.0/libgnomeui/gnome-less.h
+include/gnome-1.0/libgnomeui/gnome-mdi-child.h
+include/gnome-1.0/libgnomeui/gnome-mdi-generic-child.h
+include/gnome-1.0/libgnomeui/gnome-mdi-session.h
+include/gnome-1.0/libgnomeui/gnome-mdi.h
+include/gnome-1.0/libgnomeui/gnome-messagebox.h
+include/gnome-1.0/libgnomeui/gnome-number-entry.h
+include/gnome-1.0/libgnomeui/gnome-paper-selector.h
+include/gnome-1.0/libgnomeui/gnome-pixmap-entry.h
+include/gnome-1.0/libgnomeui/gnome-pixmap.h
+include/gnome-1.0/libgnomeui/gnome-popup-help.h
+include/gnome-1.0/libgnomeui/gnome-popup-menu.h
+include/gnome-1.0/libgnomeui/gnome-preferences.h
+include/gnome-1.0/libgnomeui/gnome-procbar.h
+include/gnome-1.0/libgnomeui/gnome-properties.h
+include/gnome-1.0/libgnomeui/gnome-property-entries.h
+include/gnome-1.0/libgnomeui/gnome-propertybox.h
+include/gnome-1.0/libgnomeui/gnome-scores.h
+include/gnome-1.0/libgnomeui/gnome-spell.h
+include/gnome-1.0/libgnomeui/gnome-startup.h
+include/gnome-1.0/libgnomeui/gnome-stock.h
+include/gnome-1.0/libgnomeui/gnome-types.h
+include/gnome-1.0/libgnomeui/gnome-uidefs.h
+include/gnome-1.0/libgnomeui/gnome-window-icon.h
+include/gnome-1.0/libgnomeui/gnome-window.h
+include/gnome-1.0/libgnomeui/gnome-winhints.h
+include/gnome-1.0/libgnomeui/gnometypebuiltins.h
+include/gnome-1.0/libgnomeui/gtk-clock.h
+include/gnome-1.0/libgnomeui/gtk-ted.h
+include/gnome-1.0/libgnomeui/gtkcauldron.h
+include/gnome-1.0/libgnomeui/gtkdial.h
+include/gnome-1.0/libgnomeui/gtkpixmapmenuitem.h
+include/gnome-1.0/libgnomeui/libgnomeui.h
+include/gnome-1.0/libgnorba/Table.h
+include/gnome-1.0/libgnorba/gnome-factory.h
+include/gnome-1.0/libgnorba/gnome-unknown.h
+include/gnome-1.0/libgnorba/gnorba.h
+include/gnome-1.0/popt-gnome.h
+include/gnome-1.0/zvt/lists.h
+include/gnome-1.0/zvt/vt.h
+include/gnome-1.0/zvt/vtx.h
+include/gnome-1.0/zvt/zvtterm.h
 include/gnomesupport.h
-include/gtk-xmhtml/HTML.h
-include/gtk-xmhtml/XmHTML.h
-include/gtk-xmhtml/XmHTMLI.h
-include/gtk-xmhtml/XmHTMLP.h
-include/gtk-xmhtml/gtk-xmhtml-p.h
-include/gtk-xmhtml/gtk-xmhtml.h
-include/gtk-xmhtml/miniparse.h
-include/gtk-xmhtml/toolkit.h
-include/libart_lgpl/art_affine.h
-include/libart_lgpl/art_alphagamma.h
-include/libart_lgpl/art_bpath.h
-include/libart_lgpl/art_config.h
-include/libart_lgpl/art_filterlevel.h
-include/libart_lgpl/art_gray_svp.h
-include/libart_lgpl/art_misc.h
-include/libart_lgpl/art_pathcode.h
-include/libart_lgpl/art_pixbuf.h
-include/libart_lgpl/art_point.h
-include/libart_lgpl/art_rect.h
-include/libart_lgpl/art_rect_svp.h
-include/libart_lgpl/art_rect_uta.h
-include/libart_lgpl/art_rgb.h
-include/libart_lgpl/art_rgb_affine.h
-include/libart_lgpl/art_rgb_bitmap_affine.h
-include/libart_lgpl/art_rgb_pixbuf_affine.h
-include/libart_lgpl/art_rgb_rgba_affine.h
-include/libart_lgpl/art_rgb_svp.h
-include/libart_lgpl/art_svp.h
-include/libart_lgpl/art_svp_ops.h
-include/libart_lgpl/art_svp_point.h
-include/libart_lgpl/art_svp_render_aa.h
-include/libart_lgpl/art_svp_vpath.h
-include/libart_lgpl/art_svp_vpath_stroke.h
-include/libart_lgpl/art_svp_wind.h
-include/libart_lgpl/art_uta.h
-include/libart_lgpl/art_uta_ops.h
-include/libart_lgpl/art_uta_rect.h
-include/libart_lgpl/art_uta_svp.h
-include/libart_lgpl/art_uta_vpath.h
-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-features.h
-include/libart_lgpl/libart.h
-include/libgnome/gnome-config.h
-include/libgnome/gnome-defs.h
-include/libgnome/gnome-dentry.h
-include/libgnome/gnome-exec.h
-include/libgnome/gnome-fileconvert.h
-include/libgnome/gnome-help.h
-include/libgnome/gnome-history.h
-include/libgnome/gnome-i18n.h
-include/libgnome/gnome-magic.h
-include/libgnome/gnome-metadata.h
-include/libgnome/gnome-mime-info.h
-include/libgnome/gnome-mime.h
-include/libgnome/gnome-paper.h
-include/libgnome/gnome-popt.h
-include/libgnome/gnome-regex.h
-include/libgnome/gnome-remote.h
-include/libgnome/gnome-score.h
-include/libgnome/gnome-sound.h
-include/libgnome/gnome-triggers.h
-include/libgnome/gnome-url.h
-include/libgnome/gnome-util.h
-include/libgnome/libgnome.h
-include/libgnomeui/gnome-about.h
-include/libgnomeui/gnome-animator.h
-include/libgnomeui/gnome-app-helper.h
-include/libgnomeui/gnome-app-util.h
-include/libgnomeui/gnome-app.h
-include/libgnomeui/gnome-appbar.h
-include/libgnomeui/gnome-calculator.h
-include/libgnomeui/gnome-canvas-image.h
-include/libgnomeui/gnome-canvas-line.h
-include/libgnomeui/gnome-canvas-load.h
-include/libgnomeui/gnome-canvas-polygon.h
-include/libgnomeui/gnome-canvas-rect-ellipse.h
-include/libgnomeui/gnome-canvas-text.h
-include/libgnomeui/gnome-canvas-util.h
-include/libgnomeui/gnome-canvas-widget.h
-include/libgnomeui/gnome-canvas.h
-include/libgnomeui/gnome-client.h
-include/libgnomeui/gnome-color-picker.h
-include/libgnomeui/gnome-compat.h
-include/libgnomeui/gnome-dateedit.h
-include/libgnomeui/gnome-dentry-edit.h
-include/libgnomeui/gnome-dialog-util.h
-include/libgnomeui/gnome-dialog.h
-include/libgnomeui/gnome-dns.h
-include/libgnomeui/gnome-dock-band.h
-include/libgnomeui/gnome-dock-item.h
-include/libgnomeui/gnome-dock-layout.h
-include/libgnomeui/gnome-dock.h
-include/libgnomeui/gnome-druid-page-finish.h
-include/libgnomeui/gnome-druid-page-standard.h
-include/libgnomeui/gnome-druid-page-start.h
-include/libgnomeui/gnome-druid-page.h
-include/libgnomeui/gnome-druid.h
-include/libgnomeui/gnome-entry.h
-include/libgnomeui/gnome-file-entry.h
-include/libgnomeui/gnome-font-picker.h
-include/libgnomeui/gnome-font-selector.h
-include/libgnomeui/gnome-geometry.h
-include/libgnomeui/gnome-guru.h
-include/libgnomeui/gnome-href.h
-include/libgnomeui/gnome-ice.h
-include/libgnomeui/gnome-icon-entry.h
-include/libgnomeui/gnome-icon-item.h
-include/libgnomeui/gnome-icon-list.h
-include/libgnomeui/gnome-icon-sel.h
-include/libgnomeui/gnome-icon-text.h
-include/libgnomeui/gnome-init.h
-include/libgnomeui/gnome-less.h
-include/libgnomeui/gnome-mdi-child.h
-include/libgnomeui/gnome-mdi-generic-child.h
-include/libgnomeui/gnome-mdi-session.h
-include/libgnomeui/gnome-mdi.h
-include/libgnomeui/gnome-messagebox.h
-include/libgnomeui/gnome-number-entry.h
-include/libgnomeui/gnome-paper-selector.h
-include/libgnomeui/gnome-pixmap-entry.h
-include/libgnomeui/gnome-pixmap.h
-include/libgnomeui/gnome-popup-help.h
-include/libgnomeui/gnome-popup-menu.h
-include/libgnomeui/gnome-preferences.h
-include/libgnomeui/gnome-procbar.h
-include/libgnomeui/gnome-properties.h
-include/libgnomeui/gnome-property-entries.h
-include/libgnomeui/gnome-propertybox.h
-include/libgnomeui/gnome-scores.h
-include/libgnomeui/gnome-spell.h
-include/libgnomeui/gnome-startup.h
-include/libgnomeui/gnome-stock.h
-include/libgnomeui/gnome-types.h
-include/libgnomeui/gnome-uidefs.h
-include/libgnomeui/gnome-window-icon.h
-include/libgnomeui/gnome-window.h
-include/libgnomeui/gnome-winhints.h
-include/libgnomeui/gnometypebuiltins.h
-include/libgnomeui/gtk-clock.h
-include/libgnomeui/gtk-ted.h
-include/libgnomeui/gtkcauldron.h
-include/libgnomeui/gtkdial.h
-include/libgnomeui/gtkpixmapmenuitem.h
-include/libgnomeui/libgnomeui.h
-include/libgnorba/Table.h
-include/libgnorba/gnome-factory.h
-include/libgnorba/gnome-unknown.h
-include/libgnorba/gnorba.h
-include/popt-gnome.h
-include/zvt/lists.h
-include/zvt/vt.h
-include/zvt/vtx.h
-include/zvt/zvtterm.h
 lib/libart_lgpl.a
 lib/libart_lgpl.so
 lib/libart_lgpl.so.5
@@ -203,10 +203,10 @@ lib/libzvt.so
 lib/libzvt.so.5
 share/aclocal/libart.m4
 share/gnome/doc/gnome-doc
+share/gnome/doc/gnome-doc.1
 share/gnome/doc/gnome-doc.el
+share/gnome/doc/gnome-mkstub.1
 share/gnome/doc/mkstub
-share/gnome/gtk-doc/html/libart/advanced-uta.html
-share/gnome/gtk-doc/html/libart/advanced.html
 share/gnome/gtk-doc/html/libart/basic-foo.html
 share/gnome/gtk-doc/html/libart/basic-rendering.html
 share/gnome/gtk-doc/html/libart/basic.html
@@ -232,9 +232,6 @@ share/gnome/gtk-doc/html/libart/libart-art-alpha-gamma-stuff.html
 share/gnome/gtk-doc/html/libart/libart-core-construction-apis.html
 share/gnome/gtk-doc/html/libart/libart-extended-construction-apis.html
 share/gnome/gtk-doc/html/libart/libart-memory-management.html
-share/gnome/gtk-doc/html/libart/libart-micro-tile-array.html
-share/gnome/gtk-doc/html/libart/libart-pixel-buffer-affine-transformations.html
-share/gnome/gtk-doc/html/libart/libart-pixel-buffers.html
 share/gnome/gtk-doc/html/libart/libart-svp-rendering.html
 share/gnome/gtk-doc/html/libart/libart-svps.html
 share/gnome/gtk-doc/html/libart/libart-transformation-operations.html
@@ -243,7 +240,7 @@ share/gnome/gtk-doc/html/libart/problems-memory.html
 share/gnome/gtk-doc/html/libart/problems.html
 share/gnome/gtk-doc/html/libart/sample-display.html
 share/gnome/gtk-doc/html/libart/sample.html
-share/gnome/gtk-doc/html/libart/x31.html
+share/gnome/gtk-doc/html/libart/x35.html
 share/gnome/gtkrc
 share/gnome/gtkrc.el
 share/gnome/gtkrc.eo
@@ -270,7 +267,6 @@ share/gnome/help/gnome-dev-info/C/book1.html
 share/gnome/help/gnome-dev-info/C/codstd.html
 share/gnome/help/gnome-dev-info/C/cvs.html
 share/gnome/help/gnome-dev-info/C/dialogapputil-docs.html
-share/gnome/help/gnome-dev-info/C/docbook.css
 share/gnome/help/gnome-dev-info/C/event-driven-programming.html
 share/gnome/help/gnome-dev-info/C/gnome-actionarea.html
 share/gnome/help/gnome-dev-info/C/gnome-app-helper-convenience-macros.html
@@ -462,14 +458,17 @@ 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/x1035.html
+share/gnome/html/zvt/x1065.html
+share/gnome/html/zvt/x1086.html
+share/gnome/html/zvt/x1106.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/x987.html
+share/gnome/html/zvt/x995.html
+share/gnome/html/zvt/zvt-zvtterm.html
 share/gnome/html/zvt/zvtterm-future.html
 share/gnome/html/zvt/zvtterm-input-output.html
 share/gnome/html/zvt/zvtterm-notes.html
@@ -537,7 +536,7 @@ share/locale/uk/LC_MESSAGES/gnome-libs.mo
 share/locale/vi/LC_MESSAGES/gnome-libs.mo
 share/locale/wa/LC_MESSAGES/gnome-libs.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-libs.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
 @exec mkdir -p %D/share/gnome/games
 @dirrm share/gnome/type-convert
 @dirrm share/gnome/pixmaps
@@ -556,11 +555,12 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
 @dirrm share/gnome/gtk-doc
 @dirrm share/gnome/games
 @dirrm share/gnome/doc
-@dirrm include/zvt
-@dirrm include/libgnorba
-@dirrm include/libgnomeui
-@dirrm include/libgnome
-@dirrm include/libart_lgpl
-@dirrm include/gtk-xmhtml
+@dirrm include/gnome-1.0/zvt
+@dirrm include/gnome-1.0/libgnorba
+@dirrm include/gnome-1.0/libgnomeui
+@dirrm include/gnome-1.0/libgnome
+@dirrm include/gnome-1.0/libart_lgpl
+@dirrm include/gnome-1.0/gtk-xmhtml
+@dirrm include/gnome-1.0
 @dirrm etc/sound/events
 @dirrm etc/sound