Update gnome-libs to 1.4.1.4. Changes are bugfixes, new man pages, and

new translations.

19 files changed, 367 insertions, 375 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index f35da072549..dc077480d53 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2002/03/13 17:37:56 fredb Exp $
+# $NetBSD: Makefile,v 1.76 2002/03/24 19:53:40 rh Exp $
 
-DISTNAME=		gnome-libs-1.4.1.2
-PKGREVISION=		1
+DISTNAME=		gnome-libs-1.4.1.4
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-libs/}
 
diff --git a/x11/gnome-libs/PLIST b/x11/gnome-libs/PLIST
index 6ed1c85d07b..c1a9232f8af 100644
--- a/x11/gnome-libs/PLIST
+++ b/x11/gnome-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:13:07 skrll Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/03/24 19:53:41 rh Exp $
 bin/dns-helper
 bin/gconfigger
 bin/gnome-bug
@@ -18,163 +18,163 @@ etc/mime-magic.dat
 etc/paper.config
 etc/sound/events/gnome.soundlist
 etc/sound/events/gtk-events.soundlist
-include/gnome.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.h
-include/libgnomeui/gnome-window-icon.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
+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
 lib/gnome-libs/include/gnomesupport.h
 lib/gnomeConf.sh
 lib/libartConf.sh
@@ -218,8 +218,23 @@ lib/libzvt.la
 lib/libzvt.so
 lib/libzvt.so.4
 lib/libzvt.so.4.10
+man/man1/dns-helper.1
+man/man1/gconfigger.1
+man/man1/gnome-bug.1
 man/man1/gnome-config.1
+man/man1/gnome-doc.1
+man/man1/gnome-dump-metadata.1
+man/man1/gnome-gen-mimedb.1
+man/man1/gnome-mkstub.1
+man/man1/gnome-moz-remote.1
+man/man1/gnome-name-service.1
+man/man1/gnome-pty-helper.1
 man/man1/gnome.1
+man/man1/gnome_segv.1
+man/man1/goad-browser.1
+man/man1/libart-config.1
+man/man1/loadshlib.1
+man/man1/new-object.1
 man/man5/gnome-mime.5
 sbin/gnome-pty-helper
 share/aclocal/libart.m4
@@ -229,7 +244,9 @@ share/doc/gnome-libs/adding-file-manager-new-items.txt
 share/doc/gnome-libs/adding-sounds.txt
 share/doc/gnome-libs/api-comment-style.txt
 share/doc/gnome-libs/gnome-doc
+share/doc/gnome-libs/gnome-doc.1
 share/doc/gnome-libs/gnome-doc.el
+share/doc/gnome-libs/gnome-mkstub.1
 share/doc/gnome-libs/gtk_dialog_cauldron.3
 share/doc/gnome-libs/mime-type-handling.txt
 share/doc/gnome-libs/mkstub
@@ -242,7 +259,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
@@ -433,15 +449,18 @@ 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-decl.txt
+share/gnome/html/zvt-sections.txt
 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
@@ -449,8 +468,7 @@ 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/gtk-doc/html/libart/advanced-uta.html
-share/gtk-doc/html/libart/advanced.html
+share/gnome/html/zvtterm.html
 share/gtk-doc/html/libart/basic-foo.html
 share/gtk-doc/html/libart/basic-rendering.html
 share/gtk-doc/html/libart/basic.html
@@ -476,9 +494,6 @@ share/gtk-doc/html/libart/libart-art-alpha-gamma-stuff.html
 share/gtk-doc/html/libart/libart-core-construction-apis.html
 share/gtk-doc/html/libart/libart-extended-construction-apis.html
 share/gtk-doc/html/libart/libart-memory-management.html
-share/gtk-doc/html/libart/libart-micro-tile-array.html
-share/gtk-doc/html/libart/libart-pixel-buffer-affine-transformations.html
-share/gtk-doc/html/libart/libart-pixel-buffers.html
 share/gtk-doc/html/libart/libart-svp-rendering.html
 share/gtk-doc/html/libart/libart-svps.html
 share/gtk-doc/html/libart/libart-transformation-operations.html
@@ -487,7 +502,7 @@ share/gtk-doc/html/libart/problems-memory.html
 share/gtk-doc/html/libart/problems.html
 share/gtk-doc/html/libart/sample-display.html
 share/gtk-doc/html/libart/sample.html
-share/gtk-doc/html/libart/x31.html
+share/gtk-doc/html/libart/x35.html
 share/gtkrc
 share/gtkrc.el
 share/gtkrc.eo
