update to 1.99.10

Lots of changes/fixes, please see NEWS for details.
Also update the descriptions since there is now Helix Code any more.

8 files changed, 287 insertions, 448 deletions

diff --git a/devel/gal2/DESCR b/devel/gal2/DESCR
index 0aed17f5442..7fb65616878 100644
--- a/devel/gal2/DESCR
+++ b/devel/gal2/DESCR
@@ -1,18 +1,6 @@
-This is the G App Lib (GAL).
-
-This module contains some library functions that came from Gnumeric
-and Evolution.  The idea is to reuse those widgets across various
-larger GNOME applications that might want to use these widgets.
-
-Please notice that these widgets are currently licensed under the
-terms of the GNU GPL (with the exception of the gtk-combo-box which is
-under the LGPL).  If you want to contribute code to the official
-distirbution of this code you have to sign a copyright assignment to
-Helix Code.  This would allow Helix Code in the future to redistribute
-the code it fully owns under a difference license.
-
-The API is not frozen and might change at any time.  Larger class
-renaming might happen at any point without notice.  Use this library
-at your own risk.
-
-This version builds with gtk+2 and gnome2
+This module contains some library functions that came from Gnumeric and
+Evolution.  The idea is to reuse the code across various larger GNOME
+applications that might want to use it.  The API is not frozen and might
+change at any time.  Larger class renaming might happen at any point without
+notice.
+Use this library at your own risk.
diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile
index 396a14b1972..adfe6434258 100644
--- a/devel/gal2/Makefile
+++ b/devel/gal2/Makefile
@@ -1,34 +1,29 @@
-# $NetBSD: Makefile,v 1.11 2003/12/04 19:48:24 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2003/12/06 17:50:02 recht Exp $
 #
 
-DISTNAME=		gal2-0-0.0.7
-PKGNAME=		${DISTNAME:S/-0-/-/}
-PKGREVISION=		6
-CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gal2-0/0.0/}
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	gal-1.99.10
+PKGNAME=	${DISTNAME:S/gal/gal2/}
+CATEGORIES=	devel gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gal/1.99/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.gnome.org/
-COMMENT=		GNOME2 Application Libraries
+MAINTAINER=	recht@NetBSD.org
+HOMEPAGE=	http://www.gnome.org/
+COMMENT=	Library functions that came from Gnumeric and Evolution
 
