8 files changed, 242 insertions, 258 deletions

diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 4f9566ed128c..002555dc9cd4 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gal2
-PORTVERSION=	1.99.11
-PORTREVISION=	1
+PORTVERSION=	2.2.3
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.99
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -21,14 +20,14 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomehier libgnomeui libgnomeprintui
-GNOME_HTML_DIR=	${PREFIX}/share/doc/gal2
+USE_GNOME=	gnomehack gnomeprefix gnomehier intlhack  \
+		libgnomeui libgnomeprintui
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--enable-static --with-libiconv
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	VERSION=${PORTVERSION}
+PLIST_SUB=	VERSION="2.2" PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo
index 1d9b453a115f..5730f3c4acc7 100644
--- a/x11-toolkits/gal2/distinfo
+++ b/x11-toolkits/gal2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gal-1.99.11.tar.bz2) = 906c0640d3160a55aac98974aecfb316
-SIZE (gnome2/gal-1.99.11.tar.bz2) = 949395
+MD5 (gnome2/gal-2.2.3.tar.bz2) = a50985fd1b70dc05cfc921455c39e660
+SIZE (gnome2/gal-2.2.3.tar.bz2) = 1161166
diff --git a/x11-toolkits/gal2/files/patch-ab b/x11-toolkits/gal2/files/patch-ab
index 1e3cce24db3c..53fe2cc71565 100644
--- a/x11-toolkits/gal2/files/patch-ab
+++ b/x11-toolkits/gal2/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Mar 12 01:22:39 2004
-+++ Makefile.in	Fri Mar 12 01:22:55 2004
-@@ -129,7 +129,7 @@
- YACC = @YACC@
+--- Makefile.in.orig	Fri Jun  4 17:24:13 2004
++++ Makefile.in	Fri Jun  4 17:25:02 2004
+@@ -145,7 +145,7 @@
+ am__quote = @am__quote@
  gnomelocaledir = @gnomelocaledir@
- 
+ install_sh = @install_sh@
 -SUBDIRS = po gal tests docs art
 +SUBDIRS = po gal docs art
  
  pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = gal-2.0.pc
+ pkgconfig_DATA = gal-2.2.pc
diff --git a/x11-toolkits/gal2/files/patch-configure b/x11-toolkits/gal2/files/patch-configure
deleted file mode 100644
index 97aea5b88117..000000000000
--- a/x11-toolkits/gal2/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Mon Aug 26 00:06:18 2002
-+++ configure	Mon Aug 26 00:06:32 2002
-@@ -8242,6 +8242,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/gal2/files/patch-po_da.po b/x11-toolkits/gal2/files/patch-po_da.po
index 0baf35467230..bcd97ad6fff8 100644
--- a/x11-toolkits/gal2/files/patch-po_da.po
+++ b/x11-toolkits/gal2/files/patch-po_da.po
@@ -1,5 +1,5 @@
---- po/da.po.orig	Sat Dec 27 20:57:22 2003
-+++ po/da.po	Sat Dec 27 20:57:29 2003
+--- po/da.po.orig	Sat Dec 27 21:03:49 2003
++++ po/da.po	Sat Dec 27 21:04:00 2003
 @@ -46,11 +46,11 @@
  
  #: gal/e-table/e-cell-date.c:96
diff --git a/x11-toolkits/gal2/files/patch-po_zh_CN.po b/x11-toolkits/gal2/files/patch-po_zh_CN.po
index 7d52a30f8c8a..b3072e58b078 100644
--- a/x11-toolkits/gal2/files/patch-po_zh_CN.po
+++ b/x11-toolkits/gal2/files/patch-po_zh_CN.po
@@ -1,34 +1,10 @@
---- po/zh_CN.po.orig	Sat Dec 27 20:58:11 2003
-+++ po/zh_CN.po	Sat Dec 27 20:58:38 2003
-@@ -31,32 +31,32 @@
- # gal/e-table/e-cell-date.c:58
- #: gal/e-table/e-cell-date.c:58
- msgid "%l:%M %p"
--msgstr "%-H:%M"
-+msgstr "%H:%M"
- 
- # gal/e-table/e-cell-date.c:66
- #: gal/e-table/e-cell-date.c:66
- msgid "Today %l:%M %p"
--msgstr "今天 %-H:%M"
-+msgstr "今天 %H:%M"
- 
- # gal/e-table/e-cell-date.c:81
- #: gal/e-table/e-cell-date.c:76
- msgid "Yesterday %l:%M %p"
--msgstr "昨天 %-H:%M"
-+msgstr "昨天 %H:%M"
- 
- # gal/e-table/e-cell-date.c:96
- #: gal/e-table/e-cell-date.c:88
- msgid "%a %l:%M %p"
--msgstr "%A %-H:%M"
-+msgstr "%A %H:%M"
- 
+--- po/zh_CN.po.orig	Fri Mar  5 12:17:59 2004
++++ po/zh_CN.po	Sat Mar  6 03:08:34 2004
+@@ -51,12 +51,12 @@
  # gal/e-table/e-cell-date.c:104
  #: gal/e-table/e-cell-date.c:96
  msgid "%b %d %l:%M %p"
