Date: Tue, 19 Mar 2013 03:01: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: r314614 - in head/math/sage: . files Message-ID: <201303190301.r2J31SFI006447@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stephen Date: Tue Mar 19 03:01:28 2013 New Revision: 314614 URL: http://svnweb.freebsd.org/changeset/ports/314614 Log: - Update to 5.8. - Patch because threaded document building fails under FreeBSD. Added: head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py (contents, props changed) Modified: head/math/sage/Makefile head/math/sage/distinfo head/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py Modified: head/math/sage/Makefile ============================================================================== --- head/math/sage/Makefile Tue Mar 19 00:39:45 2013 (r314613) +++ head/math/sage/Makefile Tue Mar 19 03:01:28 2013 (r314614) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sage -PORTVERSION= 5.7 +PORTVERSION= 5.8 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 Tue Mar 19 00:39:45 2013 (r314613) +++ head/math/sage/distinfo Tue Mar 19 03:01:28 2013 (r314614) @@ -1,2 +1,2 @@ -SHA256 (sage-5.7.tar) = 325709fdde8836dea82d4b553a6ce0596403e5ace1e3a598988f081e389cc4d0 -SIZE (sage-5.7.tar) = 322447360 +SHA256 (sage-5.8.tar) = 4c34f4533a518e0ef8b34b2ed51443beae57e00d2f9ef31fa2811338610619ba +SIZE (sage-5.8.tar) = 329318400 Added: head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py Tue Mar 19 03:01:28 2013 (r314614) @@ -0,0 +1,46 @@ +--- sage-5.8.rc0/doc/common/builder.py-orig 2013-03-17 20:50:38.000000000 +0000 ++++ sage-5.8/doc/common/builder.py 2013-03-17 20:56:42.000000000 +0000 +@@ -272,13 +272,16 @@ + + # build the other documents in parallel + from multiprocessing import Pool +- pool = Pool(NUM_THREADS, maxtasksperchild=1) ++ # pool = Pool(NUM_THREADS, maxtasksperchild=1) + L = [(doc, name, kwds) + args for doc in others] +- # map_async handles KeyboardInterrupt correctly. Plain map and +- # apply_async does not, so don't use it. +- pool.map_async(build_other_doc, L, 1).get(99999) +- pool.close() +- pool.join() ++ # Pool doesn't work properly in FreeBSD. Instead: ++ for iii in L: ++ build_other_doc(iii) ++ # # map_async handles KeyboardInterrupt correctly. Plain map and ++ # # apply_async does not, so don't use it. ++ # pool.map_async(build_other_doc, L, 1).get(99999) ++ # pool.close() ++ # pool.join() + logger.warning("Elapsed time: %.1f seconds."%(time.time()-start)) + logger.warning("Done building the documentation!") + +@@ -464,12 +467,15 @@ + continue + output_dir = self._output_dir(format, lang) + from multiprocessing import Pool +- pool = Pool(NUM_THREADS, maxtasksperchild=1) ++ # pool = Pool(NUM_THREADS, maxtasksperchild=1) + L = [(doc, lang, format, kwds) + args for doc in self.get_all_documents(refdir)] +- # (See comment in AllBuilder._wrapper about using map instead of apply.) +- pool.map_async(build_ref_doc, L, 1).get(99999) +- pool.close() +- pool.join() ++ # Pool doesn't work properly in FreeBSD. Instead: ++ for iii in L: ++ build_ref_doc(iii) ++ # # (See comment in AllBuilder._wrapper about using map instead of apply.) ++ # pool.map_async(build_ref_doc, L, 1).get(99999) ++ # pool.close() ++ # pool.join() + # The html refman must be build at the end to ensure correct + # merging of indexes and inventories. + # Sphinx is run here in the current process (not in a Modified: head/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py ============================================================================== --- head/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py Tue Mar 19 00:39:45 2013 (r314613) +++ head/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py Tue Mar 19 03:01:28 2013 (r314614) @@ -1,5 +1,5 @@ --- 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 ++++ sage-5.8/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303190301.r2J31SFI006447>