Update to 0.12.

10 files changed, 86 insertions, 40 deletions

diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index fe49d5dfe0dd..5704ecf8f015 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gal
-PORTVERSION=	0.11.2
+PORTVERSION=	0.12
 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 24e2a44d99fe..49abc29d2471 100644
--- a/x11-toolkits/gal/distinfo
+++ b/x11-toolkits/gal/distinfo
@@ -1 +1 @@
-MD5 (gal-0.11.2.tar.gz) = dc22c077c52208ac133df236e4c30480
+MD5 (gal-0.12.tar.gz) = c6ff4cbf9bb98dc79460898d41dece40
diff --git a/x11-toolkits/gal/files/patch-aa b/x11-toolkits/gal/files/patch-aa
index 67f380034800..f649c3b27f83 100644
--- a/x11-toolkits/gal/files/patch-aa
+++ b/x11-toolkits/gal/files/patch-aa
@@ -1,6 +1,11 @@
---- configure.orig	Mon May 21 11:10:07 2001
-+++ configure	Mon May 21 11:10:59 2001
-@@ -5017,5 +5017,5 @@
+
+$FreeBSD$
+
+--- configure.orig	Wed Sep 26 11:16:25 2001
++++ configure	Wed Sep 26 11:16:25 2001
+@@ -5075,9 +5075,9 @@
+ save_CFLAGS="$CFLAGS"
+ save_LDFLAGS="$LDFLAGS"
  CFLAGS="$CFLAGS $ICONV_CFLAGS"
 -LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
 -echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
@@ -9,25 +14,32 @@
 +echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
 +echo "configure:5081: checking for iconv in -lgiconv" >&5
  if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then
-@@ -5027,3 +5027,3 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5085,7 +5085,7 @@
+ #line 5086 "configure"
+ #include "confdefs.h"
  
 -#include <iconv.h>
 +#include <giconv.h>
  