@@ -555,7 +570,7 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-libs.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-libs.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-libs.mo
 ${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-libs.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
 share/mime-info/gnome.mime
 share/pixmaps/calculator-font.png
 share/pixmaps/gnome-default-dlg.png
@@ -586,12 +601,13 @@ share/type-convert/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 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
 @dirrm etc/CORBA/servers
diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk
index 0f42035cde1..0784d95171d 100644
--- a/x11/gnome-libs/buildlink.mk
+++ b/x11/gnome-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.14 2002/03/13 17:37:56 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.15 2002/03/24 19:53:41 rh Exp $
 #
 # This Makefile fragment is included by packages that use gnome-libs.
 #
@@ -17,19 +17,19 @@ GNOME_LIBS_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.gnome-libs?=	gnome-libs>=1.4.1.2nb1
+BUILDLINK_DEPENDS.gnome-libs?=	gnome-libs>=1.4.1.4
 DEPENDS+=	${BUILDLINK_DEPENDS.gnome-libs}:../../x11/gnome-libs
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gnome-libs=gnome-libs
 BUILDLINK_PREFIX.gnome-libs_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.gnome-libs=	include/gnome.h
-BUILDLINK_FILES.gnome-libs+=	include/gtk-xmhtml/*
-BUILDLINK_FILES.gnome-libs+=	include/libart_lgpl/*
-BUILDLINK_FILES.gnome-libs+=	include/libgnome/*
-BUILDLINK_FILES.gnome-libs+=	include/libgnomeui/*
-BUILDLINK_FILES.gnome-libs+=	include/libgnorba/*
-BUILDLINK_FILES.gnome-libs+=	include/popt-gnome.h
-BUILDLINK_FILES.gnome-libs+=	include/zvt/*
+BUILDLINK_FILES.gnome-libs=	include/gnome-1.0/gnome.h
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/gtk-xmhtml/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libart_lgpl/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libgnome/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libgnomeui/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libgnorba/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/popt-gnome.h
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/zvt/*
 BUILDLINK_FILES.gnome-libs+=	lib/gnome-libs/*/*
 BUILDLINK_FILES.gnome-libs+=	lib/libart_lgpl.*
 BUILDLINK_FILES.gnome-libs+=	lib/libgnome.*
diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo
index 20552c178b8..612c214454b 100644
--- a/x11/gnome-libs/distinfo
+++ b/x11/gnome-libs/distinfo
@@ -1,23 +1,24 @@
-$NetBSD: distinfo,v 1.8 2001/10/12 13:29:39 tron Exp $
+$NetBSD: distinfo,v 1.9 2002/03/24 19:53:41 rh Exp $
 
-SHA1 (gnome-libs-1.4.1.2.tar.gz) = 90798f5d8ba6091ddd26236f12ecdb6797233d44
-Size (gnome-libs-1.4.1.2.tar.gz) = 3748372 bytes
-SHA1 (patch-aa) = 2b71cc3127922ad28ee49c5acc648f15737d37d3
-SHA1 (patch-ac) = ab679a82e30e97d08bfbedae1487c271ac13a407
-SHA1 (patch-ad) = fff2bbe36ba7f0ed588cbaf2efc646909511ad03
-SHA1 (patch-ae) = 98fe6bb0850778702bbe0b3d0a3810d551b7d695
-SHA1 (patch-af) = c66a96dac08232fcfc0ee7f73701e877c60483a3
+SHA1 (gnome-libs-1.4.1.4.tar.gz) = 3315752f9d4e8392c5e7b902d45cc7b795cdd63a
+Size (gnome-libs-1.4.1.4.tar.gz) = 3631342 bytes
+SHA1 (patch-aa) = ed906dfe8164bacabbe4f2922eecd10125a76b26
+SHA1 (patch-ab) = 13a6c8c58a1acfb61150d13408fa260a82f49484
+SHA1 (patch-ac) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-ad) = 10e46c8965137c8c0a3acf177898ca07fb4c90fa
+SHA1 (patch-ae) = 85e0395394602628b4bec63ac0e96a31bacc9f10
+SHA1 (patch-af) = a5aea708fe8b46c421f818cab8dc033a2c224831
 SHA1 (patch-aj) = 292c4efccc9650c8244348bdcf22c3c1cbd3ebe6
-SHA1 (patch-ak) = 50db1502e90f9574b0d889cbc975b2f041c1e4f2
+SHA1 (patch-ak) = fa6f2db6faff3ca6427784b84acf5856be24af82
 SHA1 (patch-an) = 94189a17d893cc7290354ddb200bea41dffb7953
 SHA1 (patch-ao) = 31724d3e4eb9d44b6a701f4317fc5ae35c4f2f66
 SHA1 (patch-ap) = 31e535a78dfb1fe38d7a1bb0e651b9189e88bdff
 SHA1 (patch-aq) = 58ea5945277d08678988eb6598eb82c724376842
