Update to 0.24: bugfixes, and move of the directories to a subdirectory

for better coexistence with gal20 and gal22.

3 files changed, 159 insertions, 156 deletions

diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index 1e8a2b527b5..00faea45346 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2004/11/30 18:26:39 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2005/02/09 20:20:01 wiz Exp $
 
-DISTNAME=		gal-0.22
-PKGREVISION=		6
+DISTNAME=		gal-0.24
 CATEGORIES=		gnome devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gal/0.22/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gal/0.24/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -11,10 +10,12 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Gnome Application Libraries (gal-1.0 API)
 
 USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
+PKGCONFIG_OVERRIDE=	gal.pc.in
 
 INCOMPAT_ICONV= SunOS-*-*
 
diff --git a/devel/gal/PLIST b/devel/gal/PLIST
index 794df90150d..d9b8dc7f9f5 100644
--- a/devel/gal/PLIST
+++ b/devel/gal/PLIST
@@ -1,145 +1,146 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:24 jlam Exp $
-include/gal/e-paned/e-hpaned.h
-include/gal/e-paned/e-paned.h
-include/gal/e-paned/e-vpaned.h
-include/gal/e-table/e-cell-checkbox.h
-include/gal/e-table/e-cell-combo.h
-include/gal/e-table/e-cell-date.h
-include/gal/e-table/e-cell-float.h
-include/gal/e-table/e-cell-number.h
-include/gal/e-table/e-cell-pixbuf.h
-include/gal/e-table/e-cell-popup.h
-include/gal/e-table/e-cell-progress.h
-include/gal/e-table/e-cell-size.h
-include/gal/e-table/e-cell-spin-button.h
-include/gal/e-table/e-cell-text.h
-include/gal/e-table/e-cell-toggle.h
-include/gal/e-table/e-cell-tree.h
-include/gal/e-table/e-cell-vbox.h
-include/gal/e-table/e-cell.h
-include/gal/e-table/e-table-click-to-add.h
-include/gal/e-table/e-table-col-dnd.h
-include/gal/e-table/e-table-col.h
-include/gal/e-table/e-table-column-specification.h
-include/gal/e-table/e-table-config.h
-include/gal/e-table/e-table-defines.h
-include/gal/e-table/e-table-extras.h
-include/gal/e-table/e-table-field-chooser-dialog.h
-include/gal/e-table/e-table-field-chooser-item.h
-include/gal/e-table/e-table-field-chooser.h
-include/gal/e-table/e-table-group-container.h
-include/gal/e-table/e-table-group-leaf.h
-include/gal/e-table/e-table-group.h
-include/gal/e-table/e-table-header-item.h
-include/gal/e-table/e-table-header-utils.h
-include/gal/e-table/e-table-header.h
-include/gal/e-table/e-table-item.h
-include/gal/e-table/e-table-memory-callbacks.h
-include/gal/e-table/e-table-memory-store.h
-include/gal/e-table/e-table-memory.h
-include/gal/e-table/e-table-model.h
-include/gal/e-table/e-table-one.h
-include/gal/e-table/e-table-scrolled.h
-include/gal/e-table/e-table-search.h
-include/gal/e-table/e-table-selection-model.h
-include/gal/e-table/e-table-simple.h
-include/gal/e-table/e-table-sort-info.h
-include/gal/e-table/e-table-sorted-variable.h
-include/gal/e-table/e-table-sorted.h
-include/gal/e-table/e-table-sorter.h
-include/gal/e-table/e-table-sorting-utils.h
-include/gal/e-table/e-table-specification.h
-include/gal/e-table/e-table-state.h
-include/gal/e-table/e-table-subset-variable.h
-include/gal/e-table/e-table-subset.h
-include/gal/e-table/e-table-tooltip.h
-include/gal/e-table/e-table-utils.h
-include/gal/e-table/e-table-without.h
-include/gal/e-table/e-table.h
-include/gal/e-table/e-tree-memory-callbacks.h
-include/gal/e-table/e-tree-memory.h
-include/gal/e-table/e-tree-model.h
-include/gal/e-table/e-tree-scrolled.h
-include/gal/e-table/e-tree-selection-model.h
-include/gal/e-table/e-tree-sorted.h
-include/gal/e-table/e-tree-table-adapter.h
-include/gal/e-table/e-tree.h
-include/gal/e-text/e-completion-match.h
-include/gal/e-text/e-completion-view.h
-include/gal/e-text/e-completion.h
-include/gal/e-text/e-entry.h
-include/gal/e-text/e-table-text-model.h
-include/gal/e-text/e-text-model-repos.h
-include/gal/e-text/e-text-model-uri.h
-include/gal/e-text/e-text-model.h
-include/gal/e-text/e-text.h
-include/gal/menus/gal-define-views-dialog.h
-include/gal/menus/gal-define-views-model.h
-include/gal/menus/gal-view-collection.h
-include/gal/menus/gal-view-etable.h
-include/gal/menus/gal-view-factory-etable.h
-include/gal/menus/gal-view-factory.h
-include/gal/menus/gal-view-instance-save-as-dialog.h
-include/gal/menus/gal-view-instance.h
-include/gal/menus/gal-view-new-dialog.h
-include/gal/menus/gal-view.h
-include/gal/shortcut-bar/e-group-bar.h
-include/gal/shortcut-bar/e-icon-bar-bg-item.h
-include/gal/shortcut-bar/e-icon-bar.h
-include/gal/shortcut-bar/e-shortcut-bar.h
-include/gal/shortcut-bar/e-shortcut-model.h
-include/gal/shortcut-bar/e-vscrolled-bar.h
-include/gal/unicode/gunicode.h
-include/gal/util/e-bit-array.h
-include/gal/util/e-cache.h
-include/gal/util/e-i18n.h
-include/gal/util/e-iconv.h
-include/gal/util/e-sorter-array.h
-include/gal/util/e-sorter.h
-include/gal/util/e-text-event-processor-emacs-like.h
-include/gal/util/e-text-event-processor-types.h
-include/gal/util/e-text-event-processor.h
-include/gal/util/e-unicode-i18n.h
-include/gal/util/e-util.h
-include/gal/util/e-xml-utils.h
-include/gal/widgets/color-group.h
-include/gal/widgets/color-palette.h
-include/gal/widgets/e-canvas-background.h
-include/gal/widgets/e-canvas-utils.h
-include/gal/widgets/e-canvas-vbox.h
-include/gal/widgets/e-canvas.h
-include/gal/widgets/e-categories-master-list-array.h
-include/gal/widgets/e-categories-master-list-combo.h
-include/gal/widgets/e-categories-master-list-dialog-model.h
-include/gal/widgets/e-categories-master-list-dialog.h
-include/gal/widgets/e-categories-master-list-option-menu.h
-include/gal/widgets/e-categories-master-list.h
-include/gal/widgets/e-categories.h
-include/gal/widgets/e-colors.h
-include/gal/widgets/e-cursors.h
-include/gal/widgets/e-file-selection.h
-include/gal/widgets/e-font.h
-include/gal/widgets/e-gui-utils.h
-include/gal/widgets/e-hscrollbar.h
-include/gal/widgets/e-hsv-utils.h
-include/gal/widgets/e-option-menu.h
-include/gal/widgets/e-popup-menu.h
-include/gal/widgets/e-printable.h
-include/gal/widgets/e-reflow-model.h
-include/gal/widgets/e-reflow.h
-include/gal/widgets/e-scroll-frame.h
-include/gal/widgets/e-selection-model-array.h
-include/gal/widgets/e-selection-model-simple.h
-include/gal/widgets/e-selection-model.h
-include/gal/widgets/e-unicode.h
-include/gal/widgets/e-vscrollbar.h
-include/gal/widgets/gtk-combo-box.h
-include/gal/widgets/gtk-combo-stack.h
-include/gal/widgets/gtk-combo-text.h
-include/gal/widgets/widget-color-combo.h
-include/gal/widgets/widget-pixmap-combo.h
+@comment $NetBSD: PLIST,v 1.9 2005/02/09 20:20:01 wiz Exp $
+include/gal-1.0/gal/e-paned/e-hpaned.h
+include/gal-1.0/gal/e-paned/e-paned.h
+include/gal-1.0/gal/e-paned/e-vpaned.h
+include/gal-1.0/gal/e-table/e-cell-checkbox.h
+include/gal-1.0/gal/e-table/e-cell-combo.h
+include/gal-1.0/gal/e-table/e-cell-date.h
+include/gal-1.0/gal/e-table/e-cell-float.h
+include/gal-1.0/gal/e-table/e-cell-number.h
+include/gal-1.0/gal/e-table/e-cell-pixbuf.h
+include/gal-1.0/gal/e-table/e-cell-popup.h
+include/gal-1.0/gal/e-table/e-cell-progress.h
+include/gal-1.0/gal/e-table/e-cell-size.h
+include/gal-1.0/gal/e-table/e-cell-spin-button.h
+include/gal-1.0/gal/e-table/e-cell-text.h
+include/gal-1.0/gal/e-table/e-cell-toggle.h
+include/gal-1.0/gal/e-table/e-cell-tree.h
+include/gal-1.0/gal/e-table/e-cell-vbox.h
+include/gal-1.0/gal/e-table/e-cell.h
+include/gal-1.0/gal/e-table/e-table-click-to-add.h
+include/gal-1.0/gal/e-table/e-table-col-dnd.h
+include/gal-1.0/gal/e-table/e-table-col.h
+include/gal-1.0/gal/e-table/e-table-column-specification.h
+include/gal-1.0/gal/e-table/e-table-config.h
+include/gal-1.0/gal/e-table/e-table-defines.h
+include/gal-1.0/gal/e-table/e-table-extras.h
+include/gal-1.0/gal/e-table/e-table-field-chooser-dialog.h
+include/gal-1.0/gal/e-table/e-table-field-chooser-item.h
+include/gal-1.0/gal/e-table/e-table-field-chooser.h
+include/gal-1.0/gal/e-table/e-table-group-container.h
+include/gal-1.0/gal/e-table/e-table-group-leaf.h
+include/gal-1.0/gal/e-table/e-table-group.h
+include/gal-1.0/gal/e-table/e-table-header-item.h
+include/gal-1.0/gal/e-table/e-table-header-utils.h
+include/gal-1.0/gal/e-table/e-table-header.h
+include/gal-1.0/gal/e-table/e-table-item.h
+include/gal-1.0/gal/e-table/e-table-memory-callbacks.h
+include/gal-1.0/gal/e-table/e-table-memory-store.h
+include/gal-1.0/gal/e-table/e-table-memory.h
+include/gal-1.0/gal/e-table/e-table-model.h
+include/gal-1.0/gal/e-table/e-table-one.h
+include/gal-1.0/gal/e-table/e-table-scrolled.h
+include/gal-1.0/gal/e-table/e-table-search.h
+include/gal-1.0/gal/e-table/e-table-selection-model.h
+include/gal-1.0/gal/e-table/e-table-simple.h
+include/gal-1.0/gal/e-table/e-table-sort-info.h
+include/gal-1.0/gal/e-table/e-table-sorted-variable.h
+include/gal-1.0/gal/e-table/e-table-sorted.h
+include/gal-1.0/gal/e-table/e-table-sorter.h
+include/gal-1.0/gal/e-table/e-table-sorting-utils.h
+include/gal-1.0/gal/e-table/e-table-specification.h
+include/gal-1.0/gal/e-table/e-table-state.h
+include/gal-1.0/gal/e-table/e-table-subset-variable.h
+include/gal-1.0/gal/e-table/e-table-subset.h
+include/gal-1.0/gal/e-table/e-table-tooltip.h
+include/gal-1.0/gal/e-table/e-table-utils.h
+include/gal-1.0/gal/e-table/e-table-without.h
+include/gal-1.0/gal/e-table/e-table.h
+include/gal-1.0/gal/e-table/e-tree-memory-callbacks.h
+include/gal-1.0/gal/e-table/e-tree-memory.h
+include/gal-1.0/gal/e-table/e-tree-model.h
+include/gal-1.0/gal/e-table/e-tree-scrolled.h
+include/gal-1.0/gal/e-table/e-tree-selection-model.h
+include/gal-1.0/gal/e-table/e-tree-sorted.h
+include/gal-1.0/gal/e-table/e-tree-table-adapter.h
+include/gal-1.0/gal/e-table/e-tree.h
+include/gal-1.0/gal/e-text/e-completion-match.h
+include/gal-1.0/gal/e-text/e-completion-view.h
+include/gal-1.0/gal/e-text/e-completion.h
+include/gal-1.0/gal/e-text/e-entry.h
+include/gal-1.0/gal/e-text/e-table-text-model.h
+include/gal-1.0/gal/e-text/e-text-model-repos.h
+include/gal-1.0/gal/e-text/e-text-model-uri.h
+include/gal-1.0/gal/e-text/e-text-model.h
+include/gal-1.0/gal/e-text/e-text.h
+include/gal-1.0/gal/menus/gal-define-views-dialog.h
+include/gal-1.0/gal/menus/gal-define-views-model.h
+include/gal-1.0/gal/menus/gal-view-collection.h
+include/gal-1.0/gal/menus/gal-view-etable.h
+include/gal-1.0/gal/menus/gal-view-factory-etable.h
+include/gal-1.0/gal/menus/gal-view-factory.h
+include/gal-1.0/gal/menus/gal-view-instance-save-as-dialog.h
+include/gal-1.0/gal/menus/gal-view-instance.h
+include/gal-1.0/gal/menus/gal-view-new-dialog.h
+include/gal-1.0/gal/menus/gal-view.h
+include/gal-1.0/gal/shortcut-bar/e-group-bar.h
+include/gal-1.0/gal/shortcut-bar/e-icon-bar-bg-item.h
+include/gal-1.0/gal/shortcut-bar/e-icon-bar.h
+include/gal-1.0/gal/shortcut-bar/e-shortcut-bar.h
+include/gal-1.0/gal/shortcut-bar/e-shortcut-model.h
+include/gal-1.0/gal/shortcut-bar/e-vscrolled-bar.h
+include/gal-1.0/gal/unicode/gunicode.h
+include/gal-1.0/gal/util/e-bit-array.h
+include/gal-1.0/gal/util/e-cache.h
+include/gal-1.0/gal/util/e-i18n.h
+include/gal-1.0/gal/util/e-iconv.h
+include/gal-1.0/gal/util/e-sorter-array.h
+include/gal-1.0/gal/util/e-sorter.h
+include/gal-1.0/gal/util/e-text-event-processor-emacs-like.h
+include/gal-1.0/gal/util/e-text-event-processor-types.h
+include/gal-1.0/gal/util/e-text-event-processor.h
+include/gal-1.0/gal/util/e-unicode-i18n.h
+include/gal-1.0/gal/util/e-util.h
+include/gal-1.0/gal/util/e-xml-utils.h
+include/gal-1.0/gal/widgets/color-group.h
+include/gal-1.0/gal/widgets/color-palette.h
+include/gal-1.0/gal/widgets/e-canvas-background.h
+include/gal-1.0/gal/widgets/e-canvas-utils.h
+include/gal-1.0/gal/widgets/e-canvas-vbox.h
+include/gal-1.0/gal/widgets/e-canvas.h
+include/gal-1.0/gal/widgets/e-categories-master-list-array.h
+include/gal-1.0/gal/widgets/e-categories-master-list-combo.h
+include/gal-1.0/gal/widgets/e-categories-master-list-dialog-model.h
+include/gal-1.0/gal/widgets/e-categories-master-list-dialog.h
+include/gal-1.0/gal/widgets/e-categories-master-list-option-menu.h
+include/gal-1.0/gal/widgets/e-categories-master-list.h
+include/gal-1.0/gal/widgets/e-categories.h
+include/gal-1.0/gal/widgets/e-colors.h
+include/gal-1.0/gal/widgets/e-cursors.h
+include/gal-1.0/gal/widgets/e-file-selection.h
+include/gal-1.0/gal/widgets/e-font.h
+include/gal-1.0/gal/widgets/e-gui-utils.h
+include/gal-1.0/gal/widgets/e-hscrollbar.h
+include/gal-1.0/gal/widgets/e-hsv-utils.h
+include/gal-1.0/gal/widgets/e-option-menu.h
+include/gal-1.0/gal/widgets/e-popup-menu.h
+include/gal-1.0/gal/widgets/e-printable.h
+include/gal-1.0/gal/widgets/e-reflow-model.h
+include/gal-1.0/gal/widgets/e-reflow.h
+include/gal-1.0/gal/widgets/e-scroll-frame.h
+include/gal-1.0/gal/widgets/e-selection-model-array.h
+include/gal-1.0/gal/widgets/e-selection-model-simple.h
+include/gal-1.0/gal/widgets/e-selection-model.h
+include/gal-1.0/gal/widgets/e-unicode.h
+include/gal-1.0/gal/widgets/e-vscrollbar.h
+include/gal-1.0/gal/widgets/gtk-combo-box.h
+include/gal-1.0/gal/widgets/gtk-combo-stack.h
+include/gal-1.0/gal/widgets/gtk-combo-text.h
+include/gal-1.0/gal/widgets/widget-color-combo.h
+include/gal-1.0/gal/widgets/widget-pixmap-combo.h
 lib/galConf.sh
 lib/libgal.la
