aboutsummaryrefslogtreecommitdiffstats
path: root/math/sage
diff options
context:
space:
mode:
Diffstat (limited to 'math/sage')
-rw-r--r--math/sage/Makefile3
-rw-r--r--math/sage/distinfo4
-rw-r--r--math/sage/files/spkg-patch-maxima_-_src_interfaces_xmaxima_Makefile.in2
-rw-r--r--math/sage/files/spkg-patch-numpy_-_src_numpy_distutils_system_info.py13
-rw-r--r--math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst2
-rw-r--r--math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure2
-rw-r--r--math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c2
-rw-r--r--math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h2
-rw-r--r--math/sage/files/spkg-patch-python_-_src_setup.py16
-rw-r--r--math/sage/files/spkg-patch-sage_-_doc_common_builder.py2
10 files changed, 30 insertions, 18 deletions
diff --git a/math/sage/Makefile b/math/sage/Makefile
index 200dd3ab110b..e54423527f11 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= sage
-PORTVERSION= 5.9
-PORTREVISION= 1
+PORTVERSION= 5.10
CATEGORIES= math
MASTER_SITES= http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/ \
http://mirrors.xmission.com/sage/src/ \
diff --git a/math/sage/distinfo b/math/sage/distinfo
index 57a37d1dc2a2..b48f24daf5eb 100644
--- a/math/sage/distinfo
+++ b/math/sage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sage-5.9.tar) = 56fdb8272b49eb8bed4e3068416ff2ba6cb95bcd4abea82c5fb639f7c7cfea20
-SIZE (sage-5.9.tar) = 328867840
+SHA256 (sage-5.10.tar) = 6675f3a0bd04d54cf7699354814e3d9fc184397d4c18b331487c1ffbd16901ed
+SIZE (sage-5.10.tar) = 335462400
diff --git a/math/sage/files/spkg-patch-maxima_-_src_interfaces_xmaxima_Makefile.in b/math/sage/files/spkg-patch-maxima_-_src_interfaces_xmaxima_Makefile.in
index d7ea7df6edd9..5d89c5c2cdd9 100644
--- a/math/sage/files/spkg-patch-maxima_-_src_interfaces_xmaxima_Makefile.in
+++ b/math/sage/files/spkg-patch-maxima_-_src_interfaces_xmaxima_Makefile.in
@@ -1,5 +1,5 @@
--- maxima-5.29.1.p1/src/interfaces/xmaxima/Makefile.in-orig 2013-05-09 02:26:31.000000000 +0000
-+++ maxima-5.29.1.p1/src/interfaces/xmaxima/Makefile.in 2013-05-09 02:30:12.000000000 +0000
++++ maxima-5.29.1.p3/src/interfaces/xmaxima/Makefile.in 2013-05-09 02:30:12.000000000 +0000
@@ -624,14 +624,10 @@
tclIndex:: $(TKSOURCES)
echo "source ../ObjTcl/Object.tcl; auto_mkindex . $(TKSOURCES)" | $(TCLSH)
diff --git a/math/sage/files/spkg-patch-numpy_-_src_numpy_distutils_system_info.py b/math/sage/files/spkg-patch-numpy_-_src_numpy_distutils_system_info.py
new file mode 100644
index 000000000000..1db862fcff27
--- /dev/null
+++ b/math/sage/files/spkg-patch-numpy_-_src_numpy_distutils_system_info.py
@@ -0,0 +1,13 @@
+--- numpy-1.7.0/src/numpy/distutils/system_info.py.orig 2013-02-09 21:04:56.000000000 +0000
++++ numpy-1.7.0/src/numpy/distutils/system_info.py 2013-05-27 21:51:12.000000000 +0000
+@@ -983,8 +983,8 @@
+ dir_env_var = 'ATLAS'
+ _lib_names = ['f77blas', 'cblas']
+ if sys.platform[:7] == 'freebsd':
+- _lib_atlas = ['atlas_r']
+- _lib_lapack = ['alapack_r']
++ _lib_atlas = ['atlas']
++ _lib_lapack = ['alapack']
+ else:
+ _lib_atlas = ['atlas']
+ _lib_lapack = ['lapack']
diff --git a/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst b/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst
index 772ab39a43f3..c009e2f5ed9d 100644
--- a/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst
+++ b/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst
@@ -1,5 +1,5 @@
--- python-2.7.3.p0/src/Doc/library/fcntl.rst.orig 2011-06-11 15:46:23.000000000 +0000
-+++ python-2.7.3.p6/src/Doc/library/fcntl.rst 2012-04-22 00:31:48.000000000 +0000
++++ python-2.7.4.p0/src/Doc/library/fcntl.rst 2012-04-22 00:31:48.000000000 +0000
@@ -50,8 +50,6 @@
operations are typically defined in the library module :mod:`termios` and the
argument handling is even more complicated.
diff --git a/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure b/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure
index 9f66c07267d6..b833bd05ab79 100644
--- a/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure
+++ b/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure
@@ -1,5 +1,5 @@
--- python-2.7.3.p0/src/Modules/_ctypes/libffi/configure.orig 2011-06-11 15:46:26.000000000 +0000
-+++ python-2.7.3.p6/src/Modules/_ctypes/libffi/configure 2012-04-22 00:23:14.000000000 +0000
++++ python-2.7.4.p0/src/Modules/_ctypes/libffi/configure 2012-04-22 00:23:14.000000000 +0000
@@ -6289,7 +6289,7 @@
rm -rf conftest*
;;
diff --git a/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c b/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c
index c728c311f844..243028f0ad28 100644
--- a/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c
+++ b/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c
@@ -1,5 +1,5 @@
--- python-2.7.3.p0/src/Modules/fcntlmodule.c.orig 2011-06-11 15:46:27.000000000 +0000
-+++ python-2.7.3.p6/src/Modules/fcntlmodule.c 2012-04-22 00:23:34.000000000 +0000
++++ python-2.7.4.p0/src/Modules/fcntlmodule.c 2012-04-22 00:23:34.000000000 +0000
@@ -97,20 +97,15 @@
{
#define IOCTL_BUFSZ 1024
diff --git a/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h b/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h
index 238ac77a553a..368b69ad494c 100644
--- a/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h
+++ b/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h
@@ -1,5 +1,5 @@
--- python-2.7.3.p0/src/Python/thread_pthread.h.orig 2011-06-11 15:46:28.000000000 +0000
-+++ python-2.7.3.p6/src/Python/thread_pthread.h 2012-04-22 00:23:46.000000000 +0000
++++ python-2.7.4.p0/src/Python/thread_pthread.h 2012-04-22 00:23:46.000000000 +0000
@@ -38,13 +38,18 @@
#endif
#endif
diff --git a/math/sage/files/spkg-patch-python_-_src_setup.py b/math/sage/files/spkg-patch-python_-_src_setup.py
index 74ff58606be9..5c547c8b52f9 100644
--- a/math/sage/files/spkg-patch-python_-_src_setup.py
+++ b/math/sage/files/spkg-patch-python_-_src_setup.py
@@ -1,5 +1,5 @@
---- python-2.7.3.p6/src/setup.py-orig 2013-03-17 03:13:46.000000000 +0000
-+++ python-2.7.3.p6/src/setup.py 2013-03-17 03:15:11.000000000 +0000
+--- python-2.7.4.p0/src/setup.py-orig 2013-03-17 03:13:46.000000000 +0000
++++ python-2.7.4.p0/src/setup.py 2013-03-17 03:15:11.000000000 +0000
@@ -642,7 +642,7 @@
# use the same library for the readline and curses modules.
if 'curses' in readline_termcap_library:
@@ -63,8 +63,8 @@
macros = dict()
libraries = []
-- elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-+ elif platform in ('freebsd4', 'freebsd5', 'freebsd6'):
+- elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
++ elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6'):
# FreeBSD's P1003.1b semaphore support is very experimental
# and has many known problems. (as of June 2008)
- macros = dict()
@@ -75,7 +75,7 @@
+ )
+ libraries = []
+
-+ elif platform in ('freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'):
++ elif host_platform in ('freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'):
+ macros = dict( # FreeBSD 7+
+ HAVE_SEM_OPEN=1,
+ HAVE_SEM_TIMEDWAIT=1,
@@ -83,14 +83,14 @@
+ )
libraries = []
- elif platform.startswith('openbsd'):
+ elif host_platform.startswith('openbsd'):
@@ -1484,7 +1500,7 @@
missing.append('linuxaudiodev')
- if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
+ if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
- 'freebsd7', 'freebsd8')
+ 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10')
- or platform.startswith("gnukfreebsd")):
+ or host_platform.startswith("gnukfreebsd")):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
else:
@@ -2066,9 +2082,7 @@
diff --git a/math/sage/files/spkg-patch-sage_-_doc_common_builder.py b/math/sage/files/spkg-patch-sage_-_doc_common_builder.py
index bfef917f3b53..8c2b64b0b0e7 100644
--- a/math/sage/files/spkg-patch-sage_-_doc_common_builder.py
+++ b/math/sage/files/spkg-patch-sage_-_doc_common_builder.py
@@ -1,5 +1,5 @@
--- sage-5.8.rc0/doc/common/builder.py-orig 2013-03-17 20:50:38.000000000 +0000
-+++ sage-5.9/doc/common/builder.py 2013-03-17 20:56:42.000000000 +0000
++++ sage-5.10/doc/common/builder.py 2013-03-17 20:56:42.000000000 +0000
@@ -272,13 +272,16 @@
# build the other documents in parallel