8 files changed, 107 insertions, 53 deletions

diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 725f935a6428..4a68461fcfce 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gal2
-PORTVERSION=	2.2.5
+PORTVERSION=	2.4.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -18,16 +18,26 @@ COMMENT=	A collection of widgets taken from GNOME 2 gnumeric
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomehier intlhack  \
-		libgnomeui libgnomeprintui
+USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--enable-static --with-libiconv
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	VERSION="2.2" PORTVERSION=${PORTVERSION}
+PLIST_SUB=	VERSION="2.4" PORTVERSION=${PORTVERSION}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-patch:
+.if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
+	( ${OSVERSION} < 503101 )
+.for po in da.po it.po zh_CN.po
+	@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
+.endfor
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo
index 21f4dd3ebea6..968e15ec11db 100644
--- a/x11-toolkits/gal2/distinfo
+++ b/x11-toolkits/gal2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gal-2.2.5.tar.bz2) = a3face85eb306dffd773fe8812912882
-SIZE (gnome2/gal-2.2.5.tar.bz2) = 1160976
+MD5 (gnome2/gal-2.4.0.tar.bz2) = ce94075fa92400328ff02d7b8f3c7f3a
+SIZE (gnome2/gal-2.4.0.tar.bz2) = 1195949
diff --git a/x11-toolkits/gal2/files/patch-ab b/x11-toolkits/gal2/files/patch-ab
index 53fe2cc71565..6555fe4ac75a 100644
--- a/x11-toolkits/gal2/files/patch-ab
+++ b/x11-toolkits/gal2/files/patch-ab
@@ -1,11 +1,11 @@
---- 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@
+--- Makefile.in.orig	Tue Nov  2 02:03:06 2004
++++ Makefile.in	Tue Nov  2 02:03:16 2004
+@@ -197,7 +197,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -SUBDIRS = po gal tests docs art
 +SUBDIRS = po gal docs art
  
- pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = gal-2.2.pc
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = \
diff --git a/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c
new file mode 100644
index 000000000000..f1ad3a4502de
--- /dev/null
+++ b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c
@@ -0,0 +1,30 @@
+--- gal/a11y/e-table/gal-a11y-e-cell-text.c.orig	Wed Feb  9 23:01:26 2005
++++ gal/a11y/e-table/gal-a11y-e-cell-text.c	Wed Feb  9 23:02:02 2005
+@@ -152,11 +152,12 @@
+ 	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
+ 	gunichar ret_val;
+ 	gchar *at_offset;
++	gchar *full_text;
+ 
+ 	if (!ect_check (text))
+ 		return -1;
+ 
+-	gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
++	full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
+ 	at_offset = g_utf8_offset_to_pointer (full_text, offset);
+ 	ret_val = g_utf8_get_char_validated (at_offset, -1);
+ 	g_free (full_text);
+@@ -236,11 +237,12 @@
+ {
+ 	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
+ 	gint ret_val;
++	gchar *full_text;
+ 
+ 	if (!ect_check (text))
+ 		return -1;
+ 
+-	gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
++	full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
+ 
+ 	ret_val = g_utf8_strlen (full_text, -1);
+ 	g_free (full_text);
diff --git a/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c
new file mode 100644
index 000000000000..cfde6c47c47b
--- /dev/null
+++ b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c
@@ -0,0 +1,46 @@
+--- gal/a11y/e-table/gal-a11y-e-cell-vbox.c.orig	Wed Feb  9 23:03:24 2005
++++ gal/a11y/e-table/gal-a11y-e-cell-vbox.c	Wed Feb  9 23:04:46 2005
+@@ -31,8 +31,9 @@
+ static gint
+ ecv_get_n_children (AtkObject *a11y)
+ {
++	GalA11yECellVbox *gaev;
+ 	g_return_val_if_fail (GAL_A11Y_IS_E_CELL_VBOX (a11y), 0);
+-	GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y);
++	gaev = GAL_A11Y_E_CELL_VBOX (a11y);
+ 	return (gaev->a11y_subcell_count);
+ }
+ 
+@@ -64,9 +65,10 @@
+ 	if (i < gaev->a11y_subcell_count) {
+ 		if (gaev->a11y_subcells[i] == NULL) {
+ 			gint model_col, row;
++			ECellView *subcell_view;
+ 			row = gaec->row;
+ 			model_col = ecvv->model_cols[i];
+-			ECellView *subcell_view = ecvv->subcell_views[i];
++			subcell_view = ecvv->subcell_views[i];
+ 			ret = gal_a11y_e_cell_registry_get_object (NULL,
+ 				gaec->item,
+ 				subcell_view,
+@@ -200,14 +202,17 @@
+ 					 int         row)
+ {
+ 	AtkObject *a11y;
++	GalA11yECell *gaec;
++	GalA11yECellVbox *gaev;
++	ECellVboxView *ecvv;
+ 
+ 	a11y = g_object_new (gal_a11y_e_cell_vbox_get_type (), NULL);
+ 	
+ 	gal_a11y_e_cell_construct (a11y, item, cell_view, parent, model_col, view_col, row);
+ 
+-	GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y);
+-	GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y);
+-	ECellVboxView *ecvv = (ECellVboxView *) (gaec->cell_view);
++	gaec = GAL_A11Y_E_CELL (a11y);
++	gaev = GAL_A11Y_E_CELL_VBOX (a11y);
++	ecvv = (ECellVboxView *) (gaec->cell_view);
+ 	gaev->a11y_subcell_count = ecvv->subcell_view_count; 
+ 	gaev->a11y_subcells = g_malloc0 (sizeof(AtkObject *)*gaev->a11y_subcell_count);
+ 	return a11y;
diff --git a/x11-toolkits/gal2/files/patch-po_da.po b/x11-toolkits/gal2/files/patch-po_da.po
deleted file mode 100644
index bcd97ad6fff8..000000000000
--- a/x11-toolkits/gal2/files/patch-po_da.po
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
- msgid "%b %d %l:%M %p"
--msgstr "%-d. %b. %H:%M"
-+msgstr "%d. %b. %H:%M"
- 
- #: gal/e-table/e-cell-date.c:98
- msgid "%b %d %Y"
--msgstr "%-d. %b %Y"
-+msgstr "%d. %b %Y"
- 
- #: gal/e-table/e-cell-pixbuf.c:392
- msgid "Selected Column"
diff --git a/x11-toolkits/gal2/files/patch-po_zh_CN.po b/x11-toolkits/gal2/files/patch-po_zh_CN.po
deleted file mode 100644
index b3072e58b078..000000000000
--- a/x11-toolkits/gal2/files/patch-po_zh_CN.po
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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"
- 
- # gal/e-table/e-cell-date.c:106
- #: gal/e-table/e-cell-date.c:98
- msgid "%b %d %Y"
--msgstr "%Y年%-m月%-d日"
-+msgstr "%Y年%m月%d日"
- 
- #: gal/e-table/e-cell-pixbuf.c:392
- msgid "Selected Column"
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index ff1d616bfb3c..4715f0ed6751 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -3,6 +3,7 @@ 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-vbox.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
@@ -149,10 +150,10 @@ 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-%%VERSION%%.so.0
 lib/libgal-a11y-%%VERSION%%.a
 lib/libgal-a11y-%%VERSION%%.so
-lib/libgal-a11y-%%VERSION%%.so.1
+lib/libgal-a11y-%%VERSION%%.so.0
 libdata/pkgconfig/gal-%%VERSION%%.pc
 share/doc/gal-%%VERSION%%/gal-api.html
 share/doc/gal-%%VERSION%%/gal-api.sgml
@@ -196,6 +197,7 @@ 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/cy/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
@@ -209,10 +211,9 @@ 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/hr/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