Upgrade gnumeric to 0.5, libxml to 0.99,

Correct gtk11-devel's PLIST,
and fix some configure problem of electriceyes.

8 files changed, 150 insertions, 68 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 1f12ff532992..8a52472507e8 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for:   gnumeric
-# Version required:    0.3
-# Date created:        08 October 1998
-# Whom:                Yukihiro Nakai <Nakai@technologist.com>
+# New ports collection makefile for:	gnumeric
+# Version required:			0.5
+# Date created:				08 October 1998
+# Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.2 1998/11/09 06:51:34 asami Exp $
+# $Id: Makefile,v 1.3 1998/11/18 12:09:05 asami Exp $
 #
 
-DISTNAME=	gnumeric-0.3
+DISTNAME=	gnumeric-0.5
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
 		ftp://ftp.gnome.org/pub/GNOME/sources/
@@ -23,7 +23,8 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
 		-I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 post-install:
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 598a2f01aa15..bb4a4545cbae 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.3.tar.gz) = a5f200fb74a4b1663a0edd5b1143111c
+MD5 (gnumeric-0.5.tar.gz) = 1d4ce24719184ec9eeb5e080342a988b
diff --git a/math/gnumeric/files/patch-aa b/math/gnumeric/files/patch-aa
index 3b0ac7164230..359d3f91c362 100644
--- a/math/gnumeric/files/patch-aa
+++ b/math/gnumeric/files/patch-aa
@@ -1,20 +1,39 @@
---- configure.orig	Wed Sep 30 13:51:50 1998
-+++ configure	Fri Oct 23 00:46:12 1998
-@@ -930,12 +930,12 @@
- 
- 
- 	if test "$no_gnome_config" = "yes"; then
--          echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:935: checking for gnomeConf.sh file in $gnome_prefix" >&5
--	  if test -f $gnome_prefix/gnomeConf.sh; then
-+          echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:935: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+	  if test -f $prefix/share/gnome/gnomeConf.sh; then
- 	    echo "$ac_t""found" 1>&6
--	    echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh"
--	    . $gnome_prefix/gnomeConf.sh
-+	    echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
-+	    . $prefix/share/gnome/gnomeConf.sh
- 	    
- 	  else
- 	    echo "$ac_t""not found" 1>&6
+--- configure.orig	Thu Dec 31 03:05:56 1998
++++ configure	Tue Jan  5 13:38:32 1999
+@@ -1081,13 +1081,13 @@
+ 	    fi
+ 	
+ 	    if test "$no_gnome_config" = "yes"; then
+-              echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
+-echo "configure:1086: checking for gnomeConf.sh file in $gnome_prefix" >&5
+-	      if test -f $gnome_prefix/gnomeConf.sh; then
++              echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
++echo "configure:1086: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
++	      if test -f $prefix/share/gnome/gnomeConf.sh; then
+ 	        echo "$ac_t""found" 1>&6
+ 	        echo "loading gnome configuration from" \
+-		     "$gnome_prefix/gnomeConf.sh"
+-	        . $gnome_prefix/gnomeConf.sh
++		     "$prefix/share/gnome/gnomeConf.sh"
++	        . $prefix/share/gnome/gnomeConf.sh
+ 	        
+ 	      else
+ 	        echo "$ac_t""not found" 1>&6
+@@ -2573,7 +2573,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lxml `gnome-config --libs xml` $LIBS"
++LIBS="-lxml -lz $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2579 "configure"
+ #include "confdefs.h"
+@@ -2604,7 +2604,7 @@
+   
+ 		
+ 		
+-		GNOME_XML_LIB=`gnome-config --libs xml`
++		GNOME_XML_LIB=`xml-config --libs`
+ 	
+ else
+   echo "$ac_t""no" 1>&6
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index e14901a70f22..8f095f2dff65 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -1,15 +1,36 @@
 bin/gnumeric