-SHA1 (patch-ar) = acfd15b6e3e1962d6dc288472328730c7d18605d
-SHA1 (patch-as) = 9d37cbf46669af688d20841d90c23e43052f22cf
-SHA1 (patch-at) = ce82e3f8090f3b00c8a8c8ac0809180d2febed70
-SHA1 (patch-au) = d694b7105570fbe8ad8ce5a5079678db2cd2fc8e
-SHA1 (patch-av) = 7dfccc25c7f764106b61f62f11f92bed0161b4b8
-SHA1 (patch-aw) = 03cf4cbeeaeb0f852c072dfb97bbd47c3d627a7c
-SHA1 (patch-ax) = 62ed2e13f8bbd6853d73b3b94bd20dc5690eeba5
-SHA1 (patch-ay) = be04dce8fdd2f553555cca428f386379c53773ad
+SHA1 (patch-ar) = 6a22a31ff7a6d3e9ab73eac6ce228885f175de0c
+SHA1 (patch-as) = 46aa8ddba11ada33f4f6b1227895a23d6cd85862
+SHA1 (patch-at) = 32fd8634ca40c9f2dc19c648404172c6e3a98be3
+SHA1 (patch-au) = 509f82d338a7d8322cf91b9dee957cd8ff21586c
+SHA1 (patch-av) = 4210f8d36ebe09d92313a8fb48a643a4c24c6550
+SHA1 (patch-aw) = 21ff2eb27a91eecc5e51a2cfe3cdcb8f97b32522
+SHA1 (patch-ax) = 522cc70136f50b3c11119ff2d147b09ba3230b60
+SHA1 (patch-ay) = 123c01aec56d688c028d93f6b2a6b8f19549c4d1
diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa
index 246dff0ba0c..147f0413f3b 100644
--- a/x11/gnome-libs/patches/patch-aa
+++ b/x11/gnome-libs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.15 2001/10/12 13:29:40 tron Exp $
+$NetBSD: patch-aa,v 1.16 2002/03/24 19:53:42 rh Exp $
 
---- configure.orig	Tue Aug 21 23:41:20 2001
-+++ configure	Fri Oct 12 15:12:57 2001
-@@ -3471,12 +3471,9 @@
+--- configure.orig	Tue Jan 22 14:35:12 2002
++++ configure
+@@ -3271,12 +3271,9 @@
  
  
  
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.15 2001/10/12 13:29:40 tron Exp $
  
  
  
-@@ -5314,6 +5311,11 @@
+@@ -5127,6 +5124,11 @@
     rm -f po/POTFILES
     sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
  	< $srcdir/po/POTFILES.in > po/POTFILES
@@ -30,25 +30,16 @@ $NetBSD: patch-aa,v 1.15 2001/10/12 13:29:40 tron Exp $
    
  # AM_GNOME_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
-@@ -5415,7 +5417,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
--  save_LDFLAGS="$LDFLAGBS"
-+  save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS `glib-config --libs gmodule`"
-   if test "$cross_compiling" = yes; then
-   ac_cv_gmodule=yes
-@@ -10116,7 +10118,7 @@
+@@ -9942,7 +9944,7 @@
  GTKXMHTML_LIBS="-lgtkxmhtml $LIBGTKXMHTML_LIBS"
  ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
  
 -GNOME_LIBDIR='-L${libdir}'
 +GNOME_LIBDIR='-L${libdir} -Wl,-R${libdir}'
- GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
+ GNOME_INCLUDEDIR='-I${includedir}/gnome-1.0 -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
  GNOME_IDLDIR='-I${datadir}/idl'
  
-@@ -10220,8 +10222,8 @@
+@@ -10046,8 +10048,8 @@
  fi
  	if test x$gnome_cv_orbit_found = xyes; then
  		
diff --git a/x11/gnome-libs/patches/patch-ab b/x11/gnome-libs/patches/patch-ab
new file mode 100644
index 00000000000..c167f517e8d
--- /dev/null
+++ b/x11/gnome-libs/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2002/03/24 19:53:43 rh Exp $
+
+--- gnome-data/Makefile.in.orig	Sun Mar 24 13:17:54 2002
++++ gnome-data/Makefile.in
+@@ -164,7 +164,7 @@
+ 	gnome-make-postscript-mimes
+ 
+ 
+-scoredir = $(localstatedir)/games
++scoredir = /var/games
+ sysconf_DATA = paper.config mime-magic
+ 
+ soundlistdir = $(sysconfdir)/sound/events
diff --git a/x11/gnome-libs/patches/patch-ac b/x11/gnome-libs/patches/patch-ac
index bfd64352d7a..e69de29bb2d 100644
--- a/x11/gnome-libs/patches/patch-ac
+++ b/x11/gnome-libs/patches/patch-ac
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2001/09/30 21:14:34 rh Exp $
-
---- gnome-data/Makefile.in.orig	Wed Aug 22 00:16:56 2001
-+++ 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
- 
- 
--scoredir = $(localstatedir)/games
-+scoredir = /var/games
- sysconf_DATA = paper.config mime-magic
- 
- soundlistdir = $(sysconfdir)/sound/events
-@@ -374,8 +374,8 @@
- 	$(SHELL) $(srcdir)/gnome-make-postscript-mimes > postscript.convert
- 
- install-data-local:
--	$(mkinstalldirs) $(DESTDIR)$(scoredir)
--	-chgrp $(GAMES_GROUP) $(DESTDIR)$(scoredir) && chmod g=rwXs $(DESTDIR)$(scoredir)
-+#	$(mkinstalldirs) $(DESTDIR)$(scoredir)
-+#	-chgrp $(GAMES_GROUP) $(DESTDIR)$(scoredir) && chmod g=rwXs $(DESTDIR)$(scoredir)
- 	$(top_builddir)/libgnome/gnome-gen-mimedb $(DESTDIR)$(sysconfdir)/mime-magic
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/x11/gnome-libs/patches/patch-ad b/x11/gnome-libs/patches/patch-ad
index 274ba5aecb1..c642c04d0eb 100644
--- a/x11/gnome-libs/patches/patch-ad
+++ b/x11/gnome-libs/patches/patch-ad
@@ -1,26 +1,26 @@
-$NetBSD: patch-ad,v 1.9 2001/06/16 20:04:51 jlam Exp $
+$NetBSD: patch-ad,v 1.10 2002/03/24 19:53:44 rh Exp $
 