-BUILD_USES_MSGFMT=	YES
-
-GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
-USE_PKGLOCALEDIR=	YES
-USE_GMAKE=		YES
-USE_X11=		YES
-USE_LIBTOOL=		YES
+USE_X11=		yes
+USE_GMAKE=		yes
+USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
+BUILD_USES_MSGFMT=	yes
+USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-PKGCONFIG_OVERRIDE=	${WRKSRC}/gal-2.0.pc.in
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/gal2/html
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/gal-2.0.pc.in
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--enable-gtk-doc=no
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
-.include "../../graphics/libgnomecanvas/buildlink2.mk"
-.include "../../print/libgnomeprintui/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../textproc/gtk-doc/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/libglade2/buildlink2.mk"
+.include "../../print/libgnomeprintui/buildlink2.mk"
+.include "../../textproc/intltool/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gal2/PLIST b/devel/gal2/PLIST
index 6da3e54a98a..343cbcb121a 100644
--- a/devel/gal2/PLIST
+++ b/devel/gal2/PLIST
@@ -1,194 +1,244 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/02 05:45:30 rh Exp $
-include/gal-2-0/gal/e-paned/e-hpaned.h
-include/gal-2-0/gal/e-paned/e-paned.h
-include/gal-2-0/gal/e-paned/e-vpaned.h
-include/gal-2-0/gal/e-table/e-cell-checkbox.h
-include/gal-2-0/gal/e-table/e-cell-combo.h
-include/gal-2-0/gal/e-table/e-cell-date.h
-include/gal-2-0/gal/e-table/e-cell-float.h
-include/gal-2-0/gal/e-table/e-cell-number.h
-include/gal-2-0/gal/e-table/e-cell-pixbuf.h
-include/gal-2-0/gal/e-table/e-cell-popup.h
-include/gal-2-0/gal/e-table/e-cell-progress.h
-include/gal-2-0/gal/e-table/e-cell-size.h
-include/gal-2-0/gal/e-table/e-cell-spin-button.h
-include/gal-2-0/gal/e-table/e-cell-text.h
-include/gal-2-0/gal/e-table/e-cell-toggle.h
-include/gal-2-0/gal/e-table/e-cell-tree.h
-include/gal-2-0/gal/e-table/e-cell-vbox.h
-include/gal-2-0/gal/e-table/e-cell.h
-include/gal-2-0/gal/e-table/e-table-click-to-add.h
-include/gal-2-0/gal/e-table/e-table-col-dnd.h
-include/gal-2-0/gal/e-table/e-table-col.h
-include/gal-2-0/gal/e-table/e-table-column-specification.h
-include/gal-2-0/gal/e-table/e-table-config.h
-include/gal-2-0/gal/e-table/e-table-defines.h
-include/gal-2-0/gal/e-table/e-table-extras.h
-include/gal-2-0/gal/e-table/e-table-field-chooser-dialog.h
-include/gal-2-0/gal/e-table/e-table-field-chooser-item.h
-include/gal-2-0/gal/e-table/e-table-field-chooser.h
-include/gal-2-0/gal/e-table/e-table-group-container.h
-include/gal-2-0/gal/e-table/e-table-group-leaf.h
-include/gal-2-0/gal/e-table/e-table-group.h
-include/gal-2-0/gal/e-table/e-table-header-item.h
-include/gal-2-0/gal/e-table/e-table-header-utils.h
-include/gal-2-0/gal/e-table/e-table-header.h
-include/gal-2-0/gal/e-table/e-table-item.h
-include/gal-2-0/gal/e-table/e-table-memory-callbacks.h
-include/gal-2-0/gal/e-table/e-table-memory-store.h
-include/gal-2-0/gal/e-table/e-table-memory.h
-include/gal-2-0/gal/e-table/e-table-model.h
-include/gal-2-0/gal/e-table/e-table-one.h
-include/gal-2-0/gal/e-table/e-table-scrolled.h
-include/gal-2-0/gal/e-table/e-table-search.h
-include/gal-2-0/gal/e-table/e-table-selection-model.h
-include/gal-2-0/gal/e-table/e-table-simple.h
-include/gal-2-0/gal/e-table/e-table-sort-info.h
-include/gal-2-0/gal/e-table/e-table-sorted-variable.h
-include/gal-2-0/gal/e-table/e-table-sorted.h
-include/gal-2-0/gal/e-table/e-table-sorter.h
-include/gal-2-0/gal/e-table/e-table-sorting-utils.h
-include/gal-2-0/gal/e-table/e-table-specification.h
-include/gal-2-0/gal/e-table/e-table-state.h
-include/gal-2-0/gal/e-table/e-table-subset-variable.h
-include/gal-2-0/gal/e-table/e-table-subset.h
-include/gal-2-0/gal/e-table/e-table-tooltip.h
-include/gal-2-0/gal/e-table/e-table-utils.h
-include/gal-2-0/gal/e-table/e-table-without.h
-include/gal-2-0/gal/e-table/e-table.h
-include/gal-2-0/gal/e-table/e-tree-memory-callbacks.h
-include/gal-2-0/gal/e-table/e-tree-memory.h
-include/gal-2-0/gal/e-table/e-tree-model.h
-include/gal-2-0/gal/e-table/e-tree-scrolled.h
-include/gal-2-0/gal/e-table/e-tree-selection-model.h
-include/gal-2-0/gal/e-table/e-tree-sorted.h
-include/gal-2-0/gal/e-table/e-tree-table-adapter.h
-include/gal-2-0/gal/e-table/e-tree.h
-include/gal-2-0/gal/e-text/e-completion-match.h
-include/gal-2-0/gal/e-text/e-completion-view.h
-include/gal-2-0/gal/e-text/e-completion.h
-include/gal-2-0/gal/e-text/e-entry.h
-include/gal-2-0/gal/e-text/e-table-text-model.h
-include/gal-2-0/gal/e-text/e-text-model-repos.h
-include/gal-2-0/gal/e-text/e-text-model-uri.h
-include/gal-2-0/gal/e-text/e-text-model.h
-include/gal-2-0/gal/e-text/e-text.h
-include/gal-2-0/gal/menus/gal-define-views-dialog.h
-include/gal-2-0/gal/menus/gal-define-views-model.h
-include/gal-2-0/gal/menus/gal-view-collection.h
-include/gal-2-0/gal/menus/gal-view-etable.h
-include/gal-2-0/gal/menus/gal-view-factory-etable.h
-include/gal-2-0/gal/menus/gal-view-factory.h
-include/gal-2-0/gal/menus/gal-view-instance-save-as-dialog.h
-include/gal-2-0/gal/menus/gal-view-instance.h
-include/gal-2-0/gal/menus/gal-view-new-dialog.h
-include/gal-2-0/gal/menus/gal-view.h
-include/gal-2-0/gal/shortcut-bar/e-group-bar.h
-include/gal-2-0/gal/shortcut-bar/e-icon-bar-bg-item.h
-include/gal-2-0/gal/shortcut-bar/e-icon-bar.h
-include/gal-2-0/gal/shortcut-bar/e-shortcut-bar.h
-include/gal-2-0/gal/shortcut-bar/e-shortcut-model.h
-include/gal-2-0/gal/shortcut-bar/e-vscrolled-bar.h
-include/gal-2-0/gal/util/e-bit-array.h
-include/gal-2-0/gal/util/e-cache.h
-include/gal-2-0/gal/util/e-marshal.h
-include/gal-2-0/gal/util/e-sorter-array.h
-include/gal-2-0/gal/util/e-sorter.h
-include/gal-2-0/gal/util/e-text-event-processor-emacs-like.h
-include/gal-2-0/gal/util/e-text-event-processor-types.h
-include/gal-2-0/gal/util/e-text-event-processor.h
-include/gal-2-0/gal/util/e-util.h
-include/gal-2-0/gal/util/e-xml-utils.h
-include/gal-2-0/gal/widgets/color-group.h
-include/gal-2-0/gal/widgets/color-palette.h
-include/gal-2-0/gal/widgets/e-canvas-background.h
-include/gal-2-0/gal/widgets/e-canvas-utils.h
-include/gal-2-0/gal/widgets/e-canvas-vbox.h
-include/gal-2-0/gal/widgets/e-canvas.h
-include/gal-2-0/gal/widgets/e-categories-master-list-array.h
-include/gal-2-0/gal/widgets/e-categories-master-list-combo.h
-include/gal-2-0/gal/widgets/e-categories-master-list-dialog-model.h
-include/gal-2-0/gal/widgets/e-categories-master-list-dialog.h
-include/gal-2-0/gal/widgets/e-categories-master-list-option-menu.h
-include/gal-2-0/gal/widgets/e-categories-master-list.h
-include/gal-2-0/gal/widgets/e-categories.h
-include/gal-2-0/gal/widgets/e-colors.h
-include/gal-2-0/gal/widgets/e-cursors.h
-include/gal-2-0/gal/widgets/e-file-selection.h
-include/gal-2-0/gal/widgets/e-font.h
-include/gal-2-0/gal/widgets/e-gui-utils.h
-include/gal-2-0/gal/widgets/e-hscrollbar.h
-include/gal-2-0/gal/widgets/e-hsv-utils.h
-include/gal-2-0/gal/widgets/e-option-menu.h
-include/gal-2-0/gal/widgets/e-popup-menu.h
-include/gal-2-0/gal/widgets/e-printable.h
-include/gal-2-0/gal/widgets/e-reflow-model.h
-include/gal-2-0/gal/widgets/e-reflow.h
-include/gal-2-0/gal/widgets/e-scroll-frame.h
-include/gal-2-0/gal/widgets/e-selection-model-array.h
-include/gal-2-0/gal/widgets/e-selection-model-simple.h
-include/gal-2-0/gal/widgets/e-selection-model.h
-include/gal-2-0/gal/widgets/e-unicode.h
-include/gal-2-0/gal/widgets/e-vscrollbar.h
-include/gal-2-0/gal/widgets/gtk-combo-box.h
-include/gal-2-0/gal/widgets/gtk-combo-stack.h
-include/gal-2-0/gal/widgets/gtk-combo-text.h
-include/gal-2-0/gal/widgets/widget-color-combo.h
-include/gal-2-0/gal/widgets/widget-pixmap-combo.h
-lib/libgal-2-0.a
-lib/libgal-2-0.la
-lib/libgal-2-0.so
-lib/libgal-2-0.so.2
-lib/libgal-2-0.so.2.0
+@comment $NetBSD: PLIST,v 1.2 2003/12/06 17:50:02 recht Exp $
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell-registry.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell-text.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table-factory.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table-item.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table.h
+include/gal-2.0/gal/a11y/e-text/gal-a11y-e-text-factory.h
+include/gal-2.0/gal/a11y/e-text/gal-a11y-e-text.h
+include/gal-2.0/gal/a11y/gal-a11y-factory.h
+include/gal-2.0/gal/a11y/gal-a11y-util.h
+include/gal-2.0/gal/e-table/e-cell-checkbox.h
+include/gal-2.0/gal/e-table/e-cell-combo.h
+include/gal-2.0/gal/e-table/e-cell-date.h
+include/gal-2.0/gal/e-table/e-cell-float.h
+include/gal-2.0/gal/e-table/e-cell-number.h
+include/gal-2.0/gal/e-table/e-cell-pixbuf.h
+include/gal-2.0/gal/e-table/e-cell-popup.h
+include/gal-2.0/gal/e-table/e-cell-progress.h
+include/gal-2.0/gal/e-table/e-cell-size.h
+include/gal-2.0/gal/e-table/e-cell-spin-button.h
+include/gal-2.0/gal/e-table/e-cell-text.h
+include/gal-2.0/gal/e-table/e-cell-toggle.h
+include/gal-2.0/gal/e-table/e-cell-tree.h
+include/gal-2.0/gal/e-table/e-cell-vbox.h
+include/gal-2.0/gal/e-table/e-cell.h
+include/gal-2.0/gal/e-table/e-table-click-to-add.h
+include/gal-2.0/gal/e-table/e-table-col-dnd.h
+include/gal-2.0/gal/e-table/e-table-col.h
+include/gal-2.0/gal/e-table/e-table-column-specification.h
+include/gal-2.0/gal/e-table/e-table-config.h
+include/gal-2.0/gal/e-table/e-table-defines.h
+include/gal-2.0/gal/e-table/e-table-extras.h
+include/gal-2.0/gal/e-table/e-table-field-chooser-dialog.h
+include/gal-2.0/gal/e-table/e-table-field-chooser-item.h
+include/gal-2.0/gal/e-table/e-table-field-chooser.h
+include/gal-2.0/gal/e-table/e-table-group-container.h
+include/gal-2.0/gal/e-table/e-table-group-leaf.h
+include/gal-2.0/gal/e-table/e-table-group.h
+include/gal-2.0/gal/e-table/e-table-header-item.h
+include/gal-2.0/gal/e-table/e-table-header-utils.h
+include/gal-2.0/gal/e-table/e-table-header.h
+include/gal-2.0/gal/e-table/e-table-item.h
+include/gal-2.0/gal/e-table/e-table-memory-callbacks.h
+include/gal-2.0/gal/e-table/e-table-memory-store.h
+include/gal-2.0/gal/e-table/e-table-memory.h
+include/gal-2.0/gal/e-table/e-table-model.h
+include/gal-2.0/gal/e-table/e-table-one.h
+include/gal-2.0/gal/e-table/e-table-scrolled.h
+include/gal-2.0/gal/e-table/e-table-search.h
+include/gal-2.0/gal/e-table/e-table-selection-model.h
+include/gal-2.0/gal/e-table/e-table-simple.h
+include/gal-2.0/gal/e-table/e-table-sort-info.h
+include/gal-2.0/gal/e-table/e-table-sorted-variable.h
+include/gal-2.0/gal/e-table/e-table-sorted.h
+include/gal-2.0/gal/e-table/e-table-sorter.h
+include/gal-2.0/gal/e-table/e-table-sorting-utils.h
+include/gal-2.0/gal/e-table/e-table-specification.h
+include/gal-2.0/gal/e-table/e-table-state.h
+include/gal-2.0/gal/e-table/e-table-subset-variable.h
+include/gal-2.0/gal/e-table/e-table-subset.h
+include/gal-2.0/gal/e-table/e-table-tooltip.h
+include/gal-2.0/gal/e-table/e-table-utils.h
+include/gal-2.0/gal/e-table/e-table-without.h
+include/gal-2.0/gal/e-table/e-table.h
+include/gal-2.0/gal/e-table/e-tree-memory-callbacks.h
+include/gal-2.0/gal/e-table/e-tree-memory.h
+include/gal-2.0/gal/e-table/e-tree-model.h
+include/gal-2.0/gal/e-table/e-tree-scrolled.h
+include/gal-2.0/gal/e-table/e-tree-selection-model.h
+include/gal-2.0/gal/e-table/e-tree-sorted.h
+include/gal-2.0/gal/e-table/e-tree-table-adapter.h
+include/gal-2.0/gal/e-table/e-tree.h
+include/gal-2.0/gal/e-text/e-completion-callbacks.h
+include/gal-2.0/gal/e-text/e-completion-match.h
+include/gal-2.0/gal/e-text/e-completion-view.h
+include/gal-2.0/gal/e-text/e-completion.h
+include/gal-2.0/gal/e-text/e-entry.h
+include/gal-2.0/gal/e-text/e-table-text-model.h
+include/gal-2.0/gal/e-text/e-text-model-repos.h
+include/gal-2.0/gal/e-text/e-text-model-uri.h
+include/gal-2.0/gal/e-text/e-text-model.h
+include/gal-2.0/gal/e-text/e-text.h
+include/gal-2.0/gal/menus/gal-define-views-dialog.h
+include/gal-2.0/gal/menus/gal-define-views-model.h
+include/gal-2.0/gal/menus/gal-view-collection.h
+include/gal-2.0/gal/menus/gal-view-etable.h
+include/gal-2.0/gal/menus/gal-view-factory-etable.h
+include/gal-2.0/gal/menus/gal-view-factory.h
+include/gal-2.0/gal/menus/gal-view-instance-save-as-dialog.h
+include/gal-2.0/gal/menus/gal-view-instance.h
+include/gal-2.0/gal/menus/gal-view-new-dialog.h
+include/gal-2.0/gal/menus/gal-view.h
+include/gal-2.0/gal/shortcut-bar/e-group-bar.h
+include/gal-2.0/gal/shortcut-bar/e-icon-bar-bg-item.h
+include/gal-2.0/gal/shortcut-bar/e-icon-bar.h
+include/gal-2.0/gal/shortcut-bar/e-shortcut-bar.h
+include/gal-2.0/gal/shortcut-bar/e-shortcut-model.h
+include/gal-2.0/gal/shortcut-bar/e-vscrolled-bar.h
+include/gal-2.0/gal/util/e-bit-array.h
+include/gal-2.0/gal/util/e-cache.h
+include/gal-2.0/gal/util/e-iconv.h
+include/gal-2.0/gal/util/e-marshal.h
+include/gal-2.0/gal/util/e-sorter-array.h
+include/gal-2.0/gal/util/e-sorter.h
+include/gal-2.0/gal/util/e-text-event-processor-emacs-like.h
+include/gal-2.0/gal/util/e-text-event-processor-types.h
+include/gal-2.0/gal/util/e-text-event-processor.h
+include/gal-2.0/gal/util/e-util.h
+include/gal-2.0/gal/util/e-xml-utils.h
+include/gal-2.0/gal/widgets/color-group.h
+include/gal-2.0/gal/widgets/color-palette.h
+include/gal-2.0/gal/widgets/e-canvas-background.h
+include/gal-2.0/gal/widgets/e-canvas-utils.h
+include/gal-2.0/gal/widgets/e-canvas-vbox.h
+include/gal-2.0/gal/widgets/e-canvas.h
+include/gal-2.0/gal/widgets/e-categories-master-list-array.h
+include/gal-2.0/gal/widgets/e-categories-master-list-combo.h
+include/gal-2.0/gal/widgets/e-categories-master-list-dialog-model.h
+include/gal-2.0/gal/widgets/e-categories-master-list-dialog.h
+include/gal-2.0/gal/widgets/e-categories-master-list-option-menu.h
+include/gal-2.0/gal/widgets/e-categories-master-list.h
+include/gal-2.0/gal/widgets/e-categories.h
+include/gal-2.0/gal/widgets/e-colors.h
+include/gal-2.0/gal/widgets/e-cursors.h
+include/gal-2.0/gal/widgets/e-file-selection.h
+include/gal-2.0/gal/widgets/e-gui-utils.h
+include/gal-2.0/gal/widgets/e-hsv-utils.h
+include/gal-2.0/gal/widgets/e-option-menu.h
+include/gal-2.0/gal/widgets/e-popup-menu.h
+include/gal-2.0/gal/widgets/e-printable.h
+include/gal-2.0/gal/widgets/e-reflow-model.h
+include/gal-2.0/gal/widgets/e-reflow.h
+include/gal-2.0/gal/widgets/e-selection-model-array.h
+include/gal-2.0/gal/widgets/e-selection-model-simple.h
+include/gal-2.0/gal/widgets/e-selection-model.h
+include/gal-2.0/gal/widgets/e-unicode.h
+include/gal-2.0/gal/widgets/gtk-combo-box.h
+include/gal-2.0/gal/widgets/gtk-combo-stack.h
+include/gal-2.0/gal/widgets/gtk-combo-text.h
+include/gal-2.0/gal/widgets/widget-color-combo.h
+include/gal-2.0/gal/widgets/widget-pixmap-combo.h
+lib/libgal-2.0.a
+lib/libgal-2.0.la
+lib/libgal-2.0.so
+lib/libgal-2.0.so.5
+lib/libgal-2.0.so.5.1
+lib/libgal-a11y-2.0.a
+lib/libgal-a11y-2.0.la
+lib/libgal-a11y-2.0.so
+lib/libgal-a11y-2.0.so.5
+lib/libgal-a11y-2.0.so.5.1
 lib/pkgconfig/gal-2.0.pc
