5 files changed, 25 insertions, 35 deletions

diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index fe91d174a811..bb2f1d24a86a 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gal
-PORTVERSION=	0.7
+PORTVERSION=	0.8
 CATEGORIES?=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gal
@@ -34,5 +34,7 @@ pre-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@find ${WRKSRC}/gal/widgets -name '*.[ch]' | xargs ${PERL} -pi -e \
+		's|<iconv.h>|<giconv.h>|'
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gal/distinfo b/x11-toolkits/gal/distinfo
index ed789c5d1c54..88e57d3cc1a1 100644
--- a/x11-toolkits/gal/distinfo
+++ b/x11-toolkits/gal/distinfo
@@ -1 +1 @@
-MD5 (gal-0.7.tar.gz) = 4f8003ca81a71627de1a7f8b49a07af3
+MD5 (gal-0.8.tar.gz) = 264289d8f4e2e4c4b581eedc38361ea7
diff --git a/x11-toolkits/gal/files/patch-aa b/x11-toolkits/gal/files/patch-aa
index 8aaa875e5d28..13505169f17b 100644
--- a/x11-toolkits/gal/files/patch-aa
+++ b/x11-toolkits/gal/files/patch-aa
@@ -1,31 +1,31 @@
---- configure.orig	Mon Apr 16 17:12:51 2001
-+++ configure	Thu Apr 19 11:45:12 2001
-@@ -5026,5 +5026,5 @@
+--- configure.orig	Mon May 21 11:10:07 2001
++++ configure	Mon May 21 11:10:59 2001
+@@ -5017,5 +5017,5 @@
  CFLAGS="$CFLAGS $ICONV_CFLAGS"
 -LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
 -echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
--echo "configure:5030: checking for iconv in -liconv" >&5
+-echo "configure:5021: checking for iconv in -liconv" >&5
 +LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv"
 +echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
-+echo "configure:5030: checking for iconv in -lgiconv" >&5
++echo "configure:5021: checking for iconv in -lgiconv" >&5
  if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then
-@@ -5036,3 +5036,3 @@
+@@ -5027,3 +5027,3 @@
  
 -#include <iconv.h>
 +#include <giconv.h>
  
-@@ -5059,3 +5059,3 @@
+@@ -5050,3 +5050,3 @@
  if test $ac_cv_libiconv = yes; then
 -	ICONV_LIBS="$ICONV_LIBS -liconv"
 +	ICONV_LIBS="$ICONV_LIBS -lgiconv"
  	have_iconv=yes
-@@ -5185,3 +5185,3 @@
+@@ -5176,3 +5176,3 @@
  
 -#include <iconv.h>
 +#include <giconv.h>
  #include <stdlib.h>
-@@ -5311,4 +5311,4 @@
- echo "configure:5312: checking for GTK >= 1.2.7" >&5
+@@ -5290,4 +5290,4 @@
+ echo "configure:5291: checking for GTK >= 1.2.7" >&5
 -if gtk-config --version > /dev/null 2>&1; then 
 -        vers=`gtk-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 +if $GTK_CONFIG --version > /dev/null 2>&1; then 
diff --git a/x11-toolkits/gal/files/patch-ac b/x11-toolkits/gal/files/patch-ac
deleted file mode 100644
index 0969ed3eb8b4..000000000000
--- a/x11-toolkits/gal/files/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
---- gal/widgets/e-font.c.orig	Wed Feb  7 14:35:03 2001
-+++ gal/widgets/e-font.c	Fri Feb  9 10:55:19 2001
-@@ -19,3 +19,3 @@
- #include <unicode.h>
--#include <iconv.h>
-+#include <giconv.h>
- #include "gal/util/e-cache.h"
---- gal/widgets/e-font.h.orig	Tue Feb  6 15:24:03 2001
-+++ gal/widgets/e-font.h	Fri Feb  9 10:55:41 2001
-@@ -16,3 +16,3 @@
- #include <gdk/gdk.h>
--#include <iconv.h>
-+#include <giconv.h>
- #include <libgnome/gnome-defs.h>
---- gal/widgets/e-unicode.c.orig	Wed Feb  7 14:35:03 2001
-+++ gal/widgets/e-unicode.c	Fri Feb  9 11:02:57 2001
-@@ -15,3 +15,3 @@
- #include <unicode.h>
--#include <iconv.h>
-+#include <giconv.h>
- #include <gdk/gdk.h>
diff --git a/x11-toolkits/gal/pkg-plist b/x11-toolkits/gal/pkg-plist
index f8cdf3051280..b85df646ed88 100644
--- a/x11-toolkits/gal/pkg-plist
+++ b/x11-toolkits/gal/pkg-plist
@@ -81,9 +81,11 @@ include/gal/shortcut-bar/e-icon-bar.h
 include/gal/shortcut-bar/e-shortcut-bar.h
 include/gal/shortcut-bar/e-shortcut-model.h
 include/gal/shortcut-bar/e-vscrolled-bar.h
+include/gal/unicode/gunicode.h
 include/gal/util/e-bit-array.h
 include/gal/util/e-cache.h
 include/gal/util/e-i18n.h
+include/gal/util/e-sorter-array.h
 include/gal/util/e-sorter.h
 include/gal/util/e-text-event-processor-emacs-like.h
 include/gal/util/e-text-event-processor-types.h
@@ -95,7 +97,12 @@ include/gal/widgets/color-palette.h
 include/gal/widgets/e-canvas-utils.h
 include/gal/widgets/e-canvas-vbox.h
 include/gal/widgets/e-canvas.h
+include/gal/widgets/e-categories-master-list-array.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.h
 include/gal/widgets/e-categories.h
+include/gal/widgets/e-charset-picker.h
 include/gal/widgets/e-colors.h
 include/gal/widgets/e-cursors.h
 include/gal/widgets/e-font.h
@@ -104,7 +111,7 @@ include/gal/widgets/e-hscrollbar.h
 include/gal/widgets/e-hsv-utils.h
 include/gal/widgets/e-popup-menu.h
 include/gal/widgets/e-printable.h
-include/gal/widgets/e-reflow-sorted.h
+include/gal/widgets/e-reflow-model.h
 include/gal/widgets/e-reflow.h
 include/gal/widgets/e-scroll-frame.h
 include/gal/widgets/e-selection-model-array.h
@@ -119,10 +126,11 @@ include/gal/widgets/widget-color-combo.h
 include/gal/widgets/widget-pixmap-combo.h
 lib/libgal.a
 lib/libgal.so
-lib/libgal.so.6
+lib/libgal.so.7
 share/gnome/etable/%%VERSION%%/glade/e-table-config.glade
 share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade
 share/gnome/etable/%%VERSION%%/glade/e-table-group.glade
+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
@@ -165,6 +173,7 @@ share/locale/uk/LC_MESSAGES/gal.mo
 @dirrm share/gnome/etable
 @dirrm include/gal/widgets
 @dirrm include/gal/util
+@dirrm include/gal/unicode
 @dirrm include/gal/shortcut-bar
 @dirrm include/gal/menus
 @dirrm include/gal/e-text