---- libgnome/Makefile.in.orig	Fri Mar 16 14:47:28 2001
-+++ libgnome/Makefile.in	Sat Jun 16 08:58:22 2001
-@@ -154,7 +154,7 @@
- 
- libgnomeincludedir = $(includedir)/libgnome
- 
--INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl 	-I$(includedir) $(GLIB_CFLAGS) $(GDK_IMLIB_CFLAGS)  	$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS) 	-DGNOMELIBDIR=\""$(libdir)"\" 	-DGNOMEDATADIR=\""$(datadir)"\" 	-DGNOMEBINDIR=\""$(bindir)"\" 	-DGNOMELOCALSTATEDIR=\""$(localstatedir)"\" 	-DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" 	-DGNOMESYSCONFDIR=\""$(sysconfdir)"\" 	-DVERSION=\""$(VERSION)"\" 	-DG_LOG_DOMAIN=\"Gnome\"
-+INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl 	$(GLIB_CFLAGS) $(GDK_IMLIB_CFLAGS)  	$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS) 	-DGNOMELIBDIR=\""$(libdir)"\" 	-DGNOMEDATADIR=\""$(datadir)"\" 	-DGNOMEBINDIR=\""$(bindir)"\" 	-DGNOMELOCALSTATEDIR=\""$(localstatedir)"\" 	-DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" 	-DGNOMESYSCONFDIR=\""$(sysconfdir)"\" 	-DVERSION=\""$(VERSION)"\" 	-DG_LOG_DOMAIN=\"Gnome\"
- 
- 
- libgnome_la_SOURCES =  	gnome-config.c			gnome-dentry.c          	gnome-exec.c			gnome-fileconvert.c		gnome-help.c			gnome-history.c			gnome-i18n.c			gnome-magic.c			gnome-metadata.c		gnome-mime.c			gnome-mime-info.c		gnome-popt.c			gnome-regex.c			gnome-remote.c			gnome-score.c			gnome-sound.c			gnome-triggers.c		gnome-url.c			gnome-util.c			gnome-paper.c			gnomelib-init.c
-@@ -233,7 +233,7 @@
+--- libgnome/Makefile.in.orig	Fri Jan 25 09:58:07 2002
++++ libgnome/Makefile.in
+@@ -156,7 +156,7 @@
+ 
+ INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) \
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl \
+-	-I$(includedir) $(GLIB_CFLAGS) $(GDK_IMLIB_CFLAGS)  \
++	$(GLIB_CFLAGS) $(GDK_IMLIB_CFLAGS)  \
+ 	$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS) \
+ 	-DGNOMELIBDIR=\""$(libdir)"\" \
+ 	-DGNOMEDATADIR=\""$(datadir)"\" \
+@@ -303,7 +303,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 @@
+ man1dir = $(mandir)/man1
+ MANS = $(man_MANS)
+@@ -396,7 +396,7 @@
  maintainer-clean-libtool:
  
  libgnome.la: $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES)
diff --git a/x11/gnome-libs/patches/patch-ae b/x11/gnome-libs/patches/patch-ae
index 73d6b462261..1b23b304c9d 100644
--- a/x11/gnome-libs/patches/patch-ae
+++ b/x11/gnome-libs/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.5 2000/10/17 23:57:45 jlam Exp $
+$NetBSD: patch-ae,v 1.6 2002/03/24 19:53:45 rh Exp $
 
---- devel-docs/Makefile.in.orig	Thu Oct 12 23:04:00 2000
+--- devel-docs/Makefile.in.orig	Fri Jan 25 09:58:24 2002
 +++ devel-docs/Makefile.in