-share/gal-2-0/0.0.7/glade/e-categories-master-list-dialog.glade
-share/gal-2-0/0.0.7/glade/e-table-config-no-group.glade
-share/gal-2-0/0.0.7/glade/e-table-config.glade
-share/gal-2-0/0.0.7/glade/e-table-field-chooser.glade
-share/gal-2-0/0.0.7/glade/e-table-group.glade
-share/gal-2-0/0.0.7/glade/gal-categories.glade
-share/gal-2-0/0.0.7/glade/gal-define-views.glade
-share/gal-2-0/0.0.7/glade/gal-view-instance-save-as-dialog.glade
-share/gal-2-0/0.0.7/glade/gal-view-new-dialog.glade
-share/gal-2-0/0.0.7/pixmaps/categories/category_birthday_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_business_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_favorites_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_gifts_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_goals_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_holiday-cards_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_holiday_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_hot-contacts_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_ideas_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_international_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_key-customer_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_miscellaneous_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_personal_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_phonecalls_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_status_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_strategies_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_suppliers_16.png
-share/gal-2-0/0.0.7/pixmaps/categories/category_time-and-expenses_16.png
-share/gal2/html/gal-api.sgml
-share/gal2/html/gal-decl.txt
-share/gal2/html/gal-sections.txt
-share/gal2/html/gal.hierarchy
-share/gal2/html/gal.signals
-share/gal2/html/gal.types
-@exec ${MKDIR} %D/share/gal2/html/gal
-@dirrm share/gal2/html/gal
-@dirrm share/gal2/html
-@dirrm share/gal2
-@dirrm share/gal-2-0/${PKGVERSION}/pixmaps/categories
-@dirrm share/gal-2-0/${PKGVERSION}/pixmaps
-@dirrm share/gal-2-0/${PKGVERSION}/glade
-@dirrm share/gal-2-0/${PKGVERSION}
-@dirrm share/gal-2-0
-@dirrm include/gal-2-0/gal/widgets
-@dirrm include/gal-2-0/gal/util
-@dirrm include/gal-2-0/gal/shortcut-bar
-@dirrm include/gal-2-0/gal/menus
-@dirrm include/gal-2-0/gal/e-text
-@dirrm include/gal-2-0/gal/e-table
-@dirrm include/gal-2-0/gal/e-paned
-@dirrm include/gal-2-0/gal
-@dirrm include/gal-2-0
+share/doc/html/gal-api.html
+share/doc/html/gal-api.sgml
+share/doc/html/gal-decl.txt
+share/doc/html/gal-sections.txt
+share/doc/html/gal.hierarchy
+share/doc/html/gal.signals
+share/doc/html/gal.types
+share/gal-2.0/${PKGVERSION}/glade/e-categories-master-list-dialog.glade
+share/gal-2.0/${PKGVERSION}/glade/e-table-config-no-group.glade
+share/gal-2.0/${PKGVERSION}/glade/e-table-config.glade
+share/gal-2.0/${PKGVERSION}/glade/e-table-field-chooser.glade
+share/gal-2.0/${PKGVERSION}/glade/gal-categories.glade
+share/gal-2.0/${PKGVERSION}/glade/gal-define-views.glade
+share/gal-2.0/${PKGVERSION}/glade/gal-view-instance-save-as-dialog.glade
+share/gal-2.0/${PKGVERSION}/glade/gal-view-new-dialog.glade
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_birthday_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_business_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_favorites_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_gifts_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_goals_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_holiday-cards_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_holiday_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_hot-contacts_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_ideas_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_international_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_key-customer_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_miscellaneous_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_personal_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_phonecalls_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_status_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_strategies_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_suppliers_16.png
+share/gal-2.0/${PKGVERSION}/pixmaps/categories/category_time-and-expenses_16.png
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gal-${PKGVERSION}.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gal-${PKGVERSION}.mo
+@dirrm share/gal-2.0/${PKGVERSION}/pixmaps/categories
+@dirrm share/gal-2.0/${PKGVERSION}/pixmaps
+@dirrm share/gal-2.0/${PKGVERSION}/glade
+@dirrm share/gal-2.0/${PKGVERSION}
+@dirrm share/gal-2.0
+@exec ${MKDIR} %D/share/doc/html/gal
+@dirrm share/doc/html/gal
+@dirrm include/gal-2.0/gal/widgets
+@dirrm include/gal-2.0/gal/util
+@dirrm include/gal-2.0/gal/shortcut-bar
+@dirrm include/gal-2.0/gal/menus
+@dirrm include/gal-2.0/gal/e-text
+@dirrm include/gal-2.0/gal/e-table
+@dirrm include/gal-2.0/gal/a11y/e-text
+@dirrm include/gal-2.0/gal/a11y/e-table
+@dirrm include/gal-2.0/gal/a11y
+@dirrm include/gal-2.0/gal
+@dirrm include/gal-2.0
diff --git a/devel/gal2/buildlink2.mk b/devel/gal2/buildlink2.mk
index de5456df633..5c8b7f025a3 100644
--- a/devel/gal2/buildlink2.mk
+++ b/devel/gal2/buildlink2.mk
@@ -1,35 +1,29 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/11/12 01:31:48 salo Exp $
-#
-# This Makefile fragment is included by packages that use gal2.
-#
-# This file was created automatically using createbuildlink 2.2.
+# $NetBSD: buildlink2.mk,v 1.7 2003/12/06 17:50:02 recht Exp $
 #
 
 .if !defined(GAL2_BUILDLINK2_MK)
 GAL2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gal2
