Update to 0.3

8 files changed, 112 insertions, 18 deletions

diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 18b40322f154..a2cc6d70ab4e 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	gal
-PORTVERSION=	0.2.2
+PORTVERSION=	0.3
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gal
 
-MAINTAINER=	ade@FreeBSD.org
+MAINTAINER?=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gnomeprint.13:${PORTSDIR}/print/gnomeprint \
 		glade.4:${PORTSDIR}/devel/libglade \
 		unicode.0:${PORTSDIR}/devel/libunicode \
-		gnomevfs.0:${PORTSDIR}/devel/gnomevfs
+		gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
+		iconv.2:${PORTSDIR}/converters/iconv
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
diff --git a/x11-toolkits/gal/distinfo b/x11-toolkits/gal/distinfo
index e98ec4ebb637..2042e7a116ae 100644
--- a/x11-toolkits/gal/distinfo
+++ b/x11-toolkits/gal/distinfo
@@ -1 +1 @@
-MD5 (gal-0.2.2.tar.gz) = 88d21d08939e3bae97709f3848f7c29b
+MD5 (gal-0.3.tar.gz) = fe97ace7aacfd39d68a9badc3d32e446
diff --git a/x11-toolkits/gal/files/patch-aa b/x11-toolkits/gal/files/patch-aa
index 68bca339a753..d98480b4ad6d 100644
--- a/x11-toolkits/gal/files/patch-aa
+++ b/x11-toolkits/gal/files/patch-aa
@@ -1,7 +1,25 @@
---- configure.orig	Thu Oct  5 16:15:23 2000
-+++ configure	Thu Oct  5 20:41:31 2000
-@@ -4970,4 +4970,4 @@
- echo "configure:4971: checking for GTK >= 1.2.7" >&5
+--- configure.orig	Wed Dec  6 16:02:14 2000
++++ configure	Thu Dec  7 00:51:31 2000
+@@ -4935,5 +4935,5 @@
+ have_iconv=no
+-echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
+-echo "configure:4938: checking for libiconv in -liconv" >&5
+-ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
++echo "configure:4938: checking for iconv in -liconv" >&5
++ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -4949,6 +4949,6 @@
+     builtin and then its argument prototype would still apply.  */
+-char libiconv();
++char iconv();
+ 
+ int main() {
+-libiconv()
++iconv()
+ ; return 0; }
+@@ -5179,4 +5179,4 @@
+ echo "configure:5180: 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/pkg-plist b/x11-toolkits/gal/pkg-plist
index 1d2285704fb5..f745a190bb64 100644
--- a/x11-toolkits/gal/pkg-plist
+++ b/x11-toolkits/gal/pkg-plist
@@ -22,6 +22,7 @@ include/gal/e-table/e-table-group-container.h
 include/gal/e-table/e-table-group-leaf.h
 include/gal/e-table/e-table-group.h
 include/gal/e-table/e-table-header-item.h
+include/gal/e-table/e-table-header-utils.h
 include/gal/e-table/e-table-header.h
 include/gal/e-table/e-table-item.h
 include/gal/e-table/e-table-model.h
@@ -48,6 +49,15 @@ include/gal/e-text/e-text-event-processor-types.h
 include/gal/e-text/e-text-event-processor.h
 include/gal/e-text/e-text-model.h
 include/gal/e-text/e-text.h
+include/gal/menus/gal-define-views-dialog.h
+include/gal/menus/gal-define-views-model.h
+include/gal/menus/gal-view-collection.h
+include/gal/menus/gal-view-etable.h
+include/gal/menus/gal-view-factory-etable.h
+include/gal/menus/gal-view-factory.h
+include/gal/menus/gal-view-new-dialog.h
+include/gal/menus/gal-view.h
+include/gal/util/e-cache.h
 include/gal/util/e-util.h
 include/gal/util/e-xml-utils.h
 include/gal/widgets/color-group.h
@@ -74,15 +84,33 @@ include/gal/widgets/widget-color-combo.h
 include/gal/widgets/widget-pixmap-combo.h
 lib/libgal.a
 lib/libgal.so
-lib/libgal.so.1
+lib/libgal.so.2
 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/gal-define-views.glade
+share/gnome/gal/%%VERSION%%/glade/gal-view-new-dialog.glade
+share/locale/da/LC_MESSAGES/gal.mo
+share/locale/en_GB/LC_MESSAGES/gal.mo
+share/locale/es/LC_MESSAGES/gal.mo
+share/locale/fr/LC_MESSAGES/gal.mo
+share/locale/gl/LC_MESSAGES/gal.mo
+share/locale/hu/LC_MESSAGES/gal.mo
+share/locale/it/LC_MESSAGES/gal.mo
+share/locale/ja/LC_MESSAGES/gal.mo
+share/locale/ko/LC_MESSAGES/gal.mo
+share/locale/no/LC_MESSAGES/gal.mo
+share/locale/pl/LC_MESSAGES/gal.mo
+share/locale/sv/LC_MESSAGES/gal.mo
+@dirrm share/gnome/gal/%%VERSION%%/glade
+@dirrm share/gnome/gal/%%VERSION%%
+@dirrm share/gnome/gal
 @dirrm share/gnome/etable/%%VERSION%%/glade
 @dirrm share/gnome/etable/%%VERSION%%
 @dirrm share/gnome/etable
 @dirrm include/gal/widgets
 @dirrm include/gal/util