-@@ -156,7 +156,7 @@
- EXTRA_DIST =  	TODO.sgml				gnome-doc-framework.txt			$(TEXT_FILES)
+@@ -169,7 +169,7 @@
+ 	$(TEXT_FILES)
  
  
 -docdir = $(prefix)/doc
diff --git a/x11/gnome-libs/patches/patch-af b/x11/gnome-libs/patches/patch-af
index fa849922314..d54a7bb060b 100644
--- a/x11/gnome-libs/patches/patch-af
+++ b/x11/gnome-libs/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.2 2000/10/17 23:57:45 jlam Exp $
+$NetBSD: patch-af,v 1.3 2002/03/24 19:53:45 rh Exp $
 
---- tools/gnome-doc/Makefile.in.orig	Thu Oct 12 23:03:18 2000
+--- tools/gnome-doc/Makefile.in.orig	Fri Jan 25 09:58:04 2002
 +++ tools/gnome-doc/Makefile.in
-@@ -146,7 +146,7 @@
+@@ -148,7 +148,7 @@
  
- EXTRA_DIST = gnome-doc.el gnome-doc mkstub
+ EXTRA_DIST = gnome-doc.el gnome-doc mkstub $(man_MANS)
  
 -docdir = $(datadir)/doc
 +docdir = $(datadir)/doc/gnome-libs
diff --git a/x11/gnome-libs/patches/patch-ak b/x11/gnome-libs/patches/patch-ak
index ad49660762c..32dacd20393 100644
--- a/x11/gnome-libs/patches/patch-ak
+++ b/x11/gnome-libs/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.1 1999/05/01 15:10:42 tron Exp $
+$NetBSD: patch-ak,v 1.2 2002/03/24 19:53:45 rh Exp $
 
---- libart_lgpl/libart-config.in.orig	Thu Nov 19 19:56:20 1998
-+++ libart_lgpl/libart-config.in	Sat May  1 16:53:22 1999
-@@ -45,7 +45,7 @@
-       echo $includes
-       ;;
-     --libs)
--      libdirs=-L@libdir@
-+      libdirs="-L@libdir@ -Wl,-R@libdir@"
-       echo $libdirs -lart_lgpl -lm
-       ;;
-     *)
+--- libart_lgpl/configure.orig	Tue Jan 22 14:35:13 2002
++++ libart_lgpl/configure
+@@ -1625,7 +1625,7 @@
+   fi
+ fi
+ 
+-LIBART_LIBDIR='-L${libdir}'
++LIBART_LIBDIR='-L${libdir} -Wl,-R${libdir}'
+ LIBART_INCLUDEDIR='-I${includedir}/gnome-1.0'
+ LIBART_LIBS='-lart_lgpl -lm'
+ 
diff --git a/x11/gnome-libs/patches/patch-ar b/x11/gnome-libs/patches/patch-ar
index a7b37f12971..9850130fc93 100644
--- a/x11/gnome-libs/patches/patch-ar
+++ b/x11/gnome-libs/patches/patch-ar
@@ -1,13 +1,13 @@
-$NetBSD: patch-ar,v 1.4 2001/06/16 20:04:51 jlam Exp $
+$NetBSD: patch-ar,v 1.5 2002/03/24 19:53:46 rh Exp $
 
---- gtk-xmhtml/Makefile.in.orig	Fri Mar 16 14:47:33 2001
-+++ gtk-xmhtml/Makefile.in	Sat Jun 16 09:00:26 2001
+--- gtk-xmhtml/Makefile.in.orig	Fri Jan 25 09:58:13 2002
++++ gtk-xmhtml/Makefile.in
 @@ -146,7 +146,7 @@
  
- libgtkxmhtmlincludedir = $(includedir)/gtk-xmhtml
+ libgtkxmhtmlincludedir = $(includedir)/gnome-1.0/gtk-xmhtml
  
--INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) @GTK_CFLAGS@            -DWITH_GTK -DDEBUG -DGNOME_LIB
-+INCLUDES = -I.. -I$(srcdir)/.. @GTK_CFLAGS@            -DWITH_GTK -DDEBUG -DGNOME_LIB
+-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) @GTK_CFLAGS@ \
++INCLUDES = -I.. -I$(srcdir)/.. @GTK_CFLAGS@ \
+            -DWITH_GTK -DDEBUG -DGNOME_LIB
  
  
- lib_LTLIBRARIES = libgtkxmhtml.la
diff --git a/x11/gnome-libs/patches/patch-as b/x11/gnome-libs/patches/patch-as
index 8116822d84e..011890fe247 100644
--- a/x11/gnome-libs/patches/patch-as
+++ b/x11/gnome-libs/patches/patch-as
@@ -1,13 +1,13 @@
-$NetBSD: patch-as,v 1.1 2001/06/16 20:04:51 jlam Exp $
+$NetBSD: patch-as,v 1.2 2002/03/24 19:53:46 rh Exp $
 
