Update to 0.57, now using x11-toolkits/gal

svn path=/head/; revision=33710

math/gnumeric/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnumeric
-PORTVERSION=	0.56
+PORTVERSION=	0.57
-PORTREVISION=	1
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnumeric
@@ -20,7 +19,8 @@ LIB_DEPENDS=	gnomeprint.12:${PORTSDIR}/print/gnomeprint \
 		glade.4:${PORTSDIR}/devel/libglade \
 		guile.9:${PORTSDIR}/lang/guile \
 		gnomeole2.0:${PORTSDIR}/devel/libole2 \
-		gb.0:${PORTSDIR}/lang/gnomebasic
+		gb.0:${PORTSDIR}/lang/gnomebasic \
+		gal.0:${PORTSDIR}/x11-toolkits/gal
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
@@ -28,9 +28,9 @@ USE_GMAKE=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--with-guile --without-bonobo
+CONFIGURE_ARGS=	--with-guile --without-bonobo --with-gb
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib -lintl"
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 

math/gnumeric/distinfo

@@ -1 +1 @@
-MD5 (gnumeric-0.56.tar.gz) = 674581cf58fc5b5158fb5103327955be
+MD5 (gnumeric-0.57.tar.gz) = abe5002a4b812c86c85363cc24ac3a8a

math/gnumeric/files/patch-aa

@@ -1,19 +1,13 @@
---- configure.orig	Mon Jun 19 21:00:38 2000
+--- configure.orig	Tue Oct 10 10:27:58 2000
-+++ configure	Tue Jun 20 11:28:48 2000
++++ configure	Wed Oct 11 12:15:15 2000
-@@ -5940,8 +5940,8 @@
+@@ -6136,4 +6136,4 @@
- 
+ echo "configure:6137: checking for GTK >= 1.2.7" >&5
- echo $ac_n "checking for GTK >= 1.2.7""... $ac_c" 1>&6
- echo "configure:5943: 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
-         echo "$ac_t""found" 1>&6
+@@ -6677,6 +6677,6 @@
-     else
-@@ -6481,10 +6481,10 @@
-     top_srcdir="$ac_dots$ac_given_srcdir" ;;
-   esac
  
 -  case "$ac_given_INSTALL" in
 -  [/$]*) INSTALL="$ac_given_INSTALL" ;;
@@ -24,5 +18,3 @@
 +#  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
 +#  esac
  
-   echo creating "$ac_file"
-   rm -f "$ac_file"

math/gnumeric/files/patch-ce

@@ -0,0 +1,16 @@
+--- src/format.c.orig	Fri Sep 22 09:45:19 2000
++++ src/format.c	Wed Oct 11 12:36:59 2000
+@@ -28,3 +28,5 @@
+ #include <math.h>
++#ifdef __linux__
+ #include <langinfo.h>
++#endif
+ #include <limits.h>
+@@ -108,2 +110,3 @@
+ 
++#ifdef __linux__
+ 	if (!date_order_cached) {
+@@ -123,2 +126,3 @@
+ 	}
++#endif
+ 

math/gnumeric2/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnumeric
-PORTVERSION=	0.56
+PORTVERSION=	0.57
-PORTREVISION=	1
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnumeric
@@ -20,7 +19,8 @@ LIB_DEPENDS=	gnomeprint.12:${PORTSDIR}/print/gnomeprint \
 		glade.4:${PORTSDIR}/devel/libglade \
 		guile.9:${PORTSDIR}/lang/guile \
 		gnomeole2.0:${PORTSDIR}/devel/libole2 \
-		gb.0:${PORTSDIR}/lang/gnomebasic
+		gb.0:${PORTSDIR}/lang/gnomebasic \
+		gal.0:${PORTSDIR}/x11-toolkits/gal
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
@@ -28,9 +28,9 @@ USE_GMAKE=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--with-guile --without-bonobo
+CONFIGURE_ARGS=	--with-guile --without-bonobo --with-gb
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib -lintl"
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 

math/gnumeric2/distinfo

@@ -1 +1 @@
-MD5 (gnumeric-0.56.tar.gz) = 674581cf58fc5b5158fb5103327955be
+MD5 (gnumeric-0.57.tar.gz) = abe5002a4b812c86c85363cc24ac3a8a

math/gnumeric2/files/patch-aa

@@ -1,19 +1,13 @@
---- configure.orig	Mon Jun 19 21:00:38 2000
+--- configure.orig	Tue Oct 10 10:27:58 2000
-+++ configure	Tue Jun 20 11:28:48 2000
++++ configure	Wed Oct 11 12:15:15 2000
-@@ -5940,8 +5940,8 @@
+@@ -6136,4 +6136,4 @@
- 
+ echo "configure:6137: checking for GTK >= 1.2.7" >&5
- echo $ac_n "checking for GTK >= 1.2.7""... $ac_c" 1>&6
- echo "configure:5943: 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
-         echo "$ac_t""found" 1>&6
+@@ -6677,6 +6677,6 @@
-     else
-@@ -6481,10 +6481,10 @@
-     top_srcdir="$ac_dots$ac_given_srcdir" ;;
-   esac
  
 -  case "$ac_given_INSTALL" in
 -  [/$]*) INSTALL="$ac_given_INSTALL" ;;
@@ -24,5 +18,3 @@
 +#  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
 +#  esac
  
-   echo creating "$ac_file"
-   rm -f "$ac_file"

math/gnumeric2/files/patch-ce

@@ -0,0 +1,16 @@
+--- src/format.c.orig	Fri Sep 22 09:45:19 2000
++++ src/format.c	Wed Oct 11 12:36:59 2000
+@@ -28,3 +28,5 @@
+ #include <math.h>
++#ifdef __linux__
+ #include <langinfo.h>
++#endif
+ #include <limits.h>
+@@ -108,2 +110,3 @@
+ 
++#ifdef __linux__
+ 	if (!date_order_cached) {
+@@ -123,2 +126,3 @@
+ 	}
++#endif
+