Update to 2.4.0. Note that, despite the comment at the top of the Makefile

saying that 2.4 should become an independent gal24 package (because 2.4 is
API incompatible with 2.2), I'm doing the update in place.  The reason is
that after finishing the update of GNOME to 2.10, gal 2.2 won't be used by
anything else.

----------------------
gal-2.4.0  2005-03-07
----------------------

Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):

	#72793 - Grab Focus of table cells in grabs the wrong for a11y (Harry Lu)
	#73009 - Mnemonics not working in fields window (Li Yuan)

Other bugs and changes:

	- Updated translations:
	hi (Rajesh Ranjan)
	sr (Danilo Segan)
	sr@Latn (Danilo Segan)
	hu (Laszlo Dvornik)
	ro (Dan Damian)

----------------------
gal-2.3.5  2005-02-28
----------------------

Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):

	#72793 - Grab Focus of table cells in grabs the wrong for a11y (Harry Lu)
	#73009 - Mnemonics not working in fields window (Li Yuan)

Other bugs and changes:

	- Updated translations:
	de (Hendrik Richter)
	el (Kostas Papadimas, Nikos Charonitakis)
	ca (Gil Forcada)
	ru (Leonid Kanter)
	da (Martin Willemoes Hansen)
	cy (Rhys Jones)
	gu (Ankit Patel)
	fr (Christophe Merlet)
	pl (Artur Flinta)
	pt_BR (Raphael Higino)
	uk (Maxim Dziumanenko)
	pt (Duarte Loreto)
	fi (Ilkka Tuohela)
	nb (Kjartan Maraas)
	no (Kjartan Maraas)
	bg (Vladimir Petkov)
	sq (Laurent Dhima)
	lt (Zygimantas Berucka)
	en_GB (David Lodge)
	nl (Vincent van Adrighem)
	ja (Takeshi AIHANA)
	ko (Changwoo Ryu)
	cs (Miloslav Trmac)
	sk (Marcel Telka)
	es (Francisco Javier F. Serrador)
	en_CA (Adam Weinberger)
	sv (Christian Rose)
	et (Priit Laes)

----------------------
gal-2.3.4  2005-02-07
----------------------

Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):

	#70261 - No a11y output when input task summary in task table (Li Yuan)
	#61688 - Settings dialog's left navigation pane can't read by gnopernicus (Li Yuan)
	#48976 - evolution crashed when click tools through gok (Li Yuan)
	#68675 - The state 'FOCUSED' remains even if the cell is not the current focused one (Li Yuan)
	#70324 - Evolution Mail is Slow in a11y mode (Li Yuan)
	#68681 - 'Focus' event- redundant in case of moving between tree table lines (Li Yuan)
	#68627 - Task table cells should be "focusable" befor "focused" (Li Yuan)
	#71158 - Can't UI Grab the etree (Li Yuan)
	#38195 - tasks list - i18n problem in Priority column (JP)

Other bugs and changes:

	- Updated translations:
	ru (Leonid Kanter)
	en_GB (David Lodge)
	en_CA (Adam Weinberger)
	sk (Marcel Telka)
	cs (Miloslav Trmac)
	lt (Žygimantas Beručka)
	es (Francisco Javier F. Serrador)

----------------------
gal-2.3.3  2005-01-24
----------------------

Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):

	#9413 - Tooltips when hovering over text in card view is wrong colour

Other bugs and changes:

	- Updated translations:
	et (Priit Laes)
	sk (Marcel Telka)
	it (Alessio Frusciante)

----------------------
gal-2.3.2  2005-01-10
----------------------

Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):

	#29309 - Adding a new column leaves the window open

Other bugs and changes:

	- Updated translations:
	zh_CN (Funda Wang)

----------------------
gal-2.3.1  2004-11-28
----------------------

Other bugs and changes:

	-don't lose focus when rebuilding categories (Hao Sheng)
	- Updated translations:
	de (Hendrik Richter)

----------------------
gal-2.3.0  2004-11-01
----------------------

Other bugs and changes:

	- bumped API to 2.4 and version to 2.3