---- libgnomeui/Makefile.in.orig	Fri Mar 16 14:47:30 2001
-+++ libgnomeui/Makefile.in	Sat Jun 16 09:01:07 2001
-@@ -158,7 +158,7 @@
- #
- libgnomeuiincludedir = $(includedir)/libgnomeui
+--- libgnomeui/Makefile.in.orig	Fri Jan 25 09:58:10 2002
++++ libgnomeui/Makefile.in
+@@ -160,7 +160,7 @@
  
--INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl 	-I$(includedir) $(GDK_IMLIB_CFLAGS) 	$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS)         -DGNOMELIBDIR=\""$(libdir)"\"         -DGNOMEDATADIR=\""$(datadir)"\"         -DGNOMEBINDIR=\""$(bindir)"\"         -DGNOMELOCALSTATEDIR=\""$(localstatedir)"\"         -DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" 	-DG_LOG_DOMAIN=\"GnomeUI\"
-+INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl 	$(GDK_IMLIB_CFLAGS) 	$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS)         -DGNOMELIBDIR=\""$(libdir)"\"         -DGNOMEDATADIR=\""$(datadir)"\"         -DGNOMEBINDIR=\""$(bindir)"\"         -DGNOMELOCALSTATEDIR=\""$(localstatedir)"\"         -DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" 	-DG_LOG_DOMAIN=\"GnomeUI\"
- 
- 
- EXTRA_HEADERS = 
+ INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) \
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl \
+-	-I$(includedir) $(GDK_IMLIB_CFLAGS) \
++	$(GDK_IMLIB_CFLAGS) \
+ 	$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS) \
+         -DGNOMELIBDIR=\""$(libdir)"\" \
+         -DGNOMEDATADIR=\""$(datadir)"\" \
diff --git a/x11/gnome-libs/patches/patch-at b/x11/gnome-libs/patches/patch-at
index 697cbaeaffa..6848cfd2bb3 100644
--- a/x11/gnome-libs/patches/patch-at
+++ b/x11/gnome-libs/patches/patch-at
@@ -1,13 +1,12 @@
-$NetBSD: patch-at,v 1.1 2001/06/16 20:04:51 jlam Exp $
+$NetBSD: patch-at,v 1.2 2002/03/24 19:53:47 rh Exp $
 
---- libgnorba/Makefile.in.orig	Fri Mar 16 14:47:35 2001
-+++ libgnorba/Makefile.in	Sat Jun 16 09:02:25 2001
-@@ -153,7 +153,7 @@
- 
- EXTRA_DIST = yes.xpm no.xpm
- 
--INCLUDES =  	-I.. 							-I$(srcdir)/..						$(SUPPORTINCS) 						-I$(includedir) 				        $(GNOME_INCLUDES)  					$(ORBIT_CFLAGS) 					$(GLIB_INCLUDES) 					$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS) 			$(GDK_IMLIB_CFLAGS)					-DGNOMEBINDIR=$(bindir) 				-DGNOMESYSCONFDIR=\"$(sysconfdir)\" 			-DVERSION=\""$(VERSION)"\"
-+INCLUDES =  	-I.. 							-I$(srcdir)/..						$(SUPPORTINCS) 						$(GNOME_INCLUDES)  					$(ORBIT_CFLAGS) 					$(GLIB_INCLUDES) 					$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS) 			$(GDK_IMLIB_CFLAGS)					-DGNOMEBINDIR=$(bindir) 				-DGNOMESYSCONFDIR=\"$(sysconfdir)\" 			-DVERSION=\""$(VERSION)"\"
- 
- 
- gnome_factory_built =  	gnome-factory.h 					gnome-factory-skels.c 					gnome-factory-stubs.c 					gnome-factory-common.c
+--- libgnorba/Makefile.in.orig	Fri Jan 25 09:58:19 2002
++++ libgnorba/Makefile.in
+@@ -163,7 +163,6 @@
+ 	-I.. 						\
+ 	-I$(srcdir)/..					\
+ 	$(SUPPORTINCS) 					\
+-	-I$(includedir) 				\
+         $(GNOME_INCLUDES)  				\
+ 	$(ORBIT_CFLAGS) 				\
+ 	$(GLIB_INCLUDES) 				\
diff --git a/x11/gnome-libs/patches/patch-au b/x11/gnome-libs/patches/patch-au
index d44e5785de7..8e99b729245 100644
--- a/x11/gnome-libs/patches/patch-au
+++ b/x11/gnome-libs/patches/patch-au
@@ -1,13 +1,13 @@
-$NetBSD: patch-au,v 1.1 2001/06/16 20:04:51 jlam Exp $
+$NetBSD: patch-au,v 1.2 2002/03/24 19:53:47 rh Exp $
 
