Date: Fri, 22 Feb 2013 15:08:28 +0000 (UTC) From: Stephen Montgomery-Smith <stephen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312771 - in head/math/sage: . files Message-ID: <201302221508.r1MF8Sk6004882@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stephen Date: Fri Feb 22 15:08:27 2013 New Revision: 312771 URL: http://svnweb.freebsd.org/changeset/ports/312771 Log: - Update to 5.7. Deleted: head/math/sage/files/spkg-patch-fflas_ffpack_-_src_fflas-ffpack-config.in Modified: head/math/sage/Makefile head/math/sage/distinfo head/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst head/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure head/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c head/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h head/math/sage/files/spkg-patch-python_-_src_setup.py head/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py Modified: head/math/sage/Makefile ============================================================================== --- head/math/sage/Makefile Fri Feb 22 15:02:58 2013 (r312770) +++ head/math/sage/Makefile Fri Feb 22 15:08:27 2013 (r312771) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sage -PORTVERSION= 5.6 +PORTVERSION= 5.7 CATEGORIES= math MASTER_SITES= http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/ \ http://mirrors.xmission.com/sage/src/ \ Modified: head/math/sage/distinfo ============================================================================== --- head/math/sage/distinfo Fri Feb 22 15:02:58 2013 (r312770) +++ head/math/sage/distinfo Fri Feb 22 15:08:27 2013 (r312771) @@ -1,2 +1,2 @@ -SHA256 (sage-5.6.tar) = db033b194089fc161cd4d65f9e0a3c496c3ddd076b588b0477e61d0c4a104e39 -SIZE (sage-5.6.tar) = 319508480 +SHA256 (sage-5.7.tar) = 325709fdde8836dea82d4b553a6ce0596403e5ace1e3a598988f081e389cc4d0 +SIZE (sage-5.7.tar) = 322447360 Modified: head/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst ============================================================================== --- head/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst Fri Feb 22 15:02:58 2013 (r312770) +++ head/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst Fri Feb 22 15:08:27 2013 (r312771) @@ -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.p3/src/Doc/library/fcntl.rst 2012-04-22 00:31:48.000000000 +0000 ++++ python-2.7.3.p5/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. Modified: head/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure ============================================================================== --- head/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure Fri Feb 22 15:02:58 2013 (r312770) +++ head/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure Fri Feb 22 15:08:27 2013 (r312771) @@ -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.p3/src/Modules/_ctypes/libffi/configure 2012-04-22 00:23:14.000000000 +0000 ++++ python-2.7.3.p5/src/Modules/_ctypes/libffi/configure 2012-04-22 00:23:14.000000000 +0000 @@ -6289,7 +6289,7 @@ rm -rf conftest* ;; Modified: head/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c ============================================================================== --- head/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c Fri Feb 22 15:02:58 2013 (r312770) +++ head/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c Fri Feb 22 15:08:27 2013 (r312771) @@ -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.p3/src/Modules/fcntlmodule.c 2012-04-22 00:23:34.000000000 +0000 ++++ python-2.7.3.p5/src/Modules/fcntlmodule.c 2012-04-22 00:23:34.000000000 +0000 @@ -97,20 +97,15 @@ { #define IOCTL_BUFSZ 1024 Modified: head/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h ============================================================================== --- head/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h Fri Feb 22 15:02:58 2013 (r312770) +++ head/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h Fri Feb 22 15:08:27 2013 (r312771) @@ -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.p3/src/Python/thread_pthread.h 2012-04-22 00:23:46.000000000 +0000 ++++ python-2.7.3.p5/src/Python/thread_pthread.h 2012-04-22 00:23:46.000000000 +0000 @@ -38,13 +38,18 @@ #endif #endif Modified: head/math/sage/files/spkg-patch-python_-_src_setup.py ============================================================================== --- head/math/sage/files/spkg-patch-python_-_src_setup.py Fri Feb 22 15:02:58 2013 (r312770) +++ head/math/sage/files/spkg-patch-python_-_src_setup.py Fri Feb 22 15:08:27 2013 (r312771) @@ -1,5 +1,5 @@ --- python-2.7.3.p0/src/setup.py-orig 2012-04-22 00:04:08.000000000 +0000 -+++ python-2.7.3.p3/src/setup.py 2012-04-22 00:10:25.000000000 +0000 ++++ python-2.7.3.p5/src/setup.py 2012-04-22 00:10:25.000000000 +0000 @@ -1432,10 +1432,24 @@ macros = dict() libraries = [] Modified: head/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py ============================================================================== --- head/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py Fri Feb 22 15:02:58 2013 (r312770) +++ head/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py Fri Feb 22 15:08:27 2013 (r312771) @@ -1,5 +1,5 @@ ---- sage-5.0.beta13/sage/misc/getusage.py-orig 2012-04-11 00:14:47.000000000 +0000 -+++ sage-5.6/sage/misc/getusage.py 2012-04-11 00:47:03.000000000 +0000 +--- sage-5.7.beta4/sage/misc/getusage.py-old 2013-02-09 23:05:24.000000000 +0000 ++++ sage-5.7/sage/misc/getusage.py 2013-02-09 23:09:50.000000000 +0000 @@ -20,6 +20,8 @@ """ Return the 'top' or 'prstat' line that contains this running Sage @@ -9,16 +9,16 @@ OUTPUT: -@@ -53,6 +55,8 @@ - cmd = 'top -l 1 |grep "^ *%s "' % pid - elif U == 'sunos': +@@ -55,6 +57,8 @@ cmd = '/usr/bin/prstat -n 100000 1 1 | grep "^ *%s "' % pid + elif U[:6] == 'cygwin': + cmd = 'top -b -n 1 -p %s' % pid + elif U == 'freebsd': + cmd = 'ps -axwww -o pid,user,vsz,rss,state,pri,nice,time,cpu,comm | grep "^ *%s "' % pid else: raise NotImplementedError("top not implemented on platform %s" % U) -@@ -83,6 +87,9 @@ +@@ -85,6 +89,9 @@ usage, ``prstat`` will output the data in KB, MB or GB. In each case, the value returned by this function will always be in MB. @@ -28,7 +28,7 @@ - ``other`` - not implemented for any other operating systems EXAMPLES:: -@@ -129,6 +136,9 @@ +@@ -131,6 +138,9 @@ m = float(memory_in_KB_MB_or_GB.strip("M")) elif memory_in_KB_MB_or_GB.endswith("G"): m = float(memory_in_KB_MB_or_GB.strip("G")) * 1024
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302221508.r1MF8Sk6004882>