-@@ -5050,3 +5050,3 @@
+ int main() {
+ 
+@@ -5108,7 +5108,7 @@
+ 
+ echo "$ac_t""$ac_cv_libiconv" 1>&6
  if test $ac_cv_libiconv = yes; then
 -	ICONV_LIBS="$ICONV_LIBS -liconv"
 +	ICONV_LIBS="$ICONV_LIBS -lgiconv"
  	have_iconv=yes
-@@ -5176,3 +5176,3 @@
+ else
+ 	CFLAGS="$save_CFLAGS"
+@@ -5234,7 +5234,7 @@
+ #line 5235 "configure"
+ #include "confdefs.h"
  
 -#include <iconv.h>
 +#include <giconv.h>
  #include <stdlib.h>
-@@ -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 
-+        vers=`$GTK_CONFIG --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-     if test "$vers" -ge 1002007; then
+ #include <string.h>
+ #ifdef HAVE_GNU_GET_LIBC_VERSION
diff --git a/x11-toolkits/gal/files/patch-ab b/x11-toolkits/gal/files/patch-ab
index a751a5d149fc..62d17daa6e7c 100644
--- a/x11-toolkits/gal/files/patch-ab
+++ b/x11-toolkits/gal/files/patch-ab
@@ -1,7 +1,17 @@
---- Makefile.in.orig	Thu Oct  5 18:09:06 2000
-+++ Makefile.in	Thu Oct  5 21:24:04 2000
-@@ -138,3 +138,3 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Fri Sep 28 12:30:28 2001
++++ Makefile.in	Fri Sep 28 12:37:31 2001
+@@ -141,9 +141,9 @@
+ gnomelocaledir = @gnomelocaledir@
+ l = @l@
+ 
+-SUBDIRS = gal po intl tests docs art
++SUBDIRS = gal po intl docs art
  
 -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
diff --git a/x11-toolkits/gal/pkg-plist b/x11-toolkits/gal/pkg-plist
index de441c93acd3..a81ad9169572 100644
--- a/x11-toolkits/gal/pkg-plist
+++ b/x11-toolkits/gal/pkg-plist
@@ -128,7 +128,8 @@ include/gal/widgets/widget-color-combo.h
 include/gal/widgets/widget-pixmap-combo.h
 lib/libgal.a
 lib/libgal.so
-lib/libgal.so.11
+lib/libgal.so.12
+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
 share/gnome/etable/%%VERSION%%/glade/e-table-group.glade
@@ -186,7 +187,7 @@ 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.Big5/LC_MESSAGES/gal.mo
+share/locale/zh_TW/LC_MESSAGES/gal.mo
 @dirrm share/gnome/pixmaps/gal/categories
 @dirrm share/gnome/pixmaps/gal
 @dirrm share/gnome/gal/html/gal
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index fe49d5dfe0dd..5704ecf8f015 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gal
-PORTVERSION=	0.11.2
+PORTVERSION=	0.12
 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 24e2a44d99fe..49abc29d2471 100644
--- a/x11-toolkits/gal2/distinfo
+++ b/x11-toolkits/gal2/distinfo
@@ -1 +1 @@
-MD5 (gal-0.11.2.tar.gz) = dc22c077c52208ac133df236e4c30480
+MD5 (gal-0.12.tar.gz) = c6ff4cbf9bb98dc79460898d41dece40
diff --git a/x11-toolkits/gal2/files/patch-aa b/x11-toolkits/gal2/files/patch-aa
index 67f380034800..f649c3b27f83 100644
--- a/x11-toolkits/gal2/files/patch-aa
+++ b/x11-toolkits/gal2/files/patch-aa
@@ -1,6 +1,11 @@
---- configure.orig	Mon May 21 11:10:07 2001
-+++ configure	Mon May 21 11:10:59 2001
-@@ -5017,5 +5017,5 @@
+
+$FreeBSD$
+
+--- configure.orig	Wed Sep 26 11:16:25 2001
++++ configure	Wed Sep 26 11:16:25 2001
+@@ -5075,9 +5075,9 @@
+ save_CFLAGS="$CFLAGS"
+ save_LDFLAGS="$LDFLAGS"
  CFLAGS="$CFLAGS $ICONV_CFLAGS"
 -LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
 -echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
@@ -9,25 +14,32 @@
 +echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
 +echo "configure:5081: checking for iconv in -lgiconv" >&5
  if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then
-@@ -5027,3 +5027,3 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5085,7 +5085,7 @@
+ #line 5086 "configure"
+ #include "confdefs.h"
  
 -#include <iconv.h>
 +#include <giconv.h>
  
-@@ -5050,3 +5050,3 @@
+ int main() {
+ 
+@@ -5108,7 +5108,7 @@
+ 
+ echo "$ac_t""$ac_cv_libiconv" 1>&6
  if test $ac_cv_libiconv = yes; then
 -	ICONV_LIBS="$ICONV_LIBS -liconv"
 +	ICONV_LIBS="$ICONV_LIBS -lgiconv"
  	have_iconv=yes
-@@ -5176,3 +5176,3 @@
+ else
+ 	CFLAGS="$save_CFLAGS"
+@@ -5234,7 +5234,7 @@
+ #line 5235 "configure"
+ #include "confdefs.h"
  
 -#include <iconv.h>
 +#include <giconv.h>
  #include <stdlib.h>
-@@ -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 
-+        vers=`$GTK_CONFIG --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-     if test "$vers" -ge 1002007; then
+ #include <string.h>
+ #ifdef HAVE_GNU_GET_LIBC_VERSION
diff --git a/x11-toolkits/gal2/files/patch-ab b/x11-toolkits/gal2/files/patch-ab
index a751a5d149fc..62d17daa6e7c 100644
--- a/x11-toolkits/gal2/files/patch-ab
+++ b/x11-toolkits/gal2/files/patch-ab
@@ -1,7 +1,17 @@
---- Makefile.in.orig	Thu Oct  5 18:09:06 2000
-+++ Makefile.in	Thu Oct  5 21:24:04 2000
-@@ -138,3 +138,3 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Fri Sep 28 12:30:28 2001
++++ Makefile.in	Fri Sep 28 12:37:31 2001
+@@ -141,9 +141,9 @@
+ gnomelocaledir = @gnomelocaledir@
+ l = @l@
+ 
+-SUBDIRS = gal po intl tests docs art
++SUBDIRS = gal po intl docs art
  
 -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
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index de441c93acd3..a81ad9169572 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -128,7 +128,8 @@ include/gal/widgets/widget-color-combo.h
 include/gal/widgets/widget-pixmap-combo.h
 lib/libgal.a
 lib/libgal.so
-lib/libgal.so.11
+lib/libgal.so.12
+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
 share/gnome/etable/%%VERSION%%/glade/e-table-group.glade
@@ -186,7 +187,7 @@ 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.Big5/LC_MESSAGES/gal.mo
+share/locale/zh_TW/LC_MESSAGES/gal.mo
 @dirrm share/gnome/pixmaps/gal/categories
 @dirrm share/gnome/pixmaps/gal
 @dirrm share/gnome/gal/html/gal