--msgstr "%-m月%-d日 %-H:%M"
+-msgstr "%-m月%-d日 %H:%M"
 +msgstr "%m月%d日 %H:%M"
  
  # gal/e-table/e-cell-date.c:106
diff --git a/x11-toolkits/gal2/pkg-descr b/x11-toolkits/gal2/pkg-descr
index e2bbdf422ba7..edb487657c30 100644
--- a/x11-toolkits/gal2/pkg-descr
+++ b/x11-toolkits/gal2/pkg-descr
@@ -1,8 +1,4 @@
 GAL is a collection of widgets and utility routines that were taken
 from Evolution and Gnumeric.
   
-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.
-
 WWW: http://www.gnome.org/
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index b0d9373544eb..ff1d616bfb3c 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -1,208 +1,230 @@
-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/gal-combo-box.h
-include/gal-2.0/gal/widgets/gal-combo-stack.h
-include/gal-2.0/gal/widgets/gal-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.so
-lib/libgal-2.0.so.6
-lib/libgal-a11y-2.0.a
-lib/libgal-a11y-2.0.so
-lib/libgal-a11y-2.0.so.6
-libdata/pkgconfig/gal-2.0.pc
-share/doc/gal2/gal-api.html
-share/doc/gal2/gal-api.sgml
-share/doc/gal2/gal-decl.txt
-share/doc/gal2/gal-sections.txt
-share/doc/gal2/gal.hierarchy
-share/doc/gal2/gal.signals
-share/doc/gal2/gal.types
-share/gnome/gal-2.0/%%VERSION%%/glade/e-categories-master-list-dialog.glade
-share/gnome/gal-2.0/%%VERSION%%/glade/e-table-config-no-group.glade
-share/gnome/gal-2.0/%%VERSION%%/glade/e-table-config.glade
-share/gnome/gal-2.0/%%VERSION%%/glade/e-table-field-chooser.glade
-share/gnome/gal-2.0/%%VERSION%%/glade/gal-categories.glade
-share/gnome/gal-2.0/%%VERSION%%/glade/gal-define-views.glade
-share/gnome/gal-2.0/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
-share/gnome/gal-2.0/%%VERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_birthday_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_business_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_favorites_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_gifts_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_goals_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_holiday-cards_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_holiday_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_hot-contacts_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_ideas_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_international_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_key-customer_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_miscellaneous_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_personal_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_phonecalls_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_status_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_strategies_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_suppliers_16.png
-share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_time-and-expenses_16.png
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-popup.h
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-registry.h
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-text.h
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-toggle.h
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-tree.h
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell.h
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-click-to-add.h
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-factory.h
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-item-factory.h
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-item.h
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table.h
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-tree-factory.h
+include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-tree.h
+include/gal-%%VERSION%%/gal/a11y/e-text/gal-a11y-e-text-factory.h
+include/gal-%%VERSION%%/gal/a11y/e-text/gal-a11y-e-text.h
+include/gal-%%VERSION%%/gal/a11y/gal-a11y-factory.h
+include/gal-%%VERSION%%/gal/a11y/gal-a11y-util.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-checkbox.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-combo.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-date.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-float.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-number.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-pixbuf.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-popup.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-progress.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-size.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-spin-button.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-text.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-toggle.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-tree.h
+include/gal-%%VERSION%%/gal/e-table/e-cell-vbox.h
+include/gal-%%VERSION%%/gal/e-table/e-cell.h
+include/gal-%%VERSION%%/gal/e-table/e-table-click-to-add.h
+include/gal-%%VERSION%%/gal/e-table/e-table-col-dnd.h
+include/gal-%%VERSION%%/gal/e-table/e-table-col.h
+include/gal-%%VERSION%%/gal/e-table/e-table-column-specification.h
+include/gal-%%VERSION%%/gal/e-table/e-table-config.h
+include/gal-%%VERSION%%/gal/e-table/e-table-defines.h
+include/gal-%%VERSION%%/gal/e-table/e-table-extras.h
+include/gal-%%VERSION%%/gal/e-table/e-table-field-chooser-dialog.h
+include/gal-%%VERSION%%/gal/e-table/e-table-field-chooser-item.h
+include/gal-%%VERSION%%/gal/e-table/e-table-field-chooser.h
+include/gal-%%VERSION%%/gal/e-table/e-table-group-container.h
+include/gal-%%VERSION%%/gal/e-table/e-table-group-leaf.h
+include/gal-%%VERSION%%/gal/e-table/e-table-group.h
+include/gal-%%VERSION%%/gal/e-table/e-table-header-item.h
+include/gal-%%VERSION%%/gal/e-table/e-table-header-utils.h
+include/gal-%%VERSION%%/gal/e-table/e-table-header.h
+include/gal-%%VERSION%%/gal/e-table/e-table-item.h
+include/gal-%%VERSION%%/gal/e-table/e-table-memory-callbacks.h
+include/gal-%%VERSION%%/gal/e-table/e-table-memory-store.h
+include/gal-%%VERSION%%/gal/e-table/e-table-memory.h
+include/gal-%%VERSION%%/gal/e-table/e-table-model.h
+include/gal-%%VERSION%%/gal/e-table/e-table-one.h
+include/gal-%%VERSION%%/gal/e-table/e-table-scrolled.h
+include/gal-%%VERSION%%/gal/e-table/e-table-search.h
+include/gal-%%VERSION%%/gal/e-table/e-table-selection-model.h
+include/gal-%%VERSION%%/gal/e-table/e-table-simple.h
+include/gal-%%VERSION%%/gal/e-table/e-table-sort-info.h
+include/gal-%%VERSION%%/gal/e-table/e-table-sorted-variable.h
+include/gal-%%VERSION%%/gal/e-table/e-table-sorted.h
+include/gal-%%VERSION%%/gal/e-table/e-table-sorter.h
+include/gal-%%VERSION%%/gal/e-table/e-table-sorting-utils.h
+include/gal-%%VERSION%%/gal/e-table/e-table-specification.h
+include/gal-%%VERSION%%/gal/e-table/e-table-state.h
+include/gal-%%VERSION%%/gal/e-table/e-table-subset-variable.h
+include/gal-%%VERSION%%/gal/e-table/e-table-subset.h
+include/gal-%%VERSION%%/gal/e-table/e-table-tooltip.h
+include/gal-%%VERSION%%/gal/e-table/e-table-utils.h
+include/gal-%%VERSION%%/gal/e-table/e-table-without.h
+include/gal-%%VERSION%%/gal/e-table/e-table.h
+include/gal-%%VERSION%%/gal/e-table/e-tree-memory-callbacks.h
+include/gal-%%VERSION%%/gal/e-table/e-tree-memory.h
+include/gal-%%VERSION%%/gal/e-table/e-tree-model.h
+include/gal-%%VERSION%%/gal/e-table/e-tree-scrolled.h
+include/gal-%%VERSION%%/gal/e-table/e-tree-selection-model.h
+include/gal-%%VERSION%%/gal/e-table/e-tree-sorted.h
+include/gal-%%VERSION%%/gal/e-table/e-tree-table-adapter.h
+include/gal-%%VERSION%%/gal/e-table/e-tree.h
+include/gal-%%VERSION%%/gal/e-text/e-completion-callbacks.h
+include/gal-%%VERSION%%/gal/e-text/e-completion-match.h
+include/gal-%%VERSION%%/gal/e-text/e-completion-view.h
+include/gal-%%VERSION%%/gal/e-text/e-completion.h
+include/gal-%%VERSION%%/gal/e-text/e-entry.h
+include/gal-%%VERSION%%/gal/e-text/e-table-text-model.h
+include/gal-%%VERSION%%/gal/e-text/e-text-model-repos.h
+include/gal-%%VERSION%%/gal/e-text/e-text-model-uri.h
+include/gal-%%VERSION%%/gal/e-text/e-text-model.h
+include/gal-%%VERSION%%/gal/e-text/e-text.h
+include/gal-%%VERSION%%/gal/menus/gal-define-views-dialog.h
+include/gal-%%VERSION%%/gal/menus/gal-define-views-model.h
+include/gal-%%VERSION%%/gal/menus/gal-view-collection.h
+include/gal-%%VERSION%%/gal/menus/gal-view-etable.h
+include/gal-%%VERSION%%/gal/menus/gal-view-factory-etable.h
+include/gal-%%VERSION%%/gal/menus/gal-view-factory.h
+include/gal-%%VERSION%%/gal/menus/gal-view-instance-save-as-dialog.h
+include/gal-%%VERSION%%/gal/menus/gal-view-instance.h
+include/gal-%%VERSION%%/gal/menus/gal-view-new-dialog.h
+include/gal-%%VERSION%%/gal/menus/gal-view.h
+include/gal-%%VERSION%%/gal/shortcut-bar/e-group-bar.h
+include/gal-%%VERSION%%/gal/shortcut-bar/e-icon-bar-bg-item.h
+include/gal-%%VERSION%%/gal/shortcut-bar/e-icon-bar.h
+include/gal-%%VERSION%%/gal/shortcut-bar/e-shortcut-bar.h
+include/gal-%%VERSION%%/gal/shortcut-bar/e-shortcut-model.h
+include/gal-%%VERSION%%/gal/shortcut-bar/e-vscrolled-bar.h
+include/gal-%%VERSION%%/gal/util/e-bit-array.h
+include/gal-%%VERSION%%/gal/util/e-cache.h
+include/gal-%%VERSION%%/gal/util/e-iconv.h
+include/gal-%%VERSION%%/gal/util/e-marshal.h
+include/gal-%%VERSION%%/gal/util/e-sorter-array.h
+include/gal-%%VERSION%%/gal/util/e-sorter.h
+include/gal-%%VERSION%%/gal/util/e-text-event-processor-emacs-like.h
+include/gal-%%VERSION%%/gal/util/e-text-event-processor-types.h
+include/gal-%%VERSION%%/gal/util/e-text-event-processor.h
+include/gal-%%VERSION%%/gal/util/e-util.h
+include/gal-%%VERSION%%/gal/util/e-xml-utils.h
+include/gal-%%VERSION%%/gal/widgets/color-group.h
+include/gal-%%VERSION%%/gal/widgets/color-palette.h
+include/gal-%%VERSION%%/gal/widgets/e-canvas-background.h
+include/gal-%%VERSION%%/gal/widgets/e-canvas-utils.h
+include/gal-%%VERSION%%/gal/widgets/e-canvas-vbox.h
+include/gal-%%VERSION%%/gal/widgets/e-canvas.h
+include/gal-%%VERSION%%/gal/widgets/e-categories-master-list-array.h
+include/gal-%%VERSION%%/gal/widgets/e-categories-master-list-combo.h
+include/gal-%%VERSION%%/gal/widgets/e-categories-master-list-dialog-model.h
+include/gal-%%VERSION%%/gal/widgets/e-categories-master-list-dialog.h
+include/gal-%%VERSION%%/gal/widgets/e-categories-master-list-option-menu.h
+include/gal-%%VERSION%%/gal/widgets/e-categories-master-list.h
+include/gal-%%VERSION%%/gal/widgets/e-categories.h
+include/gal-%%VERSION%%/gal/widgets/e-colors.h
+include/gal-%%VERSION%%/gal/widgets/e-cursors.h
+include/gal-%%VERSION%%/gal/widgets/e-file-selection.h
+include/gal-%%VERSION%%/gal/widgets/e-gui-utils.h
+include/gal-%%VERSION%%/gal/widgets/e-hsv-utils.h
+include/gal-%%VERSION%%/gal/widgets/e-option-menu.h
+include/gal-%%VERSION%%/gal/widgets/e-popup-menu.h
+include/gal-%%VERSION%%/gal/widgets/e-printable.h
+include/gal-%%VERSION%%/gal/widgets/e-reflow-model.h
+include/gal-%%VERSION%%/gal/widgets/e-reflow.h
+include/gal-%%VERSION%%/gal/widgets/e-selection-model-array.h
+include/gal-%%VERSION%%/gal/widgets/e-selection-model-simple.h
+include/gal-%%VERSION%%/gal/widgets/e-selection-model.h
+include/gal-%%VERSION%%/gal/widgets/e-unicode.h
+include/gal-%%VERSION%%/gal/widgets/gal-combo-box.h
+include/gal-%%VERSION%%/gal/widgets/gal-combo-stack.h
+include/gal-%%VERSION%%/gal/widgets/gal-combo-text.h
+include/gal-%%VERSION%%/gal/widgets/widget-color-combo.h
+include/gal-%%VERSION%%/gal/widgets/widget-pixmap-combo.h
+lib/libgal-%%VERSION%%.a
+lib/libgal-%%VERSION%%.so
+lib/libgal-%%VERSION%%.so.1
+lib/libgal-a11y-%%VERSION%%.a
+lib/libgal-a11y-%%VERSION%%.so
+lib/libgal-a11y-%%VERSION%%.so.1
+libdata/pkgconfig/gal-%%VERSION%%.pc
+share/doc/gal-%%VERSION%%/gal-api.html
+share/doc/gal-%%VERSION%%/gal-api.sgml
+share/doc/gal-%%VERSION%%/gal-decl.txt
+share/doc/gal-%%VERSION%%/gal-sections.txt
+share/doc/gal-%%VERSION%%/gal.hierarchy
+share/doc/gal-%%VERSION%%/gal.signals
+share/doc/gal-%%VERSION%%/gal.types
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-categories-master-list-dialog.glade
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config-no-group.glade
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config.glade
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-field-chooser.glade
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-categories.glade
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-define-views.glade
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-view-instance-save-as-dialog.glade
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-view-new-dialog.glade
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_birthday_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_business_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_favorites_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_gifts_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_goals_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_holiday-cards_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_holiday_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_hot-contacts_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_ideas_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_international_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_key-customer_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_miscellaneous_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_personal_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_phonecalls_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_status_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_strategies_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_suppliers_16.png
+share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_time-and-expenses_16.png
 share/locale/am/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/ar/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/be/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/bn/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/bs/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/eu/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/fr/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/gl/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/gu/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/hr/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/id/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/lv/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/mn/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/ms/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/nn/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/no/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/pa/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/pt/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/pt_BR/LC_MESSAGES/gal-%%VERSION%%.mo
