Date: Thu, 02 May 2013 07:11:40 -0500 From: Stephen Montgomery-Smith <stephen@missouri.edu> To: Jason Helfman <bsd-src@helfman.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, Stephen Montgomery-Smith <stephen@FreeBSD.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r317071 - in head/math/sage: . files Message-ID: <518257FC.2070701@missouri.edu> In-Reply-To: <51825543.1000009@missouri.edu> References: <201305020315.r423FFsR045468@svn.freebsd.org> <FEACBF34-A274-4027-9BB4-D513C65EE8ED@helfman.org> <51825543.1000009@missouri.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
On 05/02/2013 07:00 AM, Stephen Montgomery-Smith wrote: > On 05/01/2013 10:36 PM, Jason Helfman wrote: >> Any reason why iconv was reverted here? >> >> Thanks for the update! > > I don't remember why I did this. I have my own little port which keeps > up with sage-devel. Maybe I was trying to solve some other problem > (because sage-devel went through some serious changes during 5.9.) > > I'll put it back to where it was, do a test build, and commit if it goes OK. Another possibility is that someone else made that change in between 5.8 and 5.9. And then when I compared to my sage-devel, I thought I had made the change. I did an svn log on Makefile, and that looks like exactly what happened. > >> >> On May 1, 2013, at 8:15 PM, Stephen Montgomery-Smith <stephen@FreeBSD.org> wrote: >> >>> Author: stephen >>> Date: Thu May 2 03:15:15 2013 >>> New Revision: 317071 >>> URL: http://svnweb.freebsd.org/changeset/ports/317071 >>> >>> Log: >>> - Update to 5.9. >>> >>> Added: >>> head/math/sage/files/spkg-patch-cephes_-_spkg-install (contents, props changed) >>> head/math/sage/files/spkg-patch-eclib_-_src_libsrc_eclib_interface.h (contents, 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_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_-_doc_common_builder.py >>> >>> Modified: head/math/sage/Makefile >>> ============================================================================== >>> --- 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$ >>> >>> PORTNAME= sage >>> -PORTVERSION= 5.8 >>> +PORTVERSION= 5.9 >>> CATEGORIES= math >>> MASTER_SITES= http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/ \ >>> http://mirrors.xmission.com/sage/src/ \ >>> @@ -30,9 +30,10 @@ OPTIONS_DEFINE_amd64= 387 >>> >>> PLIST_FILES= bin/sage >>> USE_FORTRAN= yes >>> +USE_GCC= 4.7+ >>> USE_TK= yes >>> USE_GMAKE= yes >>> -USES= iconv >>> +USE_ICONV= yes >>> MAKE_JOBS_SAFE= yes >>> LDFLAGS:= -Wl,-rpath=${WRKSRC}/local/lib ${LDFLAGS} >>> FFLAGS+= -Wl,-rpath=${WRKSRC}/local/lib ${FPM_FLAG} >>> >>> Modified: head/math/sage/distinfo >>> ============================================================================== >>> --- 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) = 4c34f4533a518e0ef8b34b2ed51443beae57e00d2f9ef31fa2811338610619ba >>> -SIZE (sage-5.8.tar) = 329318400 >>> +SHA256 (sage-5.9.tar) = 56fdb8272b49eb8bed4e3068416ff2ba6cb95bcd4abea82c5fb639f7c7cfea20 >>> +SIZE (sage-5.9.tar) = 328867840 >>> >>> Added: head/math/sage/files/spkg-patch-cephes_-_spkg-install >>> ============================================================================== >>> --- /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 +0000 >>> ++++ cephes-2.8.p1/spkg-install 2013-03-30 20:48:57.000000000 +0000 >>> +@@ -24,6 +24,8 @@ >>> + fi >>> + done >>> + >>> ++sed -i .orig 's|.*printf|//&1|' */mtherr.c >>> ++ >>> + echo "Building Cephes..." >>> + $MAKE >>> + if [ $? -ne 0 ]; then >>> >>> Added: head/math/sage/files/spkg-patch-eclib_-_src_libsrc_eclib_interface.h >>> ============================================================================== >>> --- /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.000000000 +0000 >>> +@@ -48,6 +48,7 @@ >>> + #include <iterator> >>> + using namespace std; >>> + #include "templates.h" >>> ++#include <stdint.h> >>> + >>> + #ifndef MININT >>> + #define MININT numeric_limits<int>::min() >>> >>> 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 Thu May 2 02:03:09 2013 (r317070) >>> +++ head/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst Thu 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.000000000 +0000 >>> ++++ python-2.7.3.p6/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 Thu May 2 02:03:09 2013 (r317070) >>> +++ head/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure 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-11 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* >>> ;; >>> >>> Modified: head/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c >>> ============================================================================== >>> --- head/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c Thu May 2 02:03:09 2013 (r317070) >>> +++ head/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c Thu 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.000000000 +0000 >>> ++++ python-2.7.3.p6/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 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:28.000000000 +0000 >>> -+++ python-2.7.3.p5/src/Python/thread_pthread.h 2012-04-22 00:23:46.000000000 +0000 >>> ++++ python-2.7.3.p6/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 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 +0000 >>> -+++ 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 +0000 >>> ++++ 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 = readline_termcap_library >>> +- elif self.compiler.find_library_file(lib_dirs, 'ncursesw'): >>> ++ elif self.compiler.find_library_file(lib_dirs, 'xxxncursesw'): >>> + curses_library = 'ncursesw' >>> + elif self.compiler.find_library_file(lib_dirs, 'ncurses'): >>> + curses_library = 'ncurses' >>> +@@ -681,7 +681,7 @@ >>> + 'termcap'): >>> + readline_libs.append('termcap') >>> + exts.append( Extension('readline', ['readline.c'], >>> +- library_dirs=['/usr/lib/termcap'], >>> ++ library_dirs=['/usr/lib', '/usr/lib/termcap'], >>> + extra_link_args=readline_extra_link_args, >>> + libraries=readline_libs) ) >>> + else: >>> +@@ -783,6 +783,8 @@ >>> + # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash >>> + exts.append( Extension('_sha256', ['sha256module.c']) ) >>> + exts.append( Extension('_sha512', ['sha512module.c']) ) >>> ++ else: >>> ++ open('.without_own_sha', 'w') >>> + >>> + # Modules that provide persistent dictionary-like semantics. You will >>> + # probably want to arrange for at least one of them to be available on >>> +@@ -1120,7 +1122,7 @@ >>> + sysroot = macosx_sdk_root() >>> + f = os.path.join(sysroot, f[1:]) >>> + >>> +- if os.path.exists(f) and not db_incs: >>> ++ if os.path.exists(f): >>> + data = open(f).read() >>> + m = 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 = 'panel' >>> + if curses_library.startswith('ncurses'): >>> +- if curses_library == 'ncursesw': >>> ++ if curses_library == 'xxxncursesw': >>> + # Bug 1464056: If _curses.so links with ncursesw, >>> + # _curses_panel.so must link with panelw. >>> + panel_library = 'panelw' >>> + curses_libs = [curses_library] >>> + exts.append( Extension('_curses', ['_cursesmodule.c'], >>> ++ library_dirs = ['/usr/lib'], >>> + libraries = curses_libs) ) >>> + elif curses_library == 'curses' and platform != 'darwin': >>> + # OSX has an old Berkeley curses, not good enough for >>> +@@ -1264,6 +1267,7 @@ >>> + curses_libs = ['curses'] >>> + >>> + exts.append( Extension('_curses', ['_cursesmodule.c'], >>> ++ library_dirs = ['/usr/lib'], >>> + libraries = curses_libs) ) >>> + else: >>> + missing.append('_curses') >>> +@@ -1432,10 +1436,22 @@ >>> macros = dict() >>> libraries = [] >>> >>> @@ -17,8 +76,6 @@ >>> + libraries = [] >>> + >>> + 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 = dict( # FreeBSD 7+ >>> + HAVE_SEM_OPEN=1, >>> + HAVE_SEM_TIMEDWAIT=1, >>> @@ -27,3 +84,23 @@ >>> libraries = [] >>> >>> elif platform.startswith('openbsd'): >>> +@@ -1484,7 +1500,7 @@ >>> + missing.append('linuxaudiodev') >>> + >>> + 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=[Extension('_struct', ['_struct.c'])], >>> + >>> + # Scripts to install >>> +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', >>> +- 'Tools/scripts/2to3', >>> +- 'Lib/smtpd.py'] >>> ++ scripts = [] >>> + ) >>> + >>> + # --install-platlib >>> >>> Modified: head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py >>> ============================================================================== >>> --- head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py Thu May 2 02:03:09 2013 (r317070) >>> +++ head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py Thu May 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.000000000 +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 @@ >>> >>> # build the other documents in parallel >>> >> >> >> > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?518257FC.2070701>