4 files changed, 72 insertions, 61 deletions

diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 986a574937a5..1c9d9334b285 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gal
-PORTVERSION=	0.19.3
+PORTVERSION=	0.21
 CATEGORIES?=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gal/0.19
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.21
 DIST_SUBDIR=	gnome
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gal/distinfo b/x11-toolkits/gal/distinfo
index 74ea016354cf..e46b6a1dd9a9 100644
--- a/x11-toolkits/gal/distinfo
+++ b/x11-toolkits/gal/distinfo
@@ -1 +1 @@
-MD5 (gnome/gal-0.19.3.tar.bz2) = 996294dd9364c6d01f3d8d016d42a127
+MD5 (gnome/gal-0.21.tar.bz2) = 6fc4f5faad1d3a0699dca6cf6fd49b63
diff --git a/x11-toolkits/gal/files/patch-ab b/x11-toolkits/gal/files/patch-ab
index 62d17daa6e7c..d99efe8f048c 100644
--- a/x11-toolkits/gal/files/patch-ab
+++ b/x11-toolkits/gal/files/patch-ab
@@ -1,17 +1,14 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Fri Sep 28 12:30:28 2001
-+++ Makefile.in	Fri Sep 28 12:37:31 2001
-@@ -141,9 +141,9 @@
+--- Makefile.in.orig	Tue Oct 15 16:51:17 2002
++++ Makefile.in	Tue Oct 15 16:52:07 2002
+@@ -154,9 +154,9 @@
  gnomelocaledir = @gnomelocaledir@
  l = @l@
  
--SUBDIRS = gal po intl tests docs art
-+SUBDIRS = gal po intl docs art
+-SUBDIRS = gal po intl tests docs art macros
++SUBDIRS = gal po intl docs art macros
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = galConf.sh 
  
- EXTRA_DIST =  	gal.spec.in			galConf.sh.in			MAINTAINERS			AUTHORS				xml-i18n-extract.in		xml-i18n-merge.in		xml-i18n-update.in
+ EXTRA_DIST = \
diff --git a/x11-toolkits/gal/pkg-plist b/x11-toolkits/gal/pkg-plist
index 35c042a5026a..a83635345bf7 100644
--- a/x11-toolkits/gal/pkg-plist
+++ b/x11-toolkits/gal/pkg-plist
@@ -9,11 +9,13 @@ 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
@@ -33,10 +35,12 @@ 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
@@ -75,6 +79,8 @@ 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
@@ -106,14 +112,17 @@ 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
@@ -131,7 +140,7 @@ include/gal/widgets/widget-color-combo.h
 include/gal/widgets/widget-pixmap-combo.h
 lib/libgal.a
 lib/libgal.so
-lib/libgal.so.19
+lib/libgal.so.21
 share/doc/gal/gal-api.sgml
 share/doc/gal/gal-decl.txt
 share/doc/gal/gal-sections.txt
@@ -146,54 +155,59 @@ share/gnome/gal/%%VERSION%%/glade/e-categories-master-list-dialog.glade
 share/gnome/gal/%%VERSION%%/glade/gal-categories.glade
 share/gnome/gal/%%VERSION%%/glade/gal-define-views.glade
 share/gnome/gal/%%VERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/pixmaps/gal/categories/category_birthday_16.png
-share/gnome/pixmaps/gal/categories/category_business_16.png
-share/gnome/pixmaps/gal/categories/category_favorites_16.png
-share/gnome/pixmaps/gal/categories/category_gifts_16.png
-share/gnome/pixmaps/gal/categories/category_goals_16.png
-share/gnome/pixmaps/gal/categories/category_holiday-cards_16.png
-share/gnome/pixmaps/gal/categories/category_holiday_16.png
-share/gnome/pixmaps/gal/categories/category_hot-contacts_16.png
-share/gnome/pixmaps/gal/categories/category_ideas_16.png
-share/gnome/pixmaps/gal/categories/category_international_16.png
-share/gnome/pixmaps/gal/categories/category_key-customer_16.png
-share/gnome/pixmaps/gal/categories/category_miscellaneous_16.png
-share/gnome/pixmaps/gal/categories/category_personal_16.png
-share/gnome/pixmaps/gal/categories/category_phonecalls_16.png
-share/gnome/pixmaps/gal/categories/category_status_16.png
-share/gnome/pixmaps/gal/categories/category_strategies_16.png
-share/gnome/pixmaps/gal/categories/category_suppliers_16.png
-share/gnome/pixmaps/gal/categories/category_time-and-expenses_16.png
-share/locale/az/LC_MESSAGES/gal.mo
-share/locale/ca/LC_MESSAGES/gal.mo
-share/locale/cs/LC_MESSAGES/gal.mo
-share/locale/da/LC_MESSAGES/gal.mo
-share/locale/de/LC_MESSAGES/gal.mo
-share/locale/en_GB/LC_MESSAGES/gal.mo
-share/locale/es/LC_MESSAGES/gal.mo
-share/locale/fi/LC_MESSAGES/gal.mo
-share/locale/fr/LC_MESSAGES/gal.mo
-share/locale/gl/LC_MESSAGES/gal.mo
-share/locale/hu/LC_MESSAGES/gal.mo
-share/locale/it/LC_MESSAGES/gal.mo
-share/locale/ja/LC_MESSAGES/gal.mo
-share/locale/ko/LC_MESSAGES/gal.mo
-share/locale/lt/LC_MESSAGES/gal.mo
-share/locale/nn/LC_MESSAGES/gal.mo
-share/locale/no/LC_MESSAGES/gal.mo
-share/locale/pl/LC_MESSAGES/gal.mo
-share/locale/pt/LC_MESSAGES/gal.mo
-share/locale/pt_BR/LC_MESSAGES/gal.mo
-share/locale/ro/LC_MESSAGES/gal.mo
-share/locale/ru/LC_MESSAGES/gal.mo
-share/locale/sk/LC_MESSAGES/gal.mo
-share/locale/sv/LC_MESSAGES/gal.mo
-share/locale/ta/LC_MESSAGES/gal.mo
-share/locale/tr/LC_MESSAGES/gal.mo
-share/locale/uk/LC_MESSAGES/gal.mo
-share/locale/zh_TW/LC_MESSAGES/gal.mo
-@dirrm share/gnome/pixmaps/gal/categories
-@dirrm share/gnome/pixmaps/gal
+share/gnome/gal/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_birthday_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_business_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_favorites_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_gifts_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_goals_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_holiday-cards_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_holiday_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_hot-contacts_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_ideas_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_international_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_key-customer_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_miscellaneous_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_personal_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_phonecalls_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_status_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_strategies_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_suppliers_16.png
+share/gnome/gal/%%VERSION%%/pixmaps/categories/category_time-and-expenses_16.png
+share/locale/az/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_GB/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/es/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/gl/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/hu/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/ms/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/no/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
+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/sv/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/uk/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/%%VERSION%%/pixmaps/categories
+@dirrm share/gnome/gal/%%VERSION%%/pixmaps
 @dirrm share/gnome/gal/%%VERSION%%/glade
 @dirrm share/gnome/gal/%%VERSION%%
 @dirrm share/gnome/gal