6 files changed, 38 insertions, 30 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 6524a459149d..77c5645ddb21 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,20 +1,24 @@
 # New ports collection makefile for:	gnumeric
-# Version required:			0.5
+# Version required:			0.6
 # Date created:				08 October 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.4 1999/01/05 08:00:33 vanilla Exp $
+# $Id: Makefile,v 1.5 1999/01/12 16:50:40 vanilla Exp $
 #
 
-DISTNAME=	gnumeric-0.5
+DISTNAME=	gnumeric-0.6
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
-		ftp://ftp.gnome.org/pub/GNOME/sources/
+MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/latest/ \
+		ftp://ftp.geo.net/pub/gnome/sources/latest/ \
+		ftp://gnomeftp.wgn.net/pub/gnome/sources/latest/ \
+		ftp://ftp.gnome.org/pub/GNOME/sources/latest/
 
 MAINTAINER=	nacai@iname.com
 
+RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 LIB_DEPENDS=	xml.0:${PORTSDIR}/textproc/libxml \
-		gnome.1:${PORTSDIR}/x11/gnomelibs
+		gnome.1:${PORTSDIR}/x11/gnomelibs \
+		guile.4:${PORTSDIR}/lang/guile
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index bb4a4545cbae..0b5453e9d40c 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.5.tar.gz) = 1d4ce24719184ec9eeb5e080342a988b
+MD5 (gnumeric-0.6.tar.gz) = 269b2cf9d07c7ff53ef2cd789c05184f
diff --git a/math/gnumeric/files/patch-aa b/math/gnumeric/files/patch-aa
index 359d3f91c362..19da91d790de 100644
--- a/math/gnumeric/files/patch-aa
+++ b/math/gnumeric/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.orig	Thu Dec 31 03:05:56 1998
-+++ configure	Tue Jan  5 13:38:32 1999
-@@ -1081,13 +1081,13 @@
+--- configure.orig	Tue Jan  5 08:57:49 1999
++++ configure	Fri Jan 15 04:19:33 1999
+@@ -1085,13 +1085,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
+-echo "configure:1090: 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
++echo "configure:1090: 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" \
@@ -19,16 +19,16 @@
  	        
  	      else
  	        echo "$ac_t""not found" 1>&6
-@@ -2573,7 +2573,7 @@
+@@ -2583,7 +2583,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"
+ #line 2589 "configure"
  #include "confdefs.h"
-@@ -2604,7 +2604,7 @@
+@@ -2614,7 +2614,7 @@
    
  		
  		
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 6524a459149d..77c5645ddb21 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -1,20 +1,24 @@
 # New ports collection makefile for:	gnumeric
-# Version required:			0.5
+# Version required:			0.6
 # Date created:				08 October 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.4 1999/01/05 08:00:33 vanilla Exp $
+# $Id: Makefile,v 1.5 1999/01/12 16:50:40 vanilla Exp $
 #
 
-DISTNAME=	gnumeric-0.5
+DISTNAME=	gnumeric-0.6
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
-		ftp://ftp.gnome.org/pub/GNOME/sources/
+MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/latest/ \
+		ftp://ftp.geo.net/pub/gnome/sources/latest/ \
+		ftp://gnomeftp.wgn.net/pub/gnome/sources/latest/ \
+		ftp://ftp.gnome.org/pub/GNOME/sources/latest/
 
 MAINTAINER=	nacai@iname.com
 
+RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 LIB_DEPENDS=	xml.0:${PORTSDIR}/textproc/libxml \
-		gnome.1:${PORTSDIR}/x11/gnomelibs
+		gnome.1:${PORTSDIR}/x11/gnomelibs \
+		guile.4:${PORTSDIR}/lang/guile
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index bb4a4545cbae..0b5453e9d40c 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.5.tar.gz) = 1d4ce24719184ec9eeb5e080342a988b
+MD5 (gnumeric-0.6.tar.gz) = 269b2cf9d07c7ff53ef2cd789c05184f
diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa
index 359d3f91c362..19da91d790de 100644
--- a/math/gnumeric2/files/patch-aa
+++ b/math/gnumeric2/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.orig	Thu Dec 31 03:05:56 1998
-+++ configure	Tue Jan  5 13:38:32 1999
-@@ -1081,13 +1081,13 @@
+--- configure.orig	Tue Jan  5 08:57:49 1999
++++ configure	Fri Jan 15 04:19:33 1999
+@@ -1085,13 +1085,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
+-echo "configure:1090: 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
++echo "configure:1090: 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" \
@@ -19,16 +19,16 @@
  	        
  	      else
  	        echo "$ac_t""not found" 1>&6
-@@ -2573,7 +2573,7 @@
+@@ -2583,7 +2583,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"
+ #line 2589 "configure"
  #include "confdefs.h"
-@@ -2604,7 +2604,7 @@
+@@ -2614,7 +2614,7 @@