-share/gnome/apps/Productivity/gnumeric.desktop
-share/gnome/gnumeric/plugins/libsample.a
-share/gnome/gnumeric/plugins/libsample.la
-share/gnome/gnumeric/plugins/libsample.so
-share/gnome/gnumeric/plugins/libsample.so.0
+bin/gnumeric-corba
+share/gnome/apps/Applications/gnumeric.desktop
+share/gnome/gnumeric/guile/gnumeric_startup.scm
+share/gnome/gnumeric/plugins/libgnumguile.a
+share/gnome/gnumeric/plugins/libgnumguile.la
+share/gnome/gnumeric/plugins/libgnumguile.so
+share/gnome/gnumeric/plugins/libgnumguile.so.0
+share/gnome/gnumeric/plugins/libstat.a
+share/gnome/gnumeric/plugins/libstat.la
+share/gnome/gnumeric/plugins/libstat.so
+share/gnome/gnumeric/plugins/libstat.so.0
+share/gnome/mime-info/gnumeric.keys
+share/gnome/mime-info/gnumeric.mime
+share/gnome/pixmaps/gnome-gnumeric.png
+share/locale/cs/LC_MESSAGES/gnumeric.mo
+share/locale/de/LC_MESSAGES/gnumeric.mo
 share/locale/es/LC_MESSAGES/gnumeric.mo
-share/locale/es@mx/LC_MESSAGES/gnumeric.mo
+share/locale/es_DO/LC_MESSAGES/gnumeric.mo
+share/locale/es_GT/LC_MESSAGES/gnumeric.mo
+share/locale/es_HN/LC_MESSAGES/gnumeric.mo
+share/locale/es_MX/LC_MESSAGES/gnumeric.mo
+share/locale/es_PA/LC_MESSAGES/gnumeric.mo
+share/locale/es_PE/LC_MESSAGES/gnumeric.mo
+share/locale/es_SV/LC_MESSAGES/gnumeric.mo
 share/locale/fr/LC_MESSAGES/gnumeric.mo
 share/locale/hu/LC_MESSAGES/gnumeric.mo
 share/locale/it/LC_MESSAGES/gnumeric.mo
+share/locale/ja/LC_MESSAGES/gnumeric.mo
 share/locale/ko/LC_MESSAGES/gnumeric.mo
+share/locale/no/LC_MESSAGES/gnumeric.mo
+share/locale/no_NO/LC_MESSAGES/gnumeric.mo
 share/locale/pt/LC_MESSAGES/gnumeric.mo
+@dirrm share/gnome/gnumeric/guile
 @dirrm share/gnome/gnumeric/plugins
 @dirrm share/gnome/gnumeric
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 1f12ff532992..8a52472507e8 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for:   gnumeric
-# Version required:    0.3
-# Date created:        08 October 1998
-# Whom:                Yukihiro Nakai <Nakai@technologist.com>
+# New ports collection makefile for:	gnumeric
+# Version required:			0.5
+# Date created:				08 October 1998
+# Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.2 1998/11/09 06:51:34 asami Exp $
+# $Id: Makefile,v 1.3 1998/11/18 12:09:05 asami Exp $
 #
 
-DISTNAME=	gnumeric-0.3
+DISTNAME=	gnumeric-0.5
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
 		ftp://ftp.gnome.org/pub/GNOME/sources/
