The new GNOME 1.4 "Fifth-Toe" metaport, bringing together a whole

bunch of GNOME applications under one convenient building mechanism.

Applications include:

mozilla, galeon, gabber, pan, gnumeric, sodipodi, atomix, balsa,
bombermaze, dia, eog, gedit, gimp, glimmer, gnomeicu, gob, gtm,
gnucash and abiword.

4 files changed, 45 insertions, 22 deletions

diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 21724db1b826..533567735a3c 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -6,17 +6,14 @@
 #
 
 PORTNAME=	gal
-PORTVERSION=	0.5
+PORTVERSION=	0.7
 CATEGORIES?=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gal
 
 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 \
+LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode \
 		giconv.2:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
diff --git a/x11-toolkits/gal/distinfo b/x11-toolkits/gal/distinfo
index 10d952f8519a..ed789c5d1c54 100644
--- a/x11-toolkits/gal/distinfo
+++ b/x11-toolkits/gal/distinfo
@@ -1 +1 @@
-MD5 (gal-0.5.tar.gz) = 1aaf233130fa116334da2edc516b8958
+MD5 (gal-0.7.tar.gz) = 4f8003ca81a71627de1a7f8b49a07af3
diff --git a/x11-toolkits/gal/files/patch-aa b/x11-toolkits/gal/files/patch-aa
index 79bbe96885e2..8aaa875e5d28 100644
--- a/x11-toolkits/gal/files/patch-aa
+++ b/x11-toolkits/gal/files/patch-aa
@@ -1,31 +1,31 @@
---- configure.orig	Thu Feb  8 13:54:31 2001
-+++ configure	Fri Feb  9 10:46:57 2001
-@@ -5017,5 +5017,5 @@
+--- configure.orig	Mon Apr 16 17:12:51 2001
++++ configure	Thu Apr 19 11:45:12 2001
+@@ -5026,5 +5026,5 @@
  CFLAGS="$CFLAGS $ICONV_CFLAGS"
 -LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
 -echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
--echo "configure:5021: checking for iconv in -liconv" >&5
+-echo "configure:5030: 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:5021: checking for iconv in -lgiconv" >&5
++echo "configure:5030: checking for iconv in -lgiconv" >&5
  if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then
-@@ -5027,3 +5027,3 @@
+@@ -5036,3 +5036,3 @@
  
 -#include <iconv.h>
 +#include <giconv.h>
  
-@@ -5050,3 +5050,3 @@
+@@ -5059,3 +5059,3 @@
  if test $ac_cv_libiconv = yes; then
 -	ICONV_LIBS="$ICONV_LIBS -liconv"
 +	ICONV_LIBS="$ICONV_LIBS -lgiconv"
  	have_iconv=yes
-@@ -5176,3 +5176,3 @@
+@@ -5185,3 +5185,3 @@
  
 -#include <iconv.h>
 +#include <giconv.h>
  #include <stdlib.h>
-@@ -5302,4 +5302,4 @@
- echo "configure:5303: checking for GTK >= 1.2.7" >&5
+@@ -5311,4 +5311,4 @@
+ echo "configure:5312: 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 f9532138063f..f8cdf3051280 100644
--- a/x11-toolkits/gal/pkg-plist
+++ b/x11-toolkits/gal/pkg-plist
@@ -3,9 +3,14 @@ include/gal/e-paned/e-hpaned.h
 include/gal/e-paned/e-paned.h
 include/gal/e-paned/e-vpaned.h
 include/gal/e-table/e-cell-checkbox.h
+include/gal/e-table/e-cell-combo.h
 include/gal/e-table/e-cell-date.h
+include/gal/e-table/e-cell-float.h
 include/gal/e-table/e-cell-number.h
+include/gal/e-table/e-cell-pixbuf.h
+include/gal/e-table/e-cell-popup.h
 include/gal/e-table/e-cell-size.h