+@dirrm include/gal/menus
 @dirrm include/gal/e-text
 @dirrm include/gal/e-table
 @dirrm include/gal/e-paned
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 18b40322f154..a2cc6d70ab4e 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	gal
-PORTVERSION=	0.2.2
+PORTVERSION=	0.3
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gal
 
-MAINTAINER=	ade@FreeBSD.org
+MAINTAINER?=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gnomeprint.13:${PORTSDIR}/print/gnomeprint \
 		glade.4:${PORTSDIR}/devel/libglade \
 		unicode.0:${PORTSDIR}/devel/libunicode \
-		gnomevfs.0:${PORTSDIR}/devel/gnomevfs
+		gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
+		iconv.2:${PORTSDIR}/converters/iconv
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo
index e98ec4ebb637..2042e7a116ae 100644
--- a/x11-toolkits/gal2/distinfo
+++ b/x11-toolkits/gal2/distinfo
@@ -1 +1 @@
-MD5 (gal-0.2.2.tar.gz) = 88d21d08939e3bae97709f3848f7c29b
+MD5 (gal-0.3.tar.gz) = fe97ace7aacfd39d68a9badc3d32e446
diff --git a/x11-toolkits/gal2/files/patch-aa b/x11-toolkits/gal2/files/patch-aa
index 68bca339a753..d98480b4ad6d 100644
--- a/x11-toolkits/gal2/files/patch-aa
+++ b/x11-toolkits/gal2/files/patch-aa
@@ -1,7 +1,25 @@
---- configure.orig	Thu Oct  5 16:15:23 2000
-+++ configure	Thu Oct  5 20:41:31 2000
-@@ -4970,4 +4970,4 @@
- echo "configure:4971: checking for GTK >= 1.2.7" >&5
+--- configure.orig	Wed Dec  6 16:02:14 2000
++++ configure	Thu Dec  7 00:51:31 2000
+@@ -4935,5 +4935,5 @@
+ have_iconv=no
+-echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
+-echo "configure:4938: checking for libiconv in -liconv" >&5
+-ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
++echo "configure:4938: checking for iconv in -liconv" >&5
++ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -4949,6 +4949,6 @@
+     builtin and then its argument prototype would still apply.  */
+-char libiconv();
++char iconv();
+ 
+ int main() {
+-libiconv()
++iconv()
+ ; return 0; }
+@@ -5179,4 +5179,4 @@
+ echo "configure:5180: 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/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index 1d2285704fb5..f745a190bb64 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -22,6 +22,7 @@ include/gal/e-table/e-table-group-container.h
 include/gal/e-table/e-table-group-leaf.h
 include/gal/e-table/e-table-group.h
 include/gal/e-table/e-table-header-item.h
+include/gal/e-table/e-table-header-utils.h
 include/gal/e-table/e-table-header.h
 include/gal/e-table/e-table-item.h
 include/gal/e-table/e-table-model.h
@@ -48,6 +49,15 @@ include/gal/e-text/e-text-event-processor-types.h
 include/gal/e-text/e-text-event-processor.h
 include/gal/e-text/e-text-model.h
 include/gal/e-text/e-text.h
+include/gal/menus/gal-define-views-dialog.h
+include/gal/menus/gal-define-views-model.h
+include/gal/menus/gal-view-collection.h
+include/gal/menus/gal-view-etable.h
+include/gal/menus/gal-view-factory-etable.h
+include/gal/menus/gal-view-factory.h
+include/gal/menus/gal-view-new-dialog.h
+include/gal/menus/gal-view.h
+include/gal/util/e-cache.h
 include/gal/util/e-util.h
 include/gal/util/e-xml-utils.h
 include/gal/widgets/color-group.h
@@ -74,15 +84,33 @@ include/gal/widgets/widget-color-combo.h
 include/gal/widgets/widget-pixmap-combo.h
 lib/libgal.a
 lib/libgal.so
-lib/libgal.so.1
+lib/libgal.so.2
 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/gal-define-views.glade
+share/gnome/gal/%%VERSION%%/glade/gal-view-new-dialog.glade
+share/locale/da/LC_MESSAGES/gal.mo
+share/locale/en_GB/LC_MESSAGES/gal.mo
+share/locale/es/LC_MESSAGES/gal.mo
+share/locale/fr/LC_MESSAGES/gal.mo
+share/locale/gl/LC_MESSAGES/gal.mo
+share/locale/hu/LC_MESSAGES/gal.mo
+share/locale/it/LC_MESSAGES/gal.mo
+share/locale/ja/LC_MESSAGES/gal.mo
+share/locale/ko/LC_MESSAGES/gal.mo
+share/locale/no/LC_MESSAGES/gal.mo
+share/locale/pl/LC_MESSAGES/gal.mo
+share/locale/sv/LC_MESSAGES/gal.mo
+@dirrm share/gnome/gal/%%VERSION%%/glade
+@dirrm share/gnome/gal/%%VERSION%%
+@dirrm share/gnome/gal
 @dirrm share/gnome/etable/%%VERSION%%/glade
 @dirrm share/gnome/etable/%%VERSION%%
 @dirrm share/gnome/etable
 @dirrm include/gal/widgets
 @dirrm include/gal/util
+@dirrm include/gal/menus
 @dirrm include/gal/e-text
 @dirrm include/gal/e-table
 @dirrm include/gal/e-paned