+lib/pkgconfig/gal.pc
 share/etable/${PKGVERSION}/glade/e-table-config-no-group.glade
 share/etable/${PKGVERSION}/glade/e-table-config.glade
 share/etable/${PKGVERSION}/glade/e-table-field-chooser.glade
@@ -216,12 +217,13 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/${PKGNAME}.mo
 @dirrm share/etable/${PKGVERSION}/glade
 @dirrm share/etable/${PKGVERSION}
 @dirrm share/etable
-@dirrm include/gal/widgets
-@dirrm include/gal/util
-@dirrm include/gal/unicode
-@dirrm include/gal/shortcut-bar
-@dirrm include/gal/menus
-@dirrm include/gal/e-text
-@dirrm include/gal/e-table
-@dirrm include/gal/e-paned
-@dirrm include/gal
+@dirrm include/gal-1.0/gal/widgets
+@dirrm include/gal-1.0/gal/util
+@dirrm include/gal-1.0/gal/unicode
+@dirrm include/gal-1.0/gal/shortcut-bar
+@dirrm include/gal-1.0/gal/menus
+@dirrm include/gal-1.0/gal/e-text
+@dirrm include/gal-1.0/gal/e-table
+@dirrm include/gal-1.0/gal/e-paned
+@dirrm include/gal-1.0/gal
+@dirrm include/gal-1.0
diff --git a/devel/gal/distinfo b/devel/gal/distinfo
index b5962c1d502..68623d7c1f8 100644
--- a/devel/gal/distinfo
+++ b/devel/gal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2003/01/09 10:48:20 rh Exp $
+$NetBSD: distinfo,v 1.16 2005/02/09 20:20:01 wiz Exp $
 
-SHA1 (gal-0.22.tar.bz2) = 55f977203f04400ad6a05a5d3f1123657b2cb5b1
-Size (gal-0.22.tar.bz2) = 1022854 bytes
+SHA1 (gal-0.24.tar.bz2) = c220141d9080e78e5e8f69b83c01f6d14e775bf9
+Size (gal-0.24.tar.bz2) = 1035597 bytes