+include/gal/e-table/e-cell-spin-button.h
 include/gal/e-table/e-cell-text.h
 include/gal/e-table/e-cell-toggle.h
 include/gal/e-table/e-cell-tree.h
@@ -27,6 +32,8 @@ 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-memory-callbacks.h
+include/gal/e-table/e-table-memory.h
 include/gal/e-table/e-table-model.h
 include/gal/e-table/e-table-one.h
 include/gal/e-table/e-table-scrolled.h
@@ -36,19 +43,27 @@ include/gal/e-table/e-table-sort-info.h
 include/gal/e-table/e-table-sorted-variable.h
 include/gal/e-table/e-table-sorted.h
 include/gal/e-table/e-table-sorter.h
+include/gal/e-table/e-table-sorting-utils.h
 include/gal/e-table/e-table-specification.h
 include/gal/e-table/e-table-state.h
 include/gal/e-table/e-table-subset-variable.h
 include/gal/e-table/e-table-subset.h
-include/gal/e-table/e-table-text-model.h
 include/gal/e-table/e-table-tooltip.h
+include/gal/e-table/e-table-utils.h
 include/gal/e-table/e-table.h
+include/gal/e-table/e-tree-memory-callbacks.h
+include/gal/e-table/e-tree-memory.h
 include/gal/e-table/e-tree-model.h
-include/gal/e-table/e-tree-simple.h
+include/gal/e-table/e-tree-scrolled.h
+include/gal/e-table/e-tree-selection-model.h
+include/gal/e-table/e-tree-sorted.h
+include/gal/e-table/e-tree-table-adapter.h
+include/gal/e-table/e-tree.h
+include/gal/e-text/e-completion-view.h
+include/gal/e-text/e-completion.h
 include/gal/e-text/e-entry.h
-include/gal/e-text/e-text-event-processor-emacs-like.h
-include/gal/e-text/e-text-event-processor-types.h
-include/gal/e-text/e-text-event-processor.h
+include/gal/e-text/e-table-text-model.h
+include/gal/e-text/e-text-model-repos.h
 include/gal/e-text/e-text-model-uri.h
 include/gal/e-text/e-text-model.h
 include/gal/e-text/e-text.h
@@ -66,8 +81,13 @@ 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/util/e-bit-array.h
 include/gal/util/e-cache.h
 include/gal/util/e-i18n.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-util.h
 include/gal/util/e-xml-utils.h
 include/gal/widgets/color-group.h
@@ -81,11 +101,15 @@ include/gal/widgets/e-cursors.h
 include/gal/widgets/e-font.h
 include/gal/widgets/e-gui-utils.h
 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.h
 include/gal/widgets/e-scroll-frame.h
+include/gal/widgets/e-selection-model-array.h
+include/gal/widgets/e-selection-model-simple.h
+include/gal/widgets/e-selection-model.h
 include/gal/widgets/e-unicode.h
 include/gal/widgets/e-vscrollbar.h
 include/gal/widgets/gtk-combo-box.h
@@ -95,7 +119,7 @@ include/gal/widgets/widget-color-combo.h
 include/gal/widgets/widget-pixmap-combo.h
 lib/libgal.a
 lib/libgal.so
-lib/libgal.so.4
+lib/libgal.so.6
 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
@@ -108,6 +132,7 @@ share/gnome/gal/html/gal-sections.txt
 share/gnome/gal/html/gal.hierarchy
 share/gnome/gal/html/gal.signals
 share/gnome/gal/html/gal.types
+share/locale/az/LC_MESSAGES/gal.mo
 share/locale/ca/LC_MESSAGES/gal.mo
 share/locale/da/LC_MESSAGES/gal.mo
 share/locale/de/LC_MESSAGES/gal.mo
@@ -124,6 +149,7 @@ share/locale/lt/LC_MESSAGES/gal.mo
 share/locale/no/LC_MESSAGES/gal.mo
 share/locale/pl/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
 share/locale/sk/LC_MESSAGES/gal.mo
 share/locale/sv/LC_MESSAGES/gal.mo