@@ -210,30 +232,31 @@ share/locale/ro/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/sl/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/sr/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/sr@Latn/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/ta/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/gal-%%VERSION%%.mo
-@dirrm share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories
-@dirrm share/gnome/gal-2.0/%%VERSION%%/pixmaps
-@dirrm share/gnome/gal-2.0/%%VERSION%%/glade
-@dirrm share/gnome/gal-2.0/%%VERSION%%
-@dirrm share/gnome/gal-2.0
-@dirrm share/doc/gal2/gal
-@dirrm share/doc/gal2
-@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
+@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories
+@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps
+@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade
+@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%
+@dirrm share/gnome/gal-%%VERSION%%
+@dirrm share/doc/gal-%%VERSION%%
+@dirrm include/gal-%%VERSION%%/gal/widgets
+@dirrm include/gal-%%VERSION%%/gal/util
+@dirrm include/gal-%%VERSION%%/gal/shortcut-bar
+@dirrm include/gal-%%VERSION%%/gal/menus
+@dirrm include/gal-%%VERSION%%/gal/e-text
+@dirrm include/gal-%%VERSION%%/gal/e-table
+@dirrm include/gal-%%VERSION%%/gal/a11y/e-text
+@dirrm include/gal-%%VERSION%%/gal/a11y/e-table
+@dirrm include/gal-%%VERSION%%/gal/a11y
+@dirrm include/gal-%%VERSION%%/gal
+@dirrm include/gal-%%VERSION%%