Date: Wed, 1 May 2013 20:36:52 -0700 From: Jason Helfman <bsd-src@helfman.org> To: Stephen Montgomery-Smith <stephen@FreeBSD.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r317071 - in head/math/sage: . files Message-ID: <FEACBF34-A274-4027-9BB4-D513C65EE8ED@helfman.org> In-Reply-To: <201305020315.r423FFsR045468@svn.freebsd.org> References: <201305020315.r423FFsR045468@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Any reason why iconv was reverted here? Thanks for the update! On May 1, 2013, at 8:15 PM, Stephen Montgomery-Smith <stephen@FreeBSD.org> w= rote: > Author: stephen > Date: Thu May 2 03:15:15 2013 > New Revision: 317071 > URL: http://svnweb.freebsd.org/changeset/ports/317071 >=20 > Log: > - Update to 5.9. >=20 > Added: > head/math/sage/files/spkg-patch-cephes_-_spkg-install (contents, props c= hanged) > head/math/sage/files/spkg-patch-eclib_-_src_libsrc_eclib_interface.h (c= ontents, props changed) > Deleted: > head/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py > 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_confi= gure > 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_-_doc_common_builder.py >=20 > Modified: head/math/sage/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/math/sage/Makefile Thu May 2 02:03:09 2013 (r317070) > +++ head/math/sage/Makefile Thu May 2 03:15:15 2013 (r317071) > @@ -2,7 +2,7 @@ > # $FreeBSD$ >=20 > PORTNAME=3D sage > -PORTVERSION=3D 5.8 > +PORTVERSION=3D 5.9 > CATEGORIES=3D math > MASTER_SITES=3D http://boxen.math.washington.edu/home/sagemath/sage-mir= ror/src/ \ > http://mirrors.xmission.com/sage/src/ \ > @@ -30,9 +30,10 @@ OPTIONS_DEFINE_amd64=3D 387 >=20 > PLIST_FILES=3D bin/sage > USE_FORTRAN=3D yes > +USE_GCC=3D 4.7+ > USE_TK=3D yes > USE_GMAKE=3D yes > -USES=3D iconv > +USE_ICONV=3D yes > MAKE_JOBS_SAFE=3D yes > LDFLAGS:=3D -Wl,-rpath=3D${WRKSRC}/local/lib ${LDFLAGS} > FFLAGS+=3D -Wl,-rpath=3D${WRKSRC}/local/lib ${FPM_FLAG} >=20 > Modified: head/math/sage/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/math/sage/distinfo Thu May 2 02:03:09 2013 (r317070) > +++ head/math/sage/distinfo Thu May 2 03:15:15 2013 (r317071) > @@ -1,2 +1,2 @@ > -SHA256 (sage-5.8.tar) =3D 4c34f4533a518e0ef8b34b2ed51443beae57e00d2f9ef31= fa2811338610619ba > -SIZE (sage-5.8.tar) =3D 329318400 > +SHA256 (sage-5.9.tar) =3D 56fdb8272b49eb8bed4e3068416ff2ba6cb95bcd4abea82= c5fb639f7c7cfea20 > +SIZE (sage-5.9.tar) =3D 328867840 >=20 > Added: head/math/sage/files/spkg-patch-cephes_-_spkg-install > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/math/sage/files/spkg-patch-cephes_-_spkg-install Thu May 2 03= :15:15 2013 (r317071) > @@ -0,0 +1,11 @@ > +--- cephes-2.8.p1/spkg-install-orig 2013-03-30 20:48:35.000000000 +000= 0 > ++++ cephes-2.8.p1/spkg-install 2013-03-30 20:48:57.000000000 +0000 > +@@ -24,6 +24,8 @@ > + fi > + done > +=20 > ++sed -i .orig 's|.*printf|//&1|' */mtherr.c > ++ > + echo "Building Cephes..." > + $MAKE > + if [ $? -ne 0 ]; then >=20 > Added: head/math/sage/files/spkg-patch-eclib_-_src_libsrc_eclib_interface.= h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/math/sage/files/spkg-patch-eclib_-_src_libsrc_eclib_interface.h = Thu May 2 03:15:15 2013 (r317071) > @@ -0,0 +1,10 @@ > +--- eclib-20120830/src/libsrc/eclib/interface.h-orig 2013-04-26 23:46:= 24.000000000 +0000 > ++++ eclib-20120830/src/libsrc/eclib/interface.h 2013-04-26 23:47:09.00= 0000000 +0000 > +@@ -48,6 +48,7 @@ > + #include <iterator> > + using namespace std; > + #include "templates.h" > ++#include <stdint.h> > +=20 > + #ifndef MININT > + #define MININT numeric_limits<int>::min() >=20 > Modified: head/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.r= st > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst T= hu May 2 02:03:09 2013 (r317070) > +++ head/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst T= hu May 2 03:15:15 2013 (r317071) > @@ -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.p5/src/Doc/library/fcntl.rst 2012-04-22 00:31:48.0000= 00000 +0000 > ++++ python-2.7.3.p6/src/Doc/library/fcntl.rst 2012-04-22 00:31:48.0000= 00000 +0000 > @@ -50,8 +50,6 @@ > operations are typically defined in the library module :mod:`termios` a= nd the > argument handling is even more complicated. >=20 > Modified: head/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_lib= ffi_configure > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_co= nfigure Thu May 2 02:03:09 2013 (r317070) > +++ head/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_co= nfigure Thu May 2 03:15:15 2013 (r317071) > @@ -1,5 +1,5 @@ > --- python-2.7.3.p0/src/Modules/_ctypes/libffi/configure.orig 2011-06-1= 1 15:46:26.000000000 +0000 > -+++ python-2.7.3.p5/src/Modules/_ctypes/libffi/configure 2012-04-22 00= :23:14.000000000 +0000 > ++++ python-2.7.3.p6/src/Modules/_ctypes/libffi/configure 2012-04-22 00= :23:14.000000000 +0000 > @@ -6289,7 +6289,7 @@ > rm -rf conftest* > ;; >=20 > Modified: head/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule= .c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c T= hu May 2 02:03:09 2013 (r317070) > +++ head/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c T= hu May 2 03:15:15 2013 (r317071) > @@ -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.p5/src/Modules/fcntlmodule.c 2012-04-22 00:23:34.0000= 00000 +0000 > ++++ python-2.7.3.p6/src/Modules/fcntlmodule.c 2012-04-22 00:23:34.0000= 00000 +0000 > @@ -97,20 +97,15 @@ > { > #define IOCTL_BUFSZ 1024 >=20 > Modified: head/math/sage/files/spkg-patch-python_-_src_Python_thread_pthre= ad.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h = Thu May 2 02:03:09 2013 (r317070) > +++ head/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h = Thu May 2 03:15:15 2013 (r317071) > @@ -1,5 +1,5 @@ > --- python-2.7.3.p0/src/Python/thread_pthread.h.orig 2011-06-11 15:46:2= 8.000000000 +0000 > -+++ python-2.7.3.p5/src/Python/thread_pthread.h 2012-04-22 00:23:46.00= 0000000 +0000 > ++++ python-2.7.3.p6/src/Python/thread_pthread.h 2012-04-22 00:23:46.00= 0000000 +0000 > @@ -38,13 +38,18 @@ > #endif > #endif >=20 > Modified: head/math/sage/files/spkg-patch-python_-_src_setup.py > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/math/sage/files/spkg-patch-python_-_src_setup.py Thu May 2 02= :03:09 2013 (r317070) > +++ head/math/sage/files/spkg-patch-python_-_src_setup.py Thu May 2 03= :15:15 2013 (r317071) > @@ -1,6 +1,65 @@ > ---- python-2.7.3.p0/src/setup.py-orig 2012-04-22 00:04:08.000000000 +0= 000 > -+++ python-2.7.3.p5/src/setup.py 2012-04-22 00:10:25.000000000 +0000 > -@@ -1432,10 +1432,24 @@ > +--- python-2.7.3.p6/src/setup.py-orig 2013-03-17 03:13:46.000000000 +0= 000 > ++++ python-2.7.3.p6/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: > + curses_library =3D readline_termcap_library > +- elif self.compiler.find_library_file(lib_dirs, 'ncursesw'): > ++ elif self.compiler.find_library_file(lib_dirs, 'xxxncursesw'): > + curses_library =3D 'ncursesw' > + elif self.compiler.find_library_file(lib_dirs, 'ncurses'): > + curses_library =3D 'ncurses' > +@@ -681,7 +681,7 @@ > + 'termcap'): > + readline_libs.append('termcap') > + exts.append( Extension('readline', ['readline.c'], > +- library_dirs=3D['/usr/lib/termcap'], > ++ library_dirs=3D['/usr/lib', '/usr/lib= /termcap'], > + extra_link_args=3Dreadline_extra_link= _args, > + libraries=3Dreadline_libs) ) > + else: > +@@ -783,6 +783,8 @@ > + # OpenSSL doesn't do these until 0.9.8 so we'll bring our ow= n hash > + exts.append( Extension('_sha256', ['sha256module.c']) ) > + exts.append( Extension('_sha512', ['sha512module.c']) ) > ++ else: > ++ open('.without_own_sha', 'w') > +=20 > + # Modules that provide persistent dictionary-like semantics. Yo= u will > + # probably want to arrange for at least one of them to be availa= ble on > +@@ -1120,7 +1122,7 @@ > + sysroot =3D macosx_sdk_root() > + f =3D os.path.join(sysroot, f[1:]) > +=20 > +- if os.path.exists(f) and not db_incs: > ++ if os.path.exists(f): > + data =3D open(f).read() > + m =3D re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) > + if m is not None: > +@@ -1246,12 +1248,13 @@ > + # provided by the ncurses library. > + panel_library =3D 'panel' > + if curses_library.startswith('ncurses'): > +- if curses_library =3D=3D 'ncursesw': > ++ if curses_library =3D=3D 'xxxncursesw': > + # Bug 1464056: If _curses.so links with ncursesw, > + # _curses_panel.so must link with panelw. > + panel_library =3D 'panelw' > + curses_libs =3D [curses_library] > + exts.append( Extension('_curses', ['_cursesmodule.c'], > ++ library_dirs =3D ['/usr/lib'], > + libraries =3D curses_libs) ) > + elif curses_library =3D=3D 'curses' and platform !=3D 'darwin': > + # OSX has an old Berkeley curses, not good enough for > +@@ -1264,6 +1267,7 @@ > + curses_libs =3D ['curses'] > +=20 > + exts.append( Extension('_curses', ['_cursesmodule.c'], > ++ library_dirs =3D ['/usr/lib'], > + libraries =3D curses_libs) ) > + else: > + missing.append('_curses') > +@@ -1432,10 +1436,22 @@ > macros =3D dict() > libraries =3D [] >=20 > @@ -17,8 +76,6 @@ > + libraries =3D [] > + > + elif platform in ('freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'= ): > -+ # FreeBSD's P1003.1b semaphore support is very experimental > -+ # and has many known problems. (as of June 2008) > + macros =3D dict( # FreeBSD 7+ > + HAVE_SEM_OPEN=3D1, > + HAVE_SEM_TIMEDWAIT=3D1, > @@ -27,3 +84,23 @@ > libraries =3D [] >=20 > elif platform.startswith('openbsd'): > +@@ -1484,7 +1500,7 @@ > + missing.append('linuxaudiodev') > +=20 > + if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', > +- 'freebsd7', 'freebsd8') > ++ 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10')= > + or platform.startswith("gnukfreebsd")): > + exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) > + else: > +@@ -2066,9 +2082,7 @@ > + ext_modules=3D[Extension('_struct', ['_struct.c'])], > +=20 > + # Scripts to install > +- scripts =3D ['Tools/scripts/pydoc', 'Tools/scripts/idle', > +- 'Tools/scripts/2to3', > +- 'Lib/smtpd.py'] > ++ scripts =3D [] > + ) > +=20 > + # --install-platlib >=20 > Modified: head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py Thu Ma= y 2 02:03:09 2013 (r317070) > +++ head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py Thu Ma= y 2 03:15:15 2013 (r317071) > @@ -1,5 +1,5 @@ > --- sage-5.8.rc0/doc/common/builder.py-orig 2013-03-17 20:50:38.0000000= 00 +0000 > -+++ sage-5.8/doc/common/builder.py 2013-03-17 20:56:42.000000000 +0000= > ++++ sage-5.9/doc/common/builder.py 2013-03-17 20:56:42.000000000 +0000= > @@ -272,13 +272,16 @@ >=20 > # build the other documents in parallel >=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?FEACBF34-A274-4027-9BB4-D513C65EE8ED>