---- test-gnome/Makefile.in.orig	Fri Mar 16 14:47:36 2001
-+++ test-gnome/Makefile.in	Sat Jun 16 09:03:03 2001
-@@ -144,7 +144,7 @@
- l = @l@
- need_gnome_support = @need_gnome_support@
+--- test-gnome/Makefile.in.orig	Fri Jan 25 09:58:22 2002
++++ test-gnome/Makefile.in
+@@ -146,7 +146,7 @@
  
--INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl 	-I$(includedir) $(GDK_IMLIB_CFLAGS) 	-DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" 	-DLOCALEDIR=\""$(gnomelocaledir)"\"
-+INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl 	$(GDK_IMLIB_CFLAGS) 	-DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" 	-DLOCALEDIR=\""$(gnomelocaledir)"\"
+ INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) \
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl \
+-	-I$(includedir) $(GDK_IMLIB_CFLAGS) \
++	$(GDK_IMLIB_CFLAGS) \
+ 	-DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" \
+ 	-DLOCALEDIR=\""$(gnomelocaledir)"\"
  
- 
- noinst_PROGRAMS = test-gnome
diff --git a/x11/gnome-libs/patches/patch-av b/x11/gnome-libs/patches/patch-av
index 4e0acda2eb7..45263f3ca08 100644
--- a/x11/gnome-libs/patches/patch-av
+++ b/x11/gnome-libs/patches/patch-av
@@ -1,13 +1,12 @@
-$NetBSD: patch-av,v 1.1 2001/06/16 20:04:52 jlam Exp $
+$NetBSD: patch-av,v 1.2 2002/03/24 19:53:48 rh Exp $
 
---- test-suite/tests/Makefile.in.orig	Fri Mar 16 14:47:37 2001
-+++ test-suite/tests/Makefile.in	Sat Jun 16 09:29:35 2001
-@@ -146,7 +146,7 @@
+--- test-suite/tests/Makefile.in.orig	Fri Jan 25 09:58:24 2002
++++ test-suite/tests/Makefile.in
+@@ -150,7 +150,6 @@
+ 	-I$(top_builddir) -I$(top_srcdir)	\
+ 	$(SUPPORTINCS)				\
+ 	$(GDK_IMLIB_CFLAGS)			\
+-	-I$(includedir)				\
+ 	@GTK_CFLAGS@
  
- noinst_PROGRAMS = fileconvert metadata parse-path skel split trigs
  
--INCLUDES =  	-I$(top_builddir) -I$(top_srcdir)		$(SUPPORTINCS)					$(GDK_IMLIB_CFLAGS)				-I$(includedir)					@GTK_CFLAGS@
-+INCLUDES =  	-I$(top_builddir) -I$(top_srcdir)		$(SUPPORTINCS)					$(GDK_IMLIB_CFLAGS)				@GTK_CFLAGS@
- 
- 
- LDADD = $(top_builddir)/libgnomeui/libgnomeui.la		$(top_builddir)/libgnome/libgnome.la			$(top_builddir)/libart_lgpl/libart_lgpl.la		@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) $(INTLLIBS)
diff --git a/x11/gnome-libs/patches/patch-aw b/x11/gnome-libs/patches/patch-aw
index 0da22d2dba5..68f4943c046 100644
--- a/x11/gnome-libs/patches/patch-aw
+++ b/x11/gnome-libs/patches/patch-aw
@@ -1,13 +1,13 @@
-$NetBSD: patch-aw,v 1.1 2001/06/16 20:04:52 jlam Exp $
+$NetBSD: patch-aw,v 1.2 2002/03/24 19:53:48 rh Exp $
 
---- tools/convertrgb/Makefile.in.orig	Fri Mar 16 14:47:25 2001
-+++ tools/convertrgb/Makefile.in	Sat Jun 16 08:55:45 2001
-@@ -144,7 +144,7 @@
- l = @l@
+--- tools/convertrgb/Makefile.in.orig	Fri Jan 25 09:58:03 2002
++++ tools/convertrgb/Makefile.in
+@@ -145,7 +145,7 @@
  need_gnome_support = @need_gnome_support@
  
--INCLUDES =          -I$(includedir) @GLIB_CFLAGS@
-+INCLUDES =          @GLIB_CFLAGS@
+ INCLUDES = \
+-        -I$(includedir) @GLIB_CFLAGS@
++        @GLIB_CFLAGS@
  
  
  noinst_PROGRAMS = convertrgb
diff --git a/x11/gnome-libs/patches/patch-ax b/x11/gnome-libs/patches/patch-ax
index 00364e58d4f..8be46b3d209 100644
--- a/x11/gnome-libs/patches/patch-ax
+++ b/x11/gnome-libs/patches/patch-ax
@@ -1,17 +1,17 @@
-$NetBSD: patch-ax,v 1.2 2001/09/22 03:39:02 jlam Exp $
+$NetBSD: patch-ax,v 1.3 2002/03/24 19:53:48 rh Exp $
 
