From owner-svn-ports-head@FreeBSD.ORG Sat Feb 8 05:18:21 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00AE02BA; Sat, 8 Feb 2014 05:18:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DFF1818E0; Sat, 8 Feb 2014 05:18:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s185IK6S005328; Sat, 8 Feb 2014 05:18:20 GMT (envelope-from stephen@svn.freebsd.org) Received: (from stephen@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s185IJwf005320; Sat, 8 Feb 2014 05:18:19 GMT (envelope-from stephen@svn.freebsd.org) Message-Id: <201402080518.s185IJwf005320@svn.freebsd.org> From: Stephen Montgomery-Smith Date: Sat, 8 Feb 2014 05:18:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343307 - in head/math/sage: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Feb 2014 05:18:21 -0000 Author: stephen Date: Sat Feb 8 05:18:19 2014 New Revision: 343307 URL: http://svnweb.freebsd.org/changeset/ports/343307 QAT: https://qat.redports.org/buildarchive/r343307/ Log: - Update to 6.1.1. Added: head/math/sage/files/patch-build_pkgs_readline_patches_shobj-conf.patch (contents, props changed) head/math/sage/files/patch-build_pkgs_scons_fbsd-patch-src_engine_SCons_compat__scons_subprocess.py (contents, props changed) Modified: head/math/sage/Makefile head/math/sage/distinfo head/math/sage/files/patch-build_pkgs_readline_fbsd-patch-src_support_shlib-install Modified: head/math/sage/Makefile ============================================================================== --- head/math/sage/Makefile Sat Feb 8 03:14:30 2014 (r343306) +++ head/math/sage/Makefile Sat Feb 8 05:18:19 2014 (r343307) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= sage -PORTVERSION= 6.1 +PORTVERSION= 6.1.1 CATEGORIES= math MASTER_SITES= http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/ \ http://mirrors.xmission.com/sage/src/ \ http://www-ftp.lip6.fr/pub/math/sagemath/src/ \ http://www.sagemath.org/src-old/ -EXTRACT_SUFX= .tar MAINTAINER= stephen@FreeBSD.org COMMENT= Open source Mathematics software @@ -153,4 +152,29 @@ FPM_FLAG= MAKE_ENV+= MAKE="${MAKE} -j${MAKE_JOBS_NUMBER}" +.ifdef MAINTAINER_MODE +test-fbsd-patches: patch + rm -rf ${WRKSRC}/build/pkgs/*/src; \ + for d in ${WRKSRC}/build/pkgs/*; do \ + if ls $$d/fbsd-patch-* > /dev/null 2>&1; then \ + echo Testing patches in $${d##*/}; \ + b=$${d##*/}-`cat $$d/package-version.txt | sed 's/\.p.*//'`; \ + c=${WRKSRC}/upstream/$$b.tar.bz2 ; \ + if [ ! -e $$c ]; then \ + echo Couldn\'t find $$c; \ + exit 1; \ + fi; \ + if ! (cd $$d && tar xf $$c && mv $$b src); then \ + echo Unable to unarchive $$c; \ + exit 1; \ + fi; \ + if ! (cd $$d && cat fbsd-patch-* | patch); then \ + echo Patches in $${d##*/} failed; \ + exit 1; \ + fi; \ + fi; \ + done; \ + rm -rf ${WRKSRC}/build/pkgs/*/src +.endif + .include Modified: head/math/sage/distinfo ============================================================================== --- head/math/sage/distinfo Sat Feb 8 03:14:30 2014 (r343306) +++ head/math/sage/distinfo Sat Feb 8 05:18:19 2014 (r343307) @@ -1,2 +1,2 @@ -SHA256 (sage-6.1.tar) = 13c3ec386176ed48a612fe47fa909ee461bd3f6c6c62fb0b3e4528c3c5602a42 -SIZE (sage-6.1.tar) = 399881018 +SHA256 (sage-6.1.1.tar.gz) = bee00adf232fbd4b256fae1aae5e9b52cb5c050b2d2337b624c31f9c28d07f4d +SIZE (sage-6.1.1.tar.gz) = 398548682 Modified: head/math/sage/files/patch-build_pkgs_readline_fbsd-patch-src_support_shlib-install ============================================================================== --- head/math/sage/files/patch-build_pkgs_readline_fbsd-patch-src_support_shlib-install Sat Feb 8 03:14:30 2014 (r343306) +++ head/math/sage/files/patch-build_pkgs_readline_fbsd-patch-src_support_shlib-install Sat Feb 8 05:18:19 2014 (r343307) @@ -1,15 +1,14 @@ ---- /dev/null 2014-02-04 16:10:34.000000000 -0600 -+++ build/pkgs/readline/fbsd-patch-src_support_shlib-install 2014-02-04 16:14:11.000000000 -0600 -@@ -0,0 +1,12 @@ -+--- src/support/shlib-install-orig 2014-02-04 16:09:16.000000000 -0600 -++++ src/support/shlib-install 2014-02-04 16:10:32.000000000 -0600 -+@@ -177,7 +177,8 @@ +--- /dev/null 2014-02-05 02:11:00.000000000 +0000 ++++ build/pkgs/readline/fbsd-patch-src_support_shlib-install 2014-02-05 02:11:23.000000000 +0000 +@@ -0,0 +1,11 @@ ++--- src/support/shlib-install.orig 2009-10-28 13:30:18.000000000 +0000 +++++ src/support/shlib-install 2014-02-05 02:08:59.000000000 +0000 ++@@ -177,7 +177,7 @@ + fi + ;; + +-freebsd[4-9]*|freebsdelf*|dragonfly*) -++# FreeBSD less than 4 no longer supported. So freebsd[4-9]* to freebsd*. -++freebsd*|freebsdelf*|dragonfly*) +++freebsd[4-9].*|freebsd1[0-9].*|freebsdelf*|dragonfly*) + # libname.so -> libname.so.M + ${echo} ${RM} ${INSTALLDIR}/$LINK1 + if [ -z "$uninstall" ]; then Added: head/math/sage/files/patch-build_pkgs_readline_patches_shobj-conf.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/patch-build_pkgs_readline_patches_shobj-conf.patch Sat Feb 8 05:18:19 2014 (r343307) @@ -0,0 +1,11 @@ +--- build/pkgs/readline/patches/shobj-conf.patch-orig 2014-02-04 21:08:30.000000000 -0600 ++++ build/pkgs/readline/patches/shobj-conf.patch 2014-02-04 21:09:48.000000000 -0600 +@@ -43,7 +43,7 @@ + - SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir)' + - + - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' +-+freebsdelf*|dragonfly*) +++freebsd[4-9].*|freebsd1[0-9].*|freebsdelf*|dragonfly*) + + SHOBJ_CFLAGS=-fPIC + + SHOBJ_LD='${CC}' + + SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' Added: head/math/sage/files/patch-build_pkgs_scons_fbsd-patch-src_engine_SCons_compat__scons_subprocess.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/patch-build_pkgs_scons_fbsd-patch-src_engine_SCons_compat__scons_subprocess.py Sat Feb 8 05:18:19 2014 (r343307) @@ -0,0 +1,34 @@ +--- /dev/null 2014-02-05 05:15:00.000000000 +0000 ++++ build/pkgs/scons/fbsd-patch-src_engine_SCons_compat__scons_subprocess.py 2014-02-05 05:16:45.000000000 +0000 +@@ -0,0 +1,31 @@ ++--- src/engine/SCons/compat/_scons_subprocess.py.orig 2008-12-21 06:59:59.000000000 +0000 +++++ src/engine/SCons/compat/_scons_subprocess.py 2014-02-05 05:11:11.000000000 +0000 ++@@ -585,13 +585,19 @@ ++ class object: ++ pass ++ +++import thread +++lock = thread.allocate_lock() +++ ++ class Popen(object): ++ def __init__(self, args, bufsize=0, executable=None, ++ stdin=None, stdout=None, stderr=None, ++ preexec_fn=None, close_fds=False, shell=False, ++ cwd=None, env=None, universal_newlines=False, ++ startupinfo=None, creationflags=0): ++- """Create new Popen instance.""" +++ """Create new Popen instance. +++ Popen is not thread-safe and is therefore protected with a lock. +++ """ +++ lock.acquire() ++ _cleanup() ++ ++ self._child_created = False ++@@ -659,6 +665,7 @@ ++ self.stderr = os.fdopen(errread, 'rU', bufsize) ++ else: ++ self.stderr = os.fdopen(errread, 'rb', bufsize) +++ lock.release() ++ ++ ++ def _translate_newlines(self, data):