@@ -23,7 +23,8 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
 		-I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 post-install:
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index 598a2f01aa15..bb4a4545cbae 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.3.tar.gz) = a5f200fb74a4b1663a0edd5b1143111c
+MD5 (gnumeric-0.5.tar.gz) = 1d4ce24719184ec9eeb5e080342a988b
diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa
index 3b0ac7164230..359d3f91c362 100644
--- a/math/gnumeric2/files/patch-aa
+++ b/math/gnumeric2/files/patch-aa
@@ -1,20 +1,39 @@
---- configure.orig	Wed Sep 30 13:51:50 1998
-+++ configure	Fri Oct 23 00:46:12 1998
-@@ -930,12 +930,12 @@
- 
- 
- 	if test "$no_gnome_config" = "yes"; then
--          echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:935: checking for gnomeConf.sh file in $gnome_prefix" >&5
--	  if test -f $gnome_prefix/gnomeConf.sh; then
-+          echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:935: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+	  if test -f $prefix/share/gnome/gnomeConf.sh; then
- 	    echo "$ac_t""found" 1>&6
--	    echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh"
--	    . $gnome_prefix/gnomeConf.sh
-+	    echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
-+	    . $prefix/share/gnome/gnomeConf.sh
- 	    
- 	  else
- 	    echo "$ac_t""not found" 1>&6
+--- configure.orig	Thu Dec 31 03:05:56 1998
++++ configure	Tue Jan  5 13:38:32 1999
+@@ -1081,13 +1081,13 @@
+ 	    fi
+ 	
+ 	    if test "$no_gnome_config" = "yes"; then
+-              echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
+-echo "configure:1086: checking for gnomeConf.sh file in $gnome_prefix" >&5
+-	      if test -f $gnome_prefix/gnomeConf.sh; then
++              echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
++echo "configure:1086: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
++	      if test -f $prefix/share/gnome/gnomeConf.sh; then
+ 	        echo "$ac_t""found" 1>&6
+ 	        echo "loading gnome configuration from" \
+-		     "$gnome_prefix/gnomeConf.sh"
+-	        . $gnome_prefix/gnomeConf.sh
++		     "$prefix/share/gnome/gnomeConf.sh"
++	        . $prefix/share/gnome/gnomeConf.sh
+ 	        
+ 	      else
+ 	        echo "$ac_t""not found" 1>&6
+@@ -2573,7 +2573,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lxml `gnome-config --libs xml` $LIBS"
++LIBS="-lxml -lz $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2579 "configure"
+ #include "confdefs.h"
+@@ -2604,7 +2604,7 @@
+   
+ 		
+ 		
+-		GNOME_XML_LIB=`gnome-config --libs xml`
++		GNOME_XML_LIB=`xml-config --libs`
+ 	
+ else
+   echo "$ac_t""no" 1>&6
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index e14901a70f22..8f095f2dff65 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -1,15 +1,36 @@
 bin/gnumeric
-share/gnome/apps/Productivity/gnumeric.desktop
-share/gnome/gnumeric/plugins/libsample.a
-share/gnome/gnumeric/plugins/libsample.la
-share/gnome/gnumeric/plugins/libsample.so
-share/gnome/gnumeric/plugins/libsample.so.0
+bin/gnumeric-corba
+share/gnome/apps/Applications/gnumeric.desktop
+share/gnome/gnumeric/guile/gnumeric_startup.scm
+share/gnome/gnumeric/plugins/libgnumguile.a
+share/gnome/gnumeric/plugins/libgnumguile.la
+share/gnome/gnumeric/plugins/libgnumguile.so
+share/gnome/gnumeric/plugins/libgnumguile.so.0
+share/gnome/gnumeric/plugins/libstat.a
+share/gnome/gnumeric/plugins/libstat.la
+share/gnome/gnumeric/plugins/libstat.so
+share/gnome/gnumeric/plugins/libstat.so.0
+share/gnome/mime-info/gnumeric.keys
+share/gnome/mime-info/gnumeric.mime
+share/gnome/pixmaps/gnome-gnumeric.png
+share/locale/cs/LC_MESSAGES/gnumeric.mo
+share/locale/de/LC_MESSAGES/gnumeric.mo
 share/locale/es/LC_MESSAGES/gnumeric.mo
-share/locale/es@mx/LC_MESSAGES/gnumeric.mo
+share/locale/es_DO/LC_MESSAGES/gnumeric.mo
+share/locale/es_GT/LC_MESSAGES/gnumeric.mo
+share/locale/es_HN/LC_MESSAGES/gnumeric.mo
+share/locale/es_MX/LC_MESSAGES/gnumeric.mo
+share/locale/es_PA/LC_MESSAGES/gnumeric.mo
+share/locale/es_PE/LC_MESSAGES/gnumeric.mo
+share/locale/es_SV/LC_MESSAGES/gnumeric.mo
 share/locale/fr/LC_MESSAGES/gnumeric.mo
 share/locale/hu/LC_MESSAGES/gnumeric.mo
 share/locale/it/LC_MESSAGES/gnumeric.mo
+share/locale/ja/LC_MESSAGES/gnumeric.mo
 share/locale/ko/LC_MESSAGES/gnumeric.mo
+share/locale/no/LC_MESSAGES/gnumeric.mo
+share/locale/no_NO/LC_MESSAGES/gnumeric.mo
 share/locale/pt/LC_MESSAGES/gnumeric.mo
+@dirrm share/gnome/gnumeric/guile
 @dirrm share/gnome/gnumeric/plugins
 @dirrm share/gnome/gnumeric