---- zvt/Makefile.in.orig	Fri Mar 16 14:47:34 2001
+--- zvt/Makefile.in.orig	Fri Jan 25 09:58:16 2002
 +++ zvt/Makefile.in
-@@ -150,7 +150,7 @@
+@@ -152,7 +152,7 @@
  
- libzvtincludedir = $(includedir)/zvt
+ INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS)		\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+-	-I$(includedir) $(GTK_CFLAGS)  			\
++	$(GTK_CFLAGS) 		 			\
+ 	$(GDK_IMLIB_CFLAGS)				\
+ 	-DGNOMESBINDIR=\""$(sbindir)"\"
  
--INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS)			-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(includedir) $(GTK_CFLAGS)  				$(GDK_IMLIB_CFLAGS)					-DGNOMESBINDIR=\""$(sbindir)"\"
-+INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS)			-I$(top_srcdir)/intl -I$(top_builddir)/intl		$(GTK_CFLAGS)  				$(GDK_IMLIB_CFLAGS)					-DGNOMESBINDIR=\""$(sbindir)"\"
- 
- 
- libzvt_la_SOURCES =  	gnome-login-support.h		gnome-login-support.c		lists.c				subshell.h			subshell.c			subshell-includes.h		update.c			vt.c				zvtterm.c
-@@ -524,7 +524,7 @@
+@@ -595,7 +595,7 @@
  
  install-exec-local:
  	-file=$(DESTDIR)$(sbindir)/gnome-pty-helper; \
diff --git a/x11/gnome-libs/patches/patch-ay b/x11/gnome-libs/patches/patch-ay
index edd7b93f908..402e84d819e 100644
--- a/x11/gnome-libs/patches/patch-ay
+++ b/x11/gnome-libs/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.1 2001/09/24 23:47:37 danw Exp $
+$NetBSD: patch-ay,v 1.2 2002/03/24 19:53:49 rh Exp $
 
---- libgnome/gnome-url.c.orig	Fri Mar 16 14:44:42 2001
-+++ libgnome/gnome-url.c	Mon Sep 24 18:36:21 2001
-@@ -72,6 +72,8 @@
+--- libgnome/gnome-url.c.orig	Fri Jan 11 08:03:17 2002
++++ libgnome/gnome-url.c
+@@ -80,6 +80,8 @@
  	return default_handler;
  }
  
@@ -11,27 +11,32 @@ $NetBSD: patch-ay,v 1.1 2001/09/24 23:47:37 danw Exp $
  /**
   * gnome_url_show
   * @url: URL to show
-@@ -97,11 +99,9 @@
+@@ -105,11 +107,11 @@
  void
  gnome_url_show(const gchar *url)
  {
 -	gint i;
  	gchar *pos, *template;
  	gboolean free_template = FALSE;
--	int argc;
+ 	int argc;
 -       	char **argv;
++	char **argv;
 +	int status;
  	
  	g_return_if_fail (url != NULL);
  	pos = strchr (url, ':');
-@@ -127,12 +127,26 @@
- 	} else /* no : ? -- this shouldn't happen.  Use default handler */
- 		template = gnome_url_default_handler ();
+@@ -140,9 +142,23 @@
+ 	if(poptParseArgvString(template, &argc, &argv) != 0) {
+ 		/* can't parse */
+ 		g_warning("Parse error of '%s'", template);
+-		return;
++		status = gnome_url_show_with_handler (url, template);
++		if (status == -1 && free_template)
++			gnome_url_show_with_handler (url, gnome_url_default_handler (NULL));
++	} else {
++		gnome_url_show_with_handler (url, template);
+ 	}
  
-+	status = gnome_url_show_with_handler (url, template);
-+	if (status == -1 && free_template)
-+		gnome_url_show_with_handler (url, gnome_url_default_handler ());
-+
 +	if (free_template)
 +		g_free (template);
 +}
@@ -42,17 +47,10 @@ $NetBSD: patch-ay,v 1.1 2001/09/24 23:47:37 danw Exp $
 +	int argc, i, status;
 +	char **argv;
 +
- 	/* we use a popt function as it does exactly what we want to do and
- 	   gnome already uses popt */
- 	if(poptParseArgvString(template, &argc, &argv) != 0) {
- 		/* can't parse */
- 		g_warning("Parse error of '%s'", template);
--		return;
-+		return -1;
- 	}
- 
  	/* we can just replace the entry in the array since the
-@@ -146,13 +160,12 @@
+ 	 * array is all in one buffer, we won't leak */
+ 	for(i = 0; i < argc; i++) {
+@@ -154,13 +170,12 @@
  
  	/* use execute async, and not the shell, shell is evil and a
  	 * security hole */