-BUILDLINK_DEPENDS.gal2?=		gal2>=0.0.7nb5
+BUILDLINK_DEPENDS.gal2?=		gal2>=1.99.10
 BUILDLINK_PKGSRCDIR.gal2?=		../../devel/gal2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gal2=gal2
 BUILDLINK_PREFIX.gal2_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.gal2+=	include/gal-2-0/gal/e-paned/*.h
-BUILDLINK_FILES.gal2+=	include/gal-2-0/gal/e-table/*.h
-BUILDLINK_FILES.gal2+=	include/gal-2-0/gal/e-text/*.h
-BUILDLINK_FILES.gal2+=	include/gal-2-0/gal/menus/*.h
-BUILDLINK_FILES.gal2+=	include/gal-2-0/gal/shortcut-bar/*.h
-BUILDLINK_FILES.gal2+=	include/gal-2-0/gal/util/*.h
-BUILDLINK_FILES.gal2+=	include/gal-2-0/gal/widgets/*.h
-BUILDLINK_FILES.gal2+=	lib/libgal-2-0.*
-BUILDLINK_FILES.gal2+=	lib/pkgconfig/gal-2.0.pc
+BUILDLINK_FILES.gal2+=	include/gal-2.0/gal/a11y/e-table/*.h
+BUILDLINK_FILES.gal2+=	include/gal-2.0/gal/a11y/e-text/*.h
+BUILDLINK_FILES.gal2+=	include/gal-2.0/gal/a11y/*.h
+BUILDLINK_FILES.gal2+=	include/gal-2.0/gal/e-table/*.h
+BUILDLINK_FILES.gal2+=	include/gal-2.0/gal/e-text/*.h
+BUILDLINK_FILES.gal2+=	include/gal-2.0/gal/menus/*.h
+BUILDLINK_FILES.gal2+=	include/gal-2.0/gal/shortcut-bar/*.h
+BUILDLINK_FILES.gal2+=	include/gal-2.0/gal/util/*.h
+BUILDLINK_FILES.gal2+=	include/gal-2.0/gal/widgets/*.h
+BUILDLINK_FILES.gal2+=	lib/libgal-2.0.*
+BUILDLINK_FILES.gal2+=	lib/libgal-a11y-2.0.*
 
-.include "../../graphics/libgnomecanvas/buildlink2.mk"
-.include "../../print/libgnomeprintui/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/libglade2/buildlink2.mk"
+.include "../../print/libgnomeprintui/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gal2-buildlink
 
diff --git a/devel/gal2/distinfo b/devel/gal2/distinfo
index 99b385134ce..8c214152aea 100644
--- a/devel/gal2/distinfo
+++ b/devel/gal2/distinfo
@@ -1,7 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/03/06 08:51:00 jmc Exp $
+$NetBSD: distinfo,v 1.4 2003/12/06 17:50:02 recht Exp $
 
-SHA1 (gal2-0-0.0.7.tar.bz2) = 3da0f8ac1c07ed277bc615821ad6ac669cac5ce5
-Size (gal2-0-0.0.7.tar.bz2) = 744891 bytes
-SHA1 (patch-aa) = 97db94ef3e65d468947db6ee6d2c76002da621e8
-SHA1 (patch-ab) = 349064a8305c81d9053d8e5c2e8ea26342bae1fc
-SHA1 (patch-ac) = d20fd8b58c191175597ad7736d1cb01094b93d1c
+SHA1 (gal-1.99.10.tar.bz2) = cb7ac541676cb165b91e2dd4c2603521a1b47056
+Size (gal-1.99.10.tar.bz2) = 943975 bytes
diff --git a/devel/gal2/patches/patch-aa b/devel/gal2/patches/patch-aa
deleted file mode 100644
index 5bc2538bc4a..00000000000
--- a/devel/gal2/patches/patch-aa
+++ /dev/null
@@ -1,143 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/03/06 08:51:01 jmc Exp $
-
---- configure.orig	Sat Oct 26 20:05:02 2002
-+++ configure	Thu Mar  6 02:55:19 2003
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.54 for gal2-0 0.0.7.
-+# Generated by GNU Autoconf 2.57 for gal2-0 0.0.7.
- #
- # Report bugs to <http://bugzilla.ximian.com/enter_bug.cgi?product=GAL>.
- #
-@@ -38,7 +38,10 @@
- PS4='+ '
- 
- # NLS nuisances.
--for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
- do
-   if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-@@ -84,15 +87,15 @@
- 
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conftest.sh
--  echo  "exit 0"   >>conftest.sh
--  chmod +x conftest.sh
--  if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-     PATH_SEPARATOR=';'
-   else
-     PATH_SEPARATOR=:
-   fi
--  rm -f conftest.sh
-+  rm -f conf$$.sh
- fi
- 
- 
-@@ -11392,23 +11997,23 @@
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        echo "$as_me:$LINENO: checking for libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0" >&5
--echo $ECHO_N "checking for libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0... $ECHO_C" >&6
-+        echo "$as_me:$LINENO: checking for libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0" >&5
-+echo $ECHO_N "checking for libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0... $ECHO_C" >&6
- 
--        if $PKG_CONFIG --exists "libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0" ; then
-+        if $PKG_CONFIG --exists "libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0" ; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-             succeeded=yes
- 
-             echo "$as_me:$LINENO: checking GAL_CFLAGS" >&5
- echo $ECHO_N "checking GAL_CFLAGS... $ECHO_C" >&6
--            GAL_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0"`
-+            GAL_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0"`
-             echo "$as_me:$LINENO: result: $GAL_CFLAGS" >&5
- echo "${ECHO_T}$GAL_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking GAL_LIBS" >&5
- echo $ECHO_N "checking GAL_LIBS... $ECHO_C" >&6
--            GAL_LIBS=`$PKG_CONFIG --libs "libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0"`
-+            GAL_LIBS=`$PKG_CONFIG --libs "libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0"`
-             echo "$as_me:$LINENO: result: $GAL_LIBS" >&5
- echo "${ECHO_T}$GAL_LIBS" >&6
-         else
-@@ -11416,7 +12021,7 @@
-             GAL_LIBS=""
-             ## If we have a custom action on failure, don't print errors, but
-             ## do set a variable so people can do so.
--            GAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0"`
-+            GAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0"`
-             echo $GAL_PKG_ERRORS
-         fi
- 
-@@ -11431,8 +12036,8 @@
-   if test $succeeded = yes; then
-      :
-   else
--     { { echo "$as_me:$LINENO: error: Library requirements (libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--echo "$as_me: error: Library requirements (libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+     { { echo "$as_me:$LINENO: error: Library requirements (libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-+echo "$as_me: error: Library requirements (libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- 
-@@ -11496,23 +12101,23 @@
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        echo "$as_me:$LINENO: checking for libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0" >&5
--echo $ECHO_N "checking for libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0... $ECHO_C" >&6
-+        echo "$as_me:$LINENO: checking for libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0" >&5
-+echo $ECHO_N "checking for libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0... $ECHO_C" >&6
- 
--        if $PKG_CONFIG --exists "libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0" ; then
-+        if $PKG_CONFIG --exists "libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0" ; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-             succeeded=yes
- 
-             echo "$as_me:$LINENO: checking EXTRA_GNOME_CFLAGS" >&5
- echo $ECHO_N "checking EXTRA_GNOME_CFLAGS... $ECHO_C" >&6
--            EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0"`
-+            EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0"`
-             echo "$as_me:$LINENO: result: $EXTRA_GNOME_CFLAGS" >&5
- echo "${ECHO_T}$EXTRA_GNOME_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking EXTRA_GNOME_LIBS" >&5
- echo $ECHO_N "checking EXTRA_GNOME_LIBS... $ECHO_C" >&6
--            EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0"`
-+            EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0"`
-             echo "$as_me:$LINENO: result: $EXTRA_GNOME_LIBS" >&5
- echo "${ECHO_T}$EXTRA_GNOME_LIBS" >&6
-         else
-@@ -11520,7 +12125,7 @@
-             EXTRA_GNOME_LIBS=""
-             ## If we have a custom action on failure, don't print errors, but
-             ## do set a variable so people can do so.
--            EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0"`
-+            EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0"`
-             echo $EXTRA_GNOME_PKG_ERRORS
-         fi
- 
-@@ -11535,8 +12140,8 @@
-   if test $succeeded = yes; then
-      :
-   else
--     { { echo "$as_me:$LINENO: error: Library requirements (libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--echo "$as_me: error: Library requirements (libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+     { { echo "$as_me:$LINENO: error: Library requirements (libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-+echo "$as_me: error: Library requirements (libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- 
diff --git a/devel/gal2/patches/patch-ab b/devel/gal2/patches/patch-ab
deleted file mode 100644
index 46644a2e4f1..00000000000
--- a/devel/gal2/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/03/06 07:25:10 jmc Exp $
-
---- configure.in.orig	Sat Oct 26 19:58:29 2002
-+++ configure.in	Thu Mar  6 02:54:58 2003
-@@ -250,14 +250,14 @@
- dnl For the various galConf.sh scripts generation.
- dnl
- GAL_LIBDIR='-L${libdir}'
--PKG_CHECK_MODULES(GAL, libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0)
-+PKG_CHECK_MODULES(GAL, libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0)
- GAL_CFLAGS="$GAL_CFLAGS $ICONV_CFLAGS"
- GAL_LIBS="$GAL_LIBS -lgal $ICONV_LIBS"
- AC_SUBST(GAL_LIBDIR)
- AC_SUBST(GAL_CFLAGS)
- AC_SUBST(GAL_LIBS)
- 
--PKG_CHECK_MODULES(EXTRA_GNOME, libgnomeprint-2.0 libgnomeprintui-2.0 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0)
-+PKG_CHECK_MODULES(EXTRA_GNOME, libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0)
- AC_SUBST(EXTRA_GNOME_LIBS)
- AC_SUBST(EXTRA_GNOME_CFLAGS)
- 
diff --git a/devel/gal2/patches/patch-ac b/devel/gal2/patches/patch-ac
deleted file mode 100644
index 35f87cfc0b3..00000000000
--- a/devel/gal2/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/03/06 08:51:01 jmc Exp $
-
---- gal/e-table/e-table-group.c.orig	Mon Aug 19 15:35:16 2002
-+++ gal/e-table/e-table-group.c	Thu Mar  6 08:11:22 2003
-@@ -129,13 +129,15 @@
- 			 ETableHeader     *header,
- 			 ETableModel      *model)
- {
-+	va_list ap;
- 	etg->full_header = full_header;
- 	gtk_object_ref (GTK_OBJECT(etg->full_header));
- 	etg->header = header;
- 	gtk_object_ref (GTK_OBJECT(etg->header));
- 	etg->model = model;
- 	gtk_object_ref (GTK_OBJECT(etg->model));
--	gnome_canvas_item_construct (GNOME_CANVAS_ITEM (etg), parent, 0, NULL);
-+	/* Safe to pass uninitialized ap since 0 property arg won't eval it. */
-+	gnome_canvas_item_construct (GNOME_CANVAS_ITEM (etg), parent, 0, ap);
- }
- 
- /**