Update to 0.18.

8 files changed, 40 insertions, 6 deletions

diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 5e7c94825265..b973973c2410 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gal
-PORTVERSION=	0.14
+PORTVERSION=	0.18
 CATEGORIES?=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gal
diff --git a/x11-toolkits/gal/distinfo b/x11-toolkits/gal/distinfo
index 94cd86728746..05ca8055622c 100644
--- a/x11-toolkits/gal/distinfo
+++ b/x11-toolkits/gal/distinfo
@@ -1 +1 @@
-MD5 (gal-0.14.tar.gz) = 239d2a80afb75eaec9bdceef325fb924
+MD5 (gal-0.18.tar.gz) = fd7122dbe8af4fae29a43c20d8bbb594
diff --git a/x11-toolkits/gal/files/patch-gal::util::e-iconv.h b/x11-toolkits/gal/files/patch-gal::util::e-iconv.h
new file mode 100644
index 000000000000..47a19c3586c8
--- /dev/null
+++ b/x11-toolkits/gal/files/patch-gal::util::e-iconv.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- gal/util/e-iconv.h	2001/11/07 14:06:41	1.1
++++ gal/util/e-iconv.h	2001/11/07 14:06:52
+@@ -24,7 +24,7 @@
+ #ifndef _E_ICONV_H_
+ #define _E_ICONV_H_
+ 
+-#include <iconv.h>
++#include <giconv.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/x11-toolkits/gal/pkg-plist b/x11-toolkits/gal/pkg-plist
index fd5bcaae6ffd..7af6c0af0512 100644
--- a/x11-toolkits/gal/pkg-plist
+++ b/x11-toolkits/gal/pkg-plist
@@ -87,11 +87,13 @@ 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-iconv.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
 include/gal/util/e-text-event-processor.h
+include/gal/util/e-unicode-i18n.h
 include/gal/util/e-util.h
 include/gal/util/e-xml-utils.h
 include/gal/widgets/color-group.h
@@ -128,7 +130,7 @@ include/gal/widgets/widget-color-combo.h
 include/gal/widgets/widget-pixmap-combo.h
 lib/libgal.a
 lib/libgal.so
-lib/libgal.so.14
+lib/libgal.so.18
 share/gnome/etable/%%VERSION%%/glade/e-table-config-no-group.glade
 share/gnome/etable/%%VERSION%%/glade/e-table-config.glade
 share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade
@@ -179,6 +181,7 @@ 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
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 5e7c94825265..b973973c2410 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gal
-PORTVERSION=	0.14
+PORTVERSION=	0.18
 CATEGORIES?=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gal
diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo
index 94cd86728746..05ca8055622c 100644
--- a/x11-toolkits/gal2/distinfo
+++ b/x11-toolkits/gal2/distinfo
@@ -1 +1 @@
-MD5 (gal-0.14.tar.gz) = 239d2a80afb75eaec9bdceef325fb924
+MD5 (gal-0.18.tar.gz) = fd7122dbe8af4fae29a43c20d8bbb594
diff --git a/x11-toolkits/gal2/files/patch-gal::util::e-iconv.h b/x11-toolkits/gal2/files/patch-gal::util::e-iconv.h
new file mode 100644
index 000000000000..47a19c3586c8
--- /dev/null
+++ b/x11-toolkits/gal2/files/patch-gal::util::e-iconv.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- gal/util/e-iconv.h	2001/11/07 14:06:41	1.1
++++ gal/util/e-iconv.h	2001/11/07 14:06:52
+@@ -24,7 +24,7 @@
+ #ifndef _E_ICONV_H_
+ #define _E_ICONV_H_
+ 
+-#include <iconv.h>
++#include <giconv.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index fd5bcaae6ffd..7af6c0af0512 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -87,11 +87,13 @@ 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-iconv.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
 include/gal/util/e-text-event-processor.h
+include/gal/util/e-unicode-i18n.h
 include/gal/util/e-util.h
 include/gal/util/e-xml-utils.h
 include/gal/widgets/color-group.h
@@ -128,7 +130,7 @@ include/gal/widgets/widget-color-combo.h
 include/gal/widgets/widget-pixmap-combo.h
 lib/libgal.a
 lib/libgal.so
-lib/libgal.so.14
+lib/libgal.so.18
 share/gnome/etable/%%VERSION%%/glade/e-table-config-no-group.glade
 share/gnome/etable/%%VERSION%%/glade/e-table-config.glade
 share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade
@@ -179,6 +181,7 @@ 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