- Update to 5.1.

7 files changed, 6 insertions, 43 deletions

diff --git a/math/sage/Makefile b/math/sage/Makefile
index e297e97b7109..896e0dd11f61 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sage
-PORTVERSION=	5.0.1
+PORTVERSION=	5.1
 CATEGORIES=	math
 MASTER_SITES=	http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/ \
 		http://mirrors.xmission.com/sage/src/ \
@@ -17,12 +17,10 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Open source Mathematics software
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		latex:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base
 LIB_DEPENDS=	atlas:${PORTSDIR}/math/atlas \
 		lapack:${PORTSDIR}/math/lapack \
 		jpeg:${PORTSDIR}/graphics/jpeg
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 # 387 option: this only makes a difference for the amd64 architecture.  Causes
 # the internal floating point calculations to be performed with extended
@@ -71,7 +69,6 @@ post-patch:
 # Create the wrappers for the compiler invocations.
 	@${MKDIR} ${WRKSRC}/local/bin
 	@${LN} -s -f ${LOCALBASE}/bin/gmake ${WRKSRC}/local/bin/make
-	@${LN} -s -f ${LOCALBASE}/bin/bash ${WRKSRC}/local/bin/sh
 	@${SED} -e 's#%%CC%%#${LOCALBASE}/bin/${CC}#' \
 		-e 's#%%LDFLAGS%%#${LDFLAGS} ${FPM_FLAG}#' \
 		${FILESDIR}/gcc.in > ${WRKSRC}/local/bin/cc
diff --git a/math/sage/distinfo b/math/sage/distinfo
index 3e734df867ed..5ec834d20e58 100644
--- a/math/sage/distinfo
+++ b/math/sage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sage-5.0.1.tar) = 28c20615403a4e15b1deb95b391cb03ae0e1959c0b663f90b8d4d3bb90f362ae
-SIZE (sage-5.0.1.tar) = 308305920
+SHA256 (sage-5.1.tar) = 43839a968166552a42df227fe76afff43007a18fb4f9c6729232648c2db9fab6
+SIZE (sage-5.1.tar) = 304209920
diff --git a/math/sage/files/spkg-patch-flintqs-20070817.p6_-_patches_TonelliShanks.h.patch b/math/sage/files/spkg-patch-flintqs-20070817.p6_-_patches_TonelliShanks.h.patch
deleted file mode 100644
index 5455cbda087e..000000000000
--- a/math/sage/files/spkg-patch-flintqs-20070817.p6_-_patches_TonelliShanks.h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /dev/null	2012-04-08 00:45:00.000000000 +0000
-+++ flintqs-20070817.p6/patches/TonelliShanks.h.patch	2012-04-08 00:45:31.000000000 +0000
-@@ -0,0 +1,10 @@
-+--- src/TonelliShanks.h.orig	2007-05-05 22:52:39.000000000 +0000
-++++ src/TonelliShanks.h	2012-04-08 00:44:38.000000000 +0000
-+@@ -19,6 +19,7 @@
-+ 
-+ ============================================================================*/
-+ 
-++#include <stdint.h>
-+ #include <stdlib.h>
-+ 
-+ // =====================================================================
diff --git a/math/sage/files/spkg-patch-flintqs-20070817.p6_-_spkg-install b/math/sage/files/spkg-patch-flintqs-20070817.p6_-_spkg-install
deleted file mode 100644
index 91978d6f41a0..000000000000
--- a/math/sage/files/spkg-patch-flintqs-20070817.p6_-_spkg-install
+++ /dev/null
@@ -1,10 +0,0 @@
---- flintqs-20070817.p6/spkg-install-orig	2012-04-08 00:46:21.000000000 +0000
-+++ flintqs-20070817.p6/spkg-install	2012-04-08 00:55:33.000000000 +0000
-@@ -7,6 +7,7 @@
- fi
- 
- cp patches/lanczos.h  src/
-+patch -p0 < patches/TonelliShanks.h.patch
- 
- cd src
- 
diff --git a/math/sage/files/spkg-patch-gap-4.4.12.p6_-_patches_sysfiles.c b/math/sage/files/spkg-patch-gap-4.4.12.p6_-_patches_sysfiles.c
index a74d6fe8199d..bd7057cf5314 100644
--- a/math/sage/files/spkg-patch-gap-4.4.12.p6_-_patches_sysfiles.c
+++ b/math/sage/files/spkg-patch-gap-4.4.12.p6_-_patches_sysfiles.c
@@ -1,5 +1,5 @@
 --- gap-4.4.12.p6/patches/sysfiles.c.orig	2010-04-29 01:30:00.000000000 +1000
-+++ gap-4.4.12.p6/patches/sysfiles.c	2010-07-26 05:25:58.334562226 +1000
++++ gap-4.4.12.p7/patches/sysfiles.c	2010-07-26 05:25:58.334562226 +1000
 @@ -1524,7 +1524,7 @@
  **  to cooked mode before stopping GAP and back to raw mode when continueing.
  */
diff --git a/math/sage/files/spkg-patch-sage-5.0_-_sage_combinat_partitions_c.cc b/math/sage/files/spkg-patch-sage-5.0_-_sage_combinat_partitions_c.cc
deleted file mode 100644
index 8be8ea525d40..000000000000
--- a/math/sage/files/spkg-patch-sage-5.0_-_sage_combinat_partitions_c.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- sage-5.0.beta13/sage/combinat/partitions_c.cc-orig	2012-04-20 01:01:41.000000000 +0000
-+++ sage-5.0.1/sage/combinat/partitions_c.cc	2012-04-20 01:02:47.000000000 +0000
-@@ -152,7 +152,7 @@
- const unsigned int double_precision = DBL_MANT_DIG;                         // The assumed precision of a double.
- 
- 
--#if defined(__sparc) || defined(__CYGWIN__)
-+#if defined(__sparc) || defined(__CYGWIN__) || defined(__FreeBSD__)
- // On sparc solaris long double is bad/broken/different, etc.  E.g.,
- // LDBL_MANT_DIG is 113 rather than 106, which causes all kinds of trouble.
- // So we only use double_precision.
diff --git a/math/sage/files/spkg-patch-sage-5.0_-_sage_misc_getusage.py b/math/sage/files/spkg-patch-sage-5.0_-_sage_misc_getusage.py
index e33db38a561c..5e9d804bcb3c 100644
--- a/math/sage/files/spkg-patch-sage-5.0_-_sage_misc_getusage.py
+++ b/math/sage/files/spkg-patch-sage-5.0_-_sage_misc_getusage.py
@@ -1,5 +1,5 @@
 --- sage-5.0.beta13/sage/misc/getusage.py-orig	2012-04-11 00:14:47.000000000 +0000
-+++ sage-5.0.1/sage/misc/getusage.py	2012-04-11 00:47:03.000000000 +0000
++++ sage-5.1/sage/misc/getusage.py	2012-04-11 00:47:03.000000000 +0000
 @@ -20,6 +20,8 @@
      """
      Return the 'top' or 'prstat' line that contains this running Sage