4 files changed, 274 insertions, 275 deletions

diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile
index 283d48feaec..6ac8e0a13fa 100644
--- a/devel/gal2/Makefile
+++ b/devel/gal2/Makefile
@@ -1,20 +1,18 @@
-# $NetBSD: Makefile,v 1.31 2005/02/22 18:23:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.32 2005/03/22 16:29:50 jmmv Exp $
 #
-# Check the API before updating this package!  gal-2.3 and above should
-# get their own gal24 package!
+# Check the API before updating this package!  gal-2.5 and above should
+# get their own gal26 package!
 #
 
-DISTNAME=	gal-2.2.5
+DISTNAME=	gal-2.4.0
 PKGNAME=	${DISTNAME:S/gal/gal2/}
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gal/2.2/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gal/2.4/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
-COMMENT=	Library functions that came from Gnumeric and Evolution (gal-2.2 API)
-
-BUILD_USES_MSGFMT=	yes
+COMMENT=	Library functions that came from Gnumeric and Evolution (gal-2.4 API)
 
 USE_X11=		yes
 USE_GNU_TOOLS+=		make
@@ -23,7 +21,7 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-PKGCONFIG_OVERRIDE+=	gal-2.2.pc.in
+PKGCONFIG_OVERRIDE+=	gal-2.4.pc.in
 
 CONFIGURE_ARGS=		--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
