Update to 1.99.2.

5 files changed, 16 insertions, 30 deletions

diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 27dce1b0fcf1..45421dc61cf0 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gal2
-PORTVERSION=	1.99.1
+PORTVERSION=	1.99.2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gal/1.99
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.99
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo
index 95d431ce2f9e..4b54c0a64ee3 100644
--- a/x11-toolkits/gal2/distinfo
+++ b/x11-toolkits/gal2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gal-1.99.1.tar.bz2) = 7ce5122053c46a2b5c4445c30cc860b1
+MD5 (gnome2/gal-1.99.2.tar.bz2) = 51236a16ec342f89054632ba07a2302b
diff --git a/x11-toolkits/gal2/files/patch-ab b/x11-toolkits/gal2/files/patch-ab
index afb0bf27a3fa..f5c318be1758 100644
--- a/x11-toolkits/gal2/files/patch-ab
+++ b/x11-toolkits/gal2/files/patch-ab
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Sun Aug 25 23:54:37 2002
-+++ Makefile.in	Sun Aug 25 23:54:47 2002
-@@ -129,7 +129,7 @@
+--- Makefile.in.orig	Wed Mar 12 22:10:55 2003
++++ Makefile.in	Wed Mar 12 22:11:26 2003
+@@ -138,7 +138,7 @@
  cxxflags_set = @cxxflags_set@
  gnomelocaledir = @gnomelocaledir@
- 
+ install_sh = @install_sh@
 -SUBDIRS = gal tests docs art
 +SUBDIRS = gal docs art
  
diff --git a/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c b/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c
index 69c179628356..4ddea93df5a4 100644
--- a/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c
+++ b/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c
@@ -1,26 +1,11 @@
---- gal/e-table/e-table-group.c.orig	Wed Nov 20 10:02:06 2002
-+++ gal/e-table/e-table-group.c	Thu Feb  6 22:35:27 2003
-@@ -22,6 +22,7 @@
-  */
- 
- #include <config.h>
-+#include <stdarg.h>
- #include <gtk/gtksignal.h>
- #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
- #include "e-table-group.h"
-@@ -128,13 +129,14 @@
- 			 ETableHeader     *header,
- 			 ETableModel      *model)
- {
-+	va_list args;
- 	etg->full_header = full_header;
- 	g_object_ref (etg->full_header);
- 	etg->header = header;
- 	g_object_ref (etg->header);
- 	etg->model = model;
+--- gal/e-table/e-table-group.c.orig	Mon Feb 17 14:23:16 2003
++++ gal/e-table/e-table-group.c	Wed Mar 12 22:13:38 2003
+@@ -136,7 +136,7 @@
  	g_object_ref (etg->model);
--	gnome_canvas_item_construct (GNOME_CANVAS_ITEM (etg), parent, 0, NULL);
-+	gnome_canvas_item_construct (GNOME_CANVAS_ITEM (etg), parent, 0, args);
+ 	g_object_set (G_OBJECT (etg),
+ 		"parent", parent,
+-		NULL);
++		(void*)0);
  }
  
  /**
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index 1c8cd9903601..68af50baf47c 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -72,6 +72,7 @@ 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
@@ -147,7 +148,7 @@ include/gal-2.0/gal/widgets/widget-pixmap-combo.h
 lib/gtk-2.0/modules/libgal-a11y-2.0.so
 lib/libgal-2.0.a
 lib/libgal-2.0.so
-lib/libgal-2.0.so.0
+lib/libgal-2.0.so.1
 libdata/pkgconfig/gal-2.0.pc
 share/doc/gal2/gal-api.sgml
 share/doc/gal2/gal-decl.txt