Updated to 0.5. Lots of changes, too many to list here, sorry.

The update is needed for gnumeric 0.64.

5 files changed, 130 insertions, 83 deletions

diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index d5044d6d498..13de55ff089 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 14:38:25 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/18 02:12:01 mjl Exp $
 #
 
-DISTNAME=	gal-0.4.1
+DISTNAME=	gal-0.5
 CATEGORIES=	gnome devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=unstable/sources/gal/}
 
@@ -13,7 +13,7 @@ DEPENDS+=	libiconv-*:../../converters/libiconv
 DEPENDS+=	gnome-core>=1.2.0:../../x11/gnome-core
 DEPENDS+=	gnome-print>=0.25:../../print/gnome-print
 DEPENDS+=	gnome-vfs-*:../../sysutils/gnome-vfs
-DEPENDS+=	libglade>=0.14:../../devel/libglade
+DEPENDS+=	libglade>=0.13:../../devel/libglade
 DEPENDS+=	libunicode>=0.4:../../textproc/libunicode
 DEPENDS+=	bonobo>=0.26:../../devel/bonobo
 
@@ -21,6 +21,8 @@ GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 USE_X11BASE=	YES
 
+CONFIGURE_ARGS+=	-with-libiconv=${LOCALBASE}
+
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gal/files/md5 b/devel/gal/files/md5
index 716a0d2451a..aaaf95ec454 100644
--- a/devel/gal/files/md5
+++ b/devel/gal/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 2000/12/31 09:35:24 rh Exp $
+$NetBSD: md5,v 1.6 2001/03/18 02:12:02 mjl Exp $
 
-MD5 (gal-0.4.1.tar.gz) = c0f791fdbd6af7b906cd372dc0a3c25c
+SHA1 (gal-0.5.tar.gz) = 7e00d75f4d94d307266eb8635f65fcccd67ca610
diff --git a/devel/gal/files/patch-sum b/devel/gal/files/patch-sum
index 512f7fb4a3d..80da371b3ab 100644
--- a/devel/gal/files/patch-sum
+++ b/devel/gal/files/patch-sum
@@ -1,6 +1,3 @@
-$NetBSD: patch-sum,v 1.3 2000/12/31 09:35:24 rh Exp $
+$NetBSD: patch-sum,v 1.4 2001/03/18 02:12:02 mjl Exp $
 
-This placeholder file is generated by the ``makepatchsum'' target
-whenever the patches directory is empty or missing. Its purpose
-is to ensure that the presence of any obsolete patches will cause
-the proper error to be emitted at build time.
+SHA1 (patch-aa) = 00690e5db9fea153792b8b0bc5fda6f5a1b6a76e
diff --git a/devel/gal/patches/patch-aa b/devel/gal/patches/patch-aa
new file mode 100644
index 00000000000..0ea41016c99
--- /dev/null
+++ b/devel/gal/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.4 2001/03/18 02:12:02 mjl Exp $
+
+--- gal/shortcut-bar/Makefile.in.orig	Sun Mar 18 02:45:36 2001
++++ gal/shortcut-bar/Makefile.in	Sun Mar 18 02:47:35 2001
+@@ -142,7 +142,8 @@
+ gnomelocaledir = @gnomelocaledir@
+ l = @l@
+ 
+-INCLUDES =  	-I$(top_srcdir)					$(EXTRA_GNOME_CFLAGS)				-DG_LOG_DOMAIN=\"shortcut-bar\"
++INCLUDES =  	-I$(top_srcdir)	$(ICONV_CFLAGS)				$(EXTRA_GNOME_CFLAGS)				-DG_LOG_DOMAIN=\"shortcut-bar\"
++
+ 
+ 
+ noinst_LTLIBRARIES = libshortcut-bar.la
diff --git a/devel/gal/pkg/PLIST b/devel/gal/pkg/PLIST
index aa2ac9b317e..d03e3c8573c 100644
--- a/devel/gal/pkg/PLIST
+++ b/devel/gal/pkg/PLIST
@@ -1,30 +1,69 @@
-@comment $NetBSD: PLIST,v 1.6 2001/01/04 15:10:27 agc Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/03/18 02:12:02 mjl Exp $
+include/gal/util/e-util.h
+include/gal/util/e-xml-utils.h
+include/gal/util/e-cache.h
+include/gal/util/e-i18n.h
+@dirrm include/gal/util
+include/gal/widgets/color-group.h
+include/gal/widgets/color-palette.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.h
+include/gal/widgets/e-colors.h
+include/gal/widgets/e-cursors.h
+include/gal/widgets/e-font.h
+include/gal/widgets/e-gui-utils.h
+include/gal/widgets/e-hscrollbar.h
+include/gal/widgets/e-popup-menu.h
+include/gal/widgets/e-printable.h
+include/gal/widgets/e-reflow-sorted.h
+include/gal/widgets/e-reflow.h
+include/gal/widgets/e-scroll-frame.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
+@dirrm include/gal/widgets
+include/gal/e-text/e-entry.h
+include/gal/e-text/e-text-event-processor-emacs-like.h
+include/gal/e-text/e-text-event-processor-types.h
+include/gal/e-text/e-text-event-processor.h
+include/gal/e-text/e-text-model.h
+include/gal/e-text/e-text-model-uri.h
+include/gal/e-text/e-text.h
+@dirrm include/gal/e-text
 include/gal/e-paned/e-hpaned.h
 include/gal/e-paned/e-paned.h
 include/gal/e-paned/e-vpaned.h