diff --git a/devel/gal2/PLIST b/devel/gal2/PLIST
index 030e8be9cb6..905552acf7a 100644
--- a/devel/gal2/PLIST
+++ b/devel/gal2/PLIST
@@ -1,259 +1,260 @@
-@comment $NetBSD: PLIST,v 1.6 2004/10/06 11:41:09 jmmv Exp $
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-cell-popup.h
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-cell-registry.h
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-cell-text.h
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-cell-toggle.h
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-cell-tree.h
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-cell.h
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-table-click-to-add.h
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-table-factory.h
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-table-item-factory.h
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-table-item.h
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-table.h
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-tree-factory.h
-include/gal-2.2/gal/a11y/e-table/gal-a11y-e-tree.h
-include/gal-2.2/gal/a11y/e-text/gal-a11y-e-text-factory.h
-include/gal-2.2/gal/a11y/e-text/gal-a11y-e-text.h
-include/gal-2.2/gal/a11y/gal-a11y-factory.h
-include/gal-2.2/gal/a11y/gal-a11y-util.h
-include/gal-2.2/gal/e-table/e-cell-checkbox.h
-include/gal-2.2/gal/e-table/e-cell-combo.h
-include/gal-2.2/gal/e-table/e-cell-date.h
-include/gal-2.2/gal/e-table/e-cell-float.h
-include/gal-2.2/gal/e-table/e-cell-number.h
-include/gal-2.2/gal/e-table/e-cell-pixbuf.h
-include/gal-2.2/gal/e-table/e-cell-popup.h
-include/gal-2.2/gal/e-table/e-cell-progress.h
-include/gal-2.2/gal/e-table/e-cell-size.h
-include/gal-2.2/gal/e-table/e-cell-spin-button.h
-include/gal-2.2/gal/e-table/e-cell-text.h
-include/gal-2.2/gal/e-table/e-cell-toggle.h
-include/gal-2.2/gal/e-table/e-cell-tree.h
-include/gal-2.2/gal/e-table/e-cell-vbox.h
-include/gal-2.2/gal/e-table/e-cell.h
-include/gal-2.2/gal/e-table/e-table-click-to-add.h
-include/gal-2.2/gal/e-table/e-table-col-dnd.h
-include/gal-2.2/gal/e-table/e-table-col.h
-include/gal-2.2/gal/e-table/e-table-column-specification.h
-include/gal-2.2/gal/e-table/e-table-config.h
-include/gal-2.2/gal/e-table/e-table-defines.h
-include/gal-2.2/gal/e-table/e-table-extras.h
-include/gal-2.2/gal/e-table/e-table-field-chooser-dialog.h
-include/gal-2.2/gal/e-table/e-table-field-chooser-item.h
-include/gal-2.2/gal/e-table/e-table-field-chooser.h
-include/gal-2.2/gal/e-table/e-table-group-container.h
-include/gal-2.2/gal/e-table/e-table-group-leaf.h
-include/gal-2.2/gal/e-table/e-table-group.h
-include/gal-2.2/gal/e-table/e-table-header-item.h
-include/gal-2.2/gal/e-table/e-table-header-utils.h
-include/gal-2.2/gal/e-table/e-table-header.h
-include/gal-2.2/gal/e-table/e-table-item.h
-include/gal-2.2/gal/e-table/e-table-memory-callbacks.h
-include/gal-2.2/gal/e-table/e-table-memory-store.h
-include/gal-2.2/gal/e-table/e-table-memory.h
-include/gal-2.2/gal/e-table/e-table-model.h
-include/gal-2.2/gal/e-table/e-table-one.h
-include/gal-2.2/gal/e-table/e-table-scrolled.h
-include/gal-2.2/gal/e-table/e-table-search.h
-include/gal-2.2/gal/e-table/e-table-selection-model.h
-include/gal-2.2/gal/e-table/e-table-simple.h
-include/gal-2.2/gal/e-table/e-table-sort-info.h
-include/gal-2.2/gal/e-table/e-table-sorted-variable.h
-include/gal-2.2/gal/e-table/e-table-sorted.h
-include/gal-2.2/gal/e-table/e-table-sorter.h
-include/gal-2.2/gal/e-table/e-table-sorting-utils.h
-include/gal-2.2/gal/e-table/e-table-specification.h
-include/gal-2.2/gal/e-table/e-table-state.h
-include/gal-2.2/gal/e-table/e-table-subset-variable.h
-include/gal-2.2/gal/e-table/e-table-subset.h
-include/gal-2.2/gal/e-table/e-table-tooltip.h
-include/gal-2.2/gal/e-table/e-table-utils.h
-include/gal-2.2/gal/e-table/e-table-without.h
-include/gal-2.2/gal/e-table/e-table.h
-include/gal-2.2/gal/e-table/e-tree-memory-callbacks.h
-include/gal-2.2/gal/e-table/e-tree-memory.h
-include/gal-2.2/gal/e-table/e-tree-model.h
-include/gal-2.2/gal/e-table/e-tree-scrolled.h
-include/gal-2.2/gal/e-table/e-tree-selection-model.h
-include/gal-2.2/gal/e-table/e-tree-sorted.h
-include/gal-2.2/gal/e-table/e-tree-table-adapter.h
-include/gal-2.2/gal/e-table/e-tree.h
-include/gal-2.2/gal/e-text/e-completion-callbacks.h
-include/gal-2.2/gal/e-text/e-completion-match.h
-include/gal-2.2/gal/e-text/e-completion-view.h
-include/gal-2.2/gal/e-text/e-completion.h
-include/gal-2.2/gal/e-text/e-entry.h
-include/gal-2.2/gal/e-text/e-table-text-model.h
-include/gal-2.2/gal/e-text/e-text-model-repos.h
-include/gal-2.2/gal/e-text/e-text-model-uri.h
-include/gal-2.2/gal/e-text/e-text-model.h
-include/gal-2.2/gal/e-text/e-text.h
-include/gal-2.2/gal/menus/gal-define-views-dialog.h
-include/gal-2.2/gal/menus/gal-define-views-model.h
-include/gal-2.2/gal/menus/gal-view-collection.h
-include/gal-2.2/gal/menus/gal-view-etable.h
-include/gal-2.2/gal/menus/gal-view-factory-etable.h
-include/gal-2.2/gal/menus/gal-view-factory.h
-include/gal-2.2/gal/menus/gal-view-instance-save-as-dialog.h
-include/gal-2.2/gal/menus/gal-view-instance.h
-include/gal-2.2/gal/menus/gal-view-new-dialog.h
-include/gal-2.2/gal/menus/gal-view.h
-include/gal-2.2/gal/shortcut-bar/e-group-bar.h
-include/gal-2.2/gal/shortcut-bar/e-icon-bar-bg-item.h
-include/gal-2.2/gal/shortcut-bar/e-icon-bar.h
-include/gal-2.2/gal/shortcut-bar/e-shortcut-bar.h
-include/gal-2.2/gal/shortcut-bar/e-shortcut-model.h
-include/gal-2.2/gal/shortcut-bar/e-vscrolled-bar.h
-include/gal-2.2/gal/util/e-bit-array.h
-include/gal-2.2/gal/util/e-cache.h
-include/gal-2.2/gal/util/e-iconv.h
-include/gal-2.2/gal/util/e-marshal.h
-include/gal-2.2/gal/util/e-sorter-array.h
-include/gal-2.2/gal/util/e-sorter.h
-include/gal-2.2/gal/util/e-text-event-processor-emacs-like.h
-include/gal-2.2/gal/util/e-text-event-processor-types.h
-include/gal-2.2/gal/util/e-text-event-processor.h
-include/gal-2.2/gal/util/e-util.h
-include/gal-2.2/gal/util/e-xml-utils.h
-include/gal-2.2/gal/widgets/color-group.h
-include/gal-2.2/gal/widgets/color-palette.h
-include/gal-2.2/gal/widgets/e-canvas-background.h
-include/gal-2.2/gal/widgets/e-canvas-utils.h
-include/gal-2.2/gal/widgets/e-canvas-vbox.h
-include/gal-2.2/gal/widgets/e-canvas.h
-include/gal-2.2/gal/widgets/e-categories-master-list-array.h
-include/gal-2.2/gal/widgets/e-categories-master-list-combo.h
-include/gal-2.2/gal/widgets/e-categories-master-list-dialog-model.h
-include/gal-2.2/gal/widgets/e-categories-master-list-dialog.h
-include/gal-2.2/gal/widgets/e-categories-master-list-option-menu.h
-include/gal-2.2/gal/widgets/e-categories-master-list.h
-include/gal-2.2/gal/widgets/e-categories.h
-include/gal-2.2/gal/widgets/e-colors.h
-include/gal-2.2/gal/widgets/e-cursors.h
-include/gal-2.2/gal/widgets/e-file-selection.h
-include/gal-2.2/gal/widgets/e-gui-utils.h
-include/gal-2.2/gal/widgets/e-hsv-utils.h
-include/gal-2.2/gal/widgets/e-option-menu.h
-include/gal-2.2/gal/widgets/e-popup-menu.h
-include/gal-2.2/gal/widgets/e-printable.h
-include/gal-2.2/gal/widgets/e-reflow-model.h
-include/gal-2.2/gal/widgets/e-reflow.h
-include/gal-2.2/gal/widgets/e-selection-model-array.h
-include/gal-2.2/gal/widgets/e-selection-model-simple.h
-include/gal-2.2/gal/widgets/e-selection-model.h
-include/gal-2.2/gal/widgets/e-unicode.h
-include/gal-2.2/gal/widgets/gal-combo-box.h
-include/gal-2.2/gal/widgets/gal-combo-stack.h
-include/gal-2.2/gal/widgets/gal-combo-text.h
-include/gal-2.2/gal/widgets/widget-color-combo.h
-include/gal-2.2/gal/widgets/widget-pixmap-combo.h
-lib/libgal-2.2.la
-lib/libgal-a11y-2.2.la
-lib/pkgconfig/gal-2.2.pc
-share/doc/gal-2.2/gal-api.html
-share/doc/gal-2.2/gal-api.sgml
-share/doc/gal-2.2/gal-decl.txt
-share/doc/gal-2.2/gal-sections.txt
-share/doc/gal-2.2/gal.hierarchy
-share/doc/gal-2.2/gal.signals
-share/doc/gal-2.2/gal.types
-share/gal-2.2/${PKGVERSION}/glade/e-categories-master-list-dialog.glade
-share/gal-2.2/${PKGVERSION}/glade/e-table-config-no-group.glade
-share/gal-2.2/${PKGVERSION}/glade/e-table-config.glade
-share/gal-2.2/${PKGVERSION}/glade/e-table-field-chooser.glade
-share/gal-2.2/${PKGVERSION}/glade/gal-categories.glade
-share/gal-2.2/${PKGVERSION}/glade/gal-define-views.glade
-share/gal-2.2/${PKGVERSION}/glade/gal-view-instance-save-as-dialog.glade
-share/gal-2.2/${PKGVERSION}/glade/gal-view-new-dialog.glade
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_birthday_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_business_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_favorites_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_gifts_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_goals_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_holiday-cards_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_holiday_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_hot-contacts_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_ideas_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_international_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_key-customer_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_miscellaneous_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_personal_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_phonecalls_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_status_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_strategies_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_suppliers_16.png
-share/gal-2.2/${PKGVERSION}/pixmaps/categories/category_time-and-expenses_16.png
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gal-2.2.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gal-2.2.mo
-@dirrm share/gal-2.2/${PKGVERSION}/pixmaps/categories
-@dirrm share/gal-2.2/${PKGVERSION}/pixmaps
-@dirrm share/gal-2.2/${PKGVERSION}/glade
-@dirrm share/gal-2.2/${PKGVERSION}
-@dirrm share/gal-2.2
-@dirrm share/doc/gal-2.2
-@dirrm include/gal-2.2/gal/widgets
-@dirrm include/gal-2.2/gal/util
-@dirrm include/gal-2.2/gal/shortcut-bar
-@dirrm include/gal-2.2/gal/menus
-@dirrm include/gal-2.2/gal/e-text
-@dirrm include/gal-2.2/gal/e-table
-@dirrm include/gal-2.2/gal/a11y/e-text
-@dirrm include/gal-2.2/gal/a11y/e-table
-@dirrm include/gal-2.2/gal/a11y
-@dirrm include/gal-2.2/gal
-@dirrm include/gal-2.2
+@comment $NetBSD: PLIST,v 1.7 2005/03/22 16:29:50 jmmv Exp $
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-cell-popup.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-cell-registry.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-cell-text.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-cell-toggle.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-cell-tree.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-cell-vbox.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-cell.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-table-click-to-add.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-table-factory.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-table-item-factory.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-table-item.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-table.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-tree-factory.h
+include/gal-2.4/gal/a11y/e-table/gal-a11y-e-tree.h
+include/gal-2.4/gal/a11y/e-text/gal-a11y-e-text-factory.h
+include/gal-2.4/gal/a11y/e-text/gal-a11y-e-text.h
+include/gal-2.4/gal/a11y/gal-a11y-factory.h
+include/gal-2.4/gal/a11y/gal-a11y-util.h
+include/gal-2.4/gal/e-table/e-cell-checkbox.h
+include/gal-2.4/gal/e-table/e-cell-combo.h
+include/gal-2.4/gal/e-table/e-cell-date.h
+include/gal-2.4/gal/e-table/e-cell-float.h
+include/gal-2.4/gal/e-table/e-cell-number.h
+include/gal-2.4/gal/e-table/e-cell-pixbuf.h
+include/gal-2.4/gal/e-table/e-cell-popup.h
+include/gal-2.4/gal/e-table/e-cell-progress.h
+include/gal-2.4/gal/e-table/e-cell-size.h
+include/gal-2.4/gal/e-table/e-cell-spin-button.h
+include/gal-2.4/gal/e-table/e-cell-text.h
+include/gal-2.4/gal/e-table/e-cell-toggle.h
+include/gal-2.4/gal/e-table/e-cell-tree.h
+include/gal-2.4/gal/e-table/e-cell-vbox.h
+include/gal-2.4/gal/e-table/e-cell.h
+include/gal-2.4/gal/e-table/e-table-click-to-add.h
+include/gal-2.4/gal/e-table/e-table-col-dnd.h
+include/gal-2.4/gal/e-table/e-table-col.h
+include/gal-2.4/gal/e-table/e-table-column-specification.h
+include/gal-2.4/gal/e-table/e-table-config.h
+include/gal-2.4/gal/e-table/e-table-defines.h
+include/gal-2.4/gal/e-table/e-table-extras.h
+include/gal-2.4/gal/e-table/e-table-field-chooser-dialog.h
+include/gal-2.4/gal/e-table/e-table-field-chooser-item.h
+include/gal-2.4/gal/e-table/e-table-field-chooser.h
+include/gal-2.4/gal/e-table/e-table-group-container.h
+include/gal-2.4/gal/e-table/e-table-group-leaf.h
+include/gal-2.4/gal/e-table/e-table-group.h
+include/gal-2.4/gal/e-table/e-table-header-item.h
+include/gal-2.4/gal/e-table/e-table-header-utils.h
+include/gal-2.4/gal/e-table/e-table-header.h
+include/gal-2.4/gal/e-table/e-table-item.h
+include/gal-2.4/gal/e-table/e-table-memory-callbacks.h
+include/gal-2.4/gal/e-table/e-table-memory-store.h
+include/gal-2.4/gal/e-table/e-table-memory.h
+include/gal-2.4/gal/e-table/e-table-model.h
+include/gal-2.4/gal/e-table/e-table-one.h
+include/gal-2.4/gal/e-table/e-table-scrolled.h
+include/gal-2.4/gal/e-table/e-table-search.h
+include/gal-2.4/gal/e-table/e-table-selection-model.h
+include/gal-2.4/gal/e-table/e-table-simple.h
+include/gal-2.4/gal/e-table/e-table-sort-info.h
+include/gal-2.4/gal/e-table/e-table-sorted-variable.h
+include/gal-2.4/gal/e-table/e-table-sorted.h
+include/gal-2.4/gal/e-table/e-table-sorter.h
+include/gal-2.4/gal/e-table/e-table-sorting-utils.h
+include/gal-2.4/gal/e-table/e-table-specification.h
+include/gal-2.4/gal/e-table/e-table-state.h
+include/gal-2.4/gal/e-table/e-table-subset-variable.h
+include/gal-2.4/gal/e-table/e-table-subset.h
+include/gal-2.4/gal/e-table/e-table-tooltip.h
+include/gal-2.4/gal/e-table/e-table-utils.h
+include/gal-2.4/gal/e-table/e-table-without.h
+include/gal-2.4/gal/e-table/e-table.h
+include/gal-2.4/gal/e-table/e-tree-memory-callbacks.h
+include/gal-2.4/gal/e-table/e-tree-memory.h
+include/gal-2.4/gal/e-table/e-tree-model.h
+include/gal-2.4/gal/e-table/e-tree-scrolled.h
+include/gal-2.4/gal/e-table/e-tree-selection-model.h
+include/gal-2.4/gal/e-table/e-tree-sorted.h
+include/gal-2.4/gal/e-table/e-tree-table-adapter.h
+include/gal-2.4/gal/e-table/e-tree.h
+include/gal-2.4/gal/e-text/e-completion-callbacks.h
+include/gal-2.4/gal/e-text/e-completion-match.h
+include/gal-2.4/gal/e-text/e-completion-view.h
+include/gal-2.4/gal/e-text/e-completion.h
+include/gal-2.4/gal/e-text/e-entry.h
+include/gal-2.4/gal/e-text/e-table-text-model.h
+include/gal-2.4/gal/e-text/e-text-model-repos.h
+include/gal-2.4/gal/e-text/e-text-model-uri.h
+include/gal-2.4/gal/e-text/e-text-model.h
+include/gal-2.4/gal/e-text/e-text.h
+include/gal-2.4/gal/menus/gal-define-views-dialog.h
+include/gal-2.4/gal/menus/gal-define-views-model.h
+include/gal-2.4/gal/menus/gal-view-collection.h
+include/gal-2.4/gal/menus/gal-view-etable.h
+include/gal-2.4/gal/menus/gal-view-factory-etable.h
+include/gal-2.4/gal/menus/gal-view-factory.h
+include/gal-2.4/gal/menus/gal-view-instance-save-as-dialog.h
+include/gal-2.4/gal/menus/gal-view-instance.h
+include/gal-2.4/gal/menus/gal-view-new-dialog.h
+include/gal-2.4/gal/menus/gal-view.h
+include/gal-2.4/gal/shortcut-bar/e-group-bar.h
+include/gal-2.4/gal/shortcut-bar/e-icon-bar-bg-item.h
+include/gal-2.4/gal/shortcut-bar/e-icon-bar.h
+include/gal-2.4/gal/shortcut-bar/e-shortcut-bar.h
+include/gal-2.4/gal/shortcut-bar/e-shortcut-model.h
+include/gal-2.4/gal/shortcut-bar/e-vscrolled-bar.h
+include/gal-2.4/gal/util/e-bit-array.h
+include/gal-2.4/gal/util/e-cache.h
+include/gal-2.4/gal/util/e-iconv.h
+include/gal-2.4/gal/util/e-marshal.h
+include/gal-2.4/gal/util/e-sorter-array.h
+include/gal-2.4/gal/util/e-sorter.h
+include/gal-2.4/gal/util/e-text-event-processor-emacs-like.h
+include/gal-2.4/gal/util/e-text-event-processor-types.h
+include/gal-2.4/gal/util/e-text-event-processor.h
+include/gal-2.4/gal/util/e-util.h
+include/gal-2.4/gal/util/e-xml-utils.h
+include/gal-2.4/gal/widgets/color-group.h
+include/gal-2.4/gal/widgets/color-palette.h
+include/gal-2.4/gal/widgets/e-canvas-background.h
+include/gal-2.4/gal/widgets/e-canvas-utils.h
+include/gal-2.4/gal/widgets/e-canvas-vbox.h
+include/gal-2.4/gal/widgets/e-canvas.h
+include/gal-2.4/gal/widgets/e-categories-master-list-array.h
+include/gal-2.4/gal/widgets/e-categories-master-list-combo.h
+include/gal-2.4/gal/widgets/e-categories-master-list-dialog-model.h
+include/gal-2.4/gal/widgets/e-categories-master-list-dialog.h
+include/gal-2.4/gal/widgets/e-categories-master-list-option-menu.h
+include/gal-2.4/gal/widgets/e-categories-master-list.h
+include/gal-2.4/gal/widgets/e-categories.h
+include/gal-2.4/gal/widgets/e-colors.h
+include/gal-2.4/gal/widgets/e-cursors.h
+include/gal-2.4/gal/widgets/e-file-selection.h
+include/gal-2.4/gal/widgets/e-gui-utils.h
+include/gal-2.4/gal/widgets/e-hsv-utils.h
+include/gal-2.4/gal/widgets/e-option-menu.h
+include/gal-2.4/gal/widgets/e-popup-menu.h
+include/gal-2.4/gal/widgets/e-printable.h
+include/gal-2.4/gal/widgets/e-reflow-model.h
+include/gal-2.4/gal/widgets/e-reflow.h
+include/gal-2.4/gal/widgets/e-selection-model-array.h
+include/gal-2.4/gal/widgets/e-selection-model-simple.h
+include/gal-2.4/gal/widgets/e-selection-model.h
+include/gal-2.4/gal/widgets/e-unicode.h
+include/gal-2.4/gal/widgets/gal-combo-box.h
+include/gal-2.4/gal/widgets/gal-combo-stack.h
+include/gal-2.4/gal/widgets/gal-combo-text.h
+include/gal-2.4/gal/widgets/widget-color-combo.h
+include/gal-2.4/gal/widgets/widget-pixmap-combo.h
+lib/libgal-2.4.la
+lib/libgal-a11y-2.4.la
+lib/pkgconfig/gal-2.4.pc
+share/doc/gal-2.4/gal-api.html
+share/doc/gal-2.4/gal-api.sgml
+share/doc/gal-2.4/gal-decl.txt
+share/doc/gal-2.4/gal-sections.txt
+share/doc/gal-2.4/gal.hierarchy
+share/doc/gal-2.4/gal.signals
+share/doc/gal-2.4/gal.types
+share/gal-2.4/${PKGVERSION}/glade/e-categories-master-list-dialog.glade
+share/gal-2.4/${PKGVERSION}/glade/e-table-config-no-group.glade
+share/gal-2.4/${PKGVERSION}/glade/e-table-config.glade
+share/gal-2.4/${PKGVERSION}/glade/e-table-field-chooser.glade
+share/gal-2.4/${PKGVERSION}/glade/gal-categories.glade
+share/gal-2.4/${PKGVERSION}/glade/gal-define-views.glade
+share/gal-2.4/${PKGVERSION}/glade/gal-view-instance-save-as-dialog.glade
+share/gal-2.4/${PKGVERSION}/glade/gal-view-new-dialog.glade
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_birthday_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_business_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_favorites_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_gifts_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_goals_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_holiday-cards_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_holiday_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_hot-contacts_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_ideas_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_international_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_key-customer_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_miscellaneous_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_personal_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_phonecalls_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_status_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_strategies_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_suppliers_16.png
+share/gal-2.4/${PKGVERSION}/pixmaps/categories/category_time-and-expenses_16.png
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gal-2.4.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gal-2.4.mo
+@dirrm share/gal-2.4/${PKGVERSION}/pixmaps/categories
+@dirrm share/gal-2.4/${PKGVERSION}/pixmaps
+@dirrm share/gal-2.4/${PKGVERSION}/glade
+@dirrm share/gal-2.4/${PKGVERSION}
+@dirrm share/gal-2.4
+@dirrm share/doc/gal-2.4
+@dirrm include/gal-2.4/gal/widgets
+@dirrm include/gal-2.4/gal/util
+@dirrm include/gal-2.4/gal/shortcut-bar
+@dirrm include/gal-2.4/gal/menus
+@dirrm include/gal-2.4/gal/e-text
+@dirrm include/gal-2.4/gal/e-table
+@dirrm include/gal-2.4/gal/a11y/e-text
+@dirrm include/gal-2.4/gal/a11y/e-table
+@dirrm include/gal-2.4/gal/a11y
+@dirrm include/gal-2.4/gal
+@dirrm include/gal-2.4
diff --git a/devel/gal2/buildlink3.mk b/devel/gal2/buildlink3.mk
index 36b826fc799..b288f30e4ef 100644
--- a/devel/gal2/buildlink3.mk
+++ b/devel/gal2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:27 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2005/03/22 16:29:50 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAL2_BUILDLINK3_MK:=	${GAL2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngal2}
 BUILDLINK_PACKAGES+=	gal2
 
 .if !empty(GAL2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gal2+=	gal2>=2.2.1
-BUILDLINK_RECOMMENDED.gal2+=	gal2>=2.2.1nb1
+BUILDLINK_DEPENDS.gal2+=	gal2>=2.4.0
+BUILDLINK_DEPENDS.gal2+=	gal2<2.5.0
 BUILDLINK_PKGSRCDIR.gal2?=	../../devel/gal2
 .endif	# GAL2_BUILDLINK3_MK
 
diff --git a/devel/gal2/distinfo b/devel/gal2/distinfo
index 90565a2a728..b16feeac834 100644
--- a/devel/gal2/distinfo
+++ b/devel/gal2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2005/02/23 22:24:14 agc Exp $
+$NetBSD: distinfo,v 1.12 2005/03/22 16:29:50 jmmv Exp $
 
-SHA1 (gal-2.2.5.tar.bz2) = 89014f457ebcfd1e895d595ac9e6a920461974e1
-RMD160 (gal-2.2.5.tar.bz2) = 9d70ef057d2189eec5d4eea5c3c48bf1811c28af
-Size (gal-2.2.5.tar.bz2) = 1160976 bytes
+SHA1 (gal-2.4.0.tar.bz2) = debf9c5653babb2733d19b7236e2eb8630852226
+RMD160 (gal-2.4.0.tar.bz2) = ff04de41f475010a1a30dedafc47c605b24aa091
+Size (gal-2.4.0.tar.bz2) = 1195949 bytes