+@dirrm include/gal/e-paned
+include/gal/e-table/e-cell.h
 include/gal/e-table/e-cell-checkbox.h
+include/gal/e-table/e-cell-date.h
+include/gal/e-table/e-cell-number.h
+include/gal/e-table/e-cell-size.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.h
+include/gal/e-table/e-table.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-field.h
-include/gal/e-table/e-table-extras.h
-include/gal/e-table/e-table-specification.h
-include/gal/e-table/e-table-state.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-group.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.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-item.h
 include/gal/e-table/e-table-model.h
@@ -33,22 +72,18 @@ include/gal/e-table/e-table-scrolled.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-sorted-variable.h
+include/gal/e-table/e-table-state.h
 include/gal/e-table/e-table-sorter.h
-include/gal/e-table/e-table-subset-variable.h
+include/gal/e-table/e-table-specification.h
 include/gal/e-table/e-table-subset.h
+include/gal/e-table/e-table-subset-variable.h
 include/gal/e-table/e-table-text-model.h
-include/gal/e-table/e-table-tooltip.h
-include/gal/e-table/e-table.h
 include/gal/e-table/e-tree-model.h
 include/gal/e-table/e-tree-simple.h
-include/gal/e-text/e-entry.h
-include/gal/e-text/e-text-event-processor-emacs-like.h
-include/gal/e-text/e-text-event-processor-types.h
-include/gal/e-text/e-text-event-processor.h
-include/gal/e-text/e-text-model.h
-include/gal/e-text/e-text.h
+include/gal/e-table/e-table-tooltip.h
+@dirrm include/gal/e-table
 include/gal/menus/gal-define-views-dialog.h
 include/gal/menus/gal-define-views-model.h
 include/gal/menus/gal-view-collection.h
@@ -57,60 +92,59 @@ include/gal/menus/gal-view-factory-etable.h
 include/gal/menus/gal-view-factory.h
 include/gal/menus/gal-view-new-dialog.h
 include/gal/menus/gal-view.h
-include/gal/util/e-cache.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-utils.h
-include/gal/widgets/e-canvas-vbox.h
-include/gal/widgets/e-canvas.h
-include/gal/widgets/e-colors.h
-include/gal/widgets/e-cursors.h
-include/gal/widgets/e-font.h
-include/gal/widgets/e-gui-utils.h
-include/gal/widgets/e-hscrollbar.h
-include/gal/widgets/e-vscrollbar.h
-include/gal/widgets/e-popup-menu.h
-include/gal/widgets/e-printable.h
-include/gal/widgets/e-reflow-sorted.h
-include/gal/widgets/e-reflow.h
-include/gal/widgets/e-scroll-frame.h
-include/gal/widgets/e-unicode.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
-lib/galConf.sh
-lib/libgal.a
-lib/libgal.la
-lib/libgal.so
-lib/libgal.so.3
-lib/libgal.so.3.1
-@exec mkdir -m 0755 -p %D/share/bonobo/html/gal
-share/bonobo/html/gal-api.sgml
-share/bonobo/html/gal.hierarchy
-share/bonobo/html/gal.signals
-share/bonobo/html/gal.types
-share/bonobo/html/gal-decl.txt
-share/bonobo/html/gal-sections.txt
-share/etable/0.4.1/glade/e-table-config.glade
-share/etable/0.4.1/glade/e-table-group.glade
-share/etable/0.4.1/glade/e-table-field-chooser.glade
-share/gal/0.4.1/glade/gal-define-views.glade
-share/gal/0.4.1/glade/gal-view-new-dialog.glade
-@dirrm share/bonobo/html/gal
-@dirrm share/etable/0.4.1/glade
-@dirrm share/etable/0.4.1
-@dirrm share/etable
-@dirrm share/gal/0.4.1/glade
-@dirrm share/gal/0.4.1
-@dirrm share/gal
-@dirrm include/gal/widgets
-@dirrm include/gal/util
 @dirrm include/gal/menus
-@dirrm include/gal/e-text
-@dirrm include/gal/e-table
-@dirrm include/gal/e-paned
+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
+@dirrm include/gal/shortcut-bar
 @dirrm include/gal
+lib/libgal.so.4.0
+lib/libgal.so.4
+lib/libgal.so
+lib/libgal.la
+lib/libgal.a
+lib/locale/da/LC_MESSAGES/gal.mo
+lib/locale/en_GB/LC_MESSAGES/gal.mo
+lib/locale/es/LC_MESSAGES/gal.mo
+lib/locale/fi/LC_MESSAGES/gal.mo
+lib/locale/fr/LC_MESSAGES/gal.mo
+lib/locale/gl/LC_MESSAGES/gal.mo
+lib/locale/hu/LC_MESSAGES/gal.mo
+lib/locale/it/LC_MESSAGES/gal.mo
+lib/locale/ja/LC_MESSAGES/gal.mo
+lib/locale/ko/LC_MESSAGES/gal.mo
+lib/locale/no/LC_MESSAGES/gal.mo
+lib/locale/sv/LC_MESSAGES/gal.mo
+lib/locale/pl/LC_MESSAGES/gal.mo
+lib/locale/ca/LC_MESSAGES/gal.mo
+lib/locale/de/LC_MESSAGES/gal.mo
+lib/locale/lt/LC_MESSAGES/gal.mo
+lib/locale/pt_BR/LC_MESSAGES/gal.mo
+lib/locale/ru/LC_MESSAGES/gal.mo
+lib/locale/sk/LC_MESSAGES/gal.mo
+lib/locale/tr/LC_MESSAGES/gal.mo
+lib/locale/uk/LC_MESSAGES/gal.mo
+lib/galConf.sh
+share/gal/0.5/glade/gal-categories.glade
+share/gal/0.5/glade/gal-define-views.glade
+share/gal/0.5/glade/gal-view-new-dialog.glade
+@dirrm share/gal/0.5/glade
+@dirrm share/gal/0.5
+share/gal/html/gal-api.sgml
+share/gal/html/gal.hierarchy
+share/gal/html/gal.signals
+share/gal/html/gal.types
+share/gal/html/gal-decl.txt
+share/gal/html/gal-sections.txt
+@dirrm share/gal/html/gal
+@dirrm share/gal/html
+@dirrm share/gal
+share/etable/0.5/glade/e-table-config.glade
+share/etable/0.5/glade/e-table-group.glade
+share/etable/0.5/glade/e-table-field-chooser.glade
+@dirrm share/etable/0.5/glade
+@dirrm share/etable/0.5
+@dirrm share/etable