Date: Sun, 3 Mar 2013 15:55:04 +0000 (UTC) From: Brendan Fabeny <bf@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313363 - in head: converters/cl-babel-sbcl devel/buildapp devel/cl-alexandria-sbcl devel/cl-cffi-sbcl devel/cl-infix-sbcl devel/cl-port-sbcl devel/cl-split-sequence-sbcl devel/cl-trivi... Message-ID: <201303031555.r23Ft4Eh090888@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bf Date: Sun Mar 3 15:55:04 2013 New Revision: 313363 URL: http://svnweb.freebsd.org/changeset/ports/313363 Log: update lang/sbcl to 1.1.5+bugfixes, and adjust dependent ports Added: head/lang/sbcl/files/patch-20130303 (contents, props changed) Modified: head/converters/cl-babel-sbcl/Makefile head/devel/buildapp/Makefile head/devel/cl-alexandria-sbcl/Makefile head/devel/cl-cffi-sbcl/Makefile head/devel/cl-infix-sbcl/Makefile head/devel/cl-port-sbcl/Makefile head/devel/cl-split-sequence-sbcl/Makefile head/devel/cl-trivial-features-sbcl/Makefile head/devel/cl-trivial-gray-streams-sbcl/Makefile head/devel/cl-uffi-sbcl/Makefile head/lang/sbcl/Makefile head/lang/sbcl/distinfo head/math/fricas/Makefile head/math/maxima/Makefile head/math/open-axiom/Makefile head/math/wxMaxima/Makefile head/security/cl-md5-sbcl/Makefile head/textproc/cl-meta-sbcl/Makefile head/textproc/cl-ppcre-sbcl/Makefile head/www/cl-lml-sbcl/Makefile head/x11-wm/stumpwm/Makefile Modified: head/converters/cl-babel-sbcl/Makefile ============================================================================== --- head/converters/cl-babel-sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/converters/cl-babel-sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -2,7 +2,7 @@ PORTNAME= babel PORTVERSION= 2010.01.16 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= converters lisp PKGNAMEPREFIX= cl- DISTFILES= # none Modified: head/devel/buildapp/Makefile ============================================================================== --- head/devel/buildapp/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/devel/buildapp/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -3,7 +3,7 @@ PORTNAME= buildapp PORTVERSION= 1.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel lisp MASTER_SITES= http://www.xach.com/lisp/ DISTNAME= ${PORTNAME} Modified: head/devel/cl-alexandria-sbcl/Makefile ============================================================================== --- head/devel/cl-alexandria-sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/devel/cl-alexandria-sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -2,7 +2,7 @@ PORTNAME= alexandria PORTVERSION= 2010.01.16 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none Modified: head/devel/cl-cffi-sbcl/Makefile ============================================================================== --- head/devel/cl-cffi-sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/devel/cl-cffi-sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -2,7 +2,7 @@ PORTNAME= cffi PORTVERSION= 0.10.6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none Modified: head/devel/cl-infix-sbcl/Makefile ============================================================================== --- head/devel/cl-infix-sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/devel/cl-infix-sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -3,7 +3,7 @@ PORTNAME= infix PORTVERSION= 19960628 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none Modified: head/devel/cl-port-sbcl/Makefile ============================================================================== --- head/devel/cl-port-sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/devel/cl-port-sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -3,7 +3,7 @@ PORTNAME= port PORTVERSION= 2002.10.02.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none Modified: head/devel/cl-split-sequence-sbcl/Makefile ============================================================================== --- head/devel/cl-split-sequence-sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/devel/cl-split-sequence-sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -3,7 +3,7 @@ PORTNAME= split-sequence PORTVERSION= 20011114.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none Modified: head/devel/cl-trivial-features-sbcl/Makefile ============================================================================== --- head/devel/cl-trivial-features-sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/devel/cl-trivial-features-sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -2,7 +2,7 @@ PORTNAME= trivial-features PORTVERSION= 2010.01.16 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none Modified: head/devel/cl-trivial-gray-streams-sbcl/Makefile ============================================================================== --- head/devel/cl-trivial-gray-streams-sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/devel/cl-trivial-gray-streams-sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -2,7 +2,7 @@ PORTNAME= trivial-gray-streams PORTVERSION= 2008.11.02 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none Modified: head/devel/cl-uffi-sbcl/Makefile ============================================================================== --- head/devel/cl-uffi-sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/devel/cl-uffi-sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -3,7 +3,7 @@ PORTNAME= uffi PORTVERSION= 2.0.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none Modified: head/lang/sbcl/Makefile ============================================================================== --- head/lang/sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/lang/sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -5,7 +5,7 @@ # PORTNAME= sbcl -PORTVERSION= 1.1.4 +PORTVERSION= 1.1.5 PORTEPOCH= 1 CATEGORIES= lang lisp MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ @@ -175,6 +175,12 @@ post-patch: ${WRKSRC}/tests/threads.impure.lisp @${REINPLACE_CMD} -e 's|( cd ./doc ; sh ./clean.sh )|#&|' \ ${WRKSRC}/clean.sh + @case "`${CC} --version`" in \ + *clang*) \ + ${REINPLACE_CMD} -e '/#define END()/s/\.end//' \ + ${WRKSRC}/src/runtime/x86-assem.S \ + ${WRKSRC}/src/runtime/x86-64-assem.S ;; \ + esac do-build: @${FIND} ${WRKSRC} \( -name '*.orig' -o -name '*.bak' \) -delete Modified: head/lang/sbcl/distinfo ============================================================================== --- head/lang/sbcl/distinfo Sun Mar 3 15:41:59 2013 (r313362) +++ head/lang/sbcl/distinfo Sun Mar 3 15:55:04 2013 (r313363) @@ -1,7 +1,7 @@ -SHA256 (sbcl-1.1.4-source.tar.bz2) = 468bd52f8a15584ffdca2356f6c85b7053a72a321c309dfff37e340d0d4af7cc -SIZE (sbcl-1.1.4-source.tar.bz2) = 3702076 -SHA256 (sbcl-1.1.4-documentation-html.tar.bz2) = d474ef7a50c4e53d5882dab237daa102b6675e86d206744b74b7bb5c253dd390 -SIZE (sbcl-1.1.4-documentation-html.tar.bz2) = 178787 +SHA256 (sbcl-1.1.5-source.tar.bz2) = e870780f85586d87c6873e2252bfbf6a0e80bbe433cb2c573e3ae704954a9107 +SIZE (sbcl-1.1.5-source.tar.bz2) = 3716584 +SHA256 (sbcl-1.1.5-documentation-html.tar.bz2) = 1b196bf5a0807acf0bdfef5785c5d667fdb27858145efaa5ca376cd37c8659e0 +SIZE (sbcl-1.1.5-documentation-html.tar.bz2) = 180398 SHA256 (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 06a1e4e3a5f5f8e012ff6037a51624d7d1f34bff0979ce45e70418a293412b4e SIZE (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 8397764 SHA256 (sbcl-1.0.31-amd64-freebsd7-binary.tar.bz2) = fcbd5ed1948312a7b6eff7e6daf736e41be945a2c57bcee4b64f172ddde518b8 Added: head/lang/sbcl/files/patch-20130303 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/sbcl/files/patch-20130303 Sun Mar 3 15:55:04 2013 (r313363) @@ -0,0 +1,101 @@ +diff --git NEWS NEWS +index ca2919b..5ff7f27 100644 +--- NEWS ++++ NEWS +@@ -1,4 +1,9 @@ + ;;;; -*- coding: utf-8; fill-column: 78 -*- ++changes relative to sbcl-1.1.5: ++ * bug fix: Prevent a make-array transform from modifying source forms ++ causing problems for inlined code. Thanks to Bart Botta. ++ (regression since 1.0.42.11-bis) ++ + changes in sbcl-1.1.5 relative to sbcl-1.1.4: + * minor incompatible change: SB-SPROF:WITH-PROFILING no longer loops + by default. +diff --git src/compiler/array-tran.lisp src/compiler/array-tran.lisp +index baf1b98..02c5c37 100644 +--- src/compiler/array-tran.lisp ++++ src/compiler/array-tran.lisp +@@ -372,7 +372,8 @@ + (values dimensions nil)))) + (let ((initial-contents (getf keyargs :initial-contents))) + (when (and initial-contents rank) +- (setf (getf keyargs :initial-contents) ++ (setf keyargs (copy-list keyargs) ++ (getf keyargs :initial-contents) + (rewrite-initial-contents rank initial-contents env)))) + `(locally (declare (notinline list vector)) + (make-array ,new-dimensions ,@keyargs))))) +diff --git tests/float.impure.lisp tests/float.impure.lisp +index daef1f2..29ca23b 100644 +--- tests/float.impure.lisp ++++ tests/float.impure.lisp +@@ -248,8 +248,11 @@ + (flet ((almost= (x y) + (< (abs (- x y)) 1d-5))) + (macrolet ((foo (op value) +- `(assert (almost= (,op (mod ,value (* 2 pi))) +- (,op ,value))))) ++ `(let ((actual (,op ,value)) ++ (expected (,op (mod ,value (* 2 pi))))) ++ (unless (almost= actual expected) ++ (error "Inaccurate result for ~a: expected ~a, got ~a" ++ (list ',op ,value) expected actual))))) + (let ((big (* pi (expt 2d0 70))) + (mid (coerce most-positive-fixnum 'double-float)) + (odd (* pi most-positive-fixnum))) +diff --git tests/test-util.lisp tests/test-util.lisp +index 20b2c54..d6246bf 100644 +--- tests/test-util.lisp ++++ tests/test-util.lisp +@@ -39,7 +39,7 @@ + (defmacro with-test ((&key fails-on broken-on skipped-on name) + &body body) + (let ((block-name (gensym)) +- (threads (gensym "THREADS"))) ++ #+sb-thread (threads (gensym "THREADS"))) + `(progn + (start-test) + (cond +diff --git tests/threads.impure.lisp tests/threads.impure.lisp +index ddd1ef0..7ebc17c 100644 +--- tests/threads.impure.lisp ++++ tests/threads.impure.lisp +@@ -37,18 +37,6 @@ + (with-mutex (mutex) + mutex))) + +-(with-test (:name (:with-mutex :timeout)) +- (let ((m (make-mutex))) +- (with-mutex (m) +- (assert (null (join-thread (make-thread +- (lambda () +- (with-mutex (m :timeout 0.1) +- t))))))) +- (assert (join-thread (make-thread +- (lambda () +- (with-mutex (m :timeout 0.1) +- t))))))) +- + (sb-alien:define-alien-routine "check_deferrables_blocked_or_lose" + void + (where sb-alien:unsigned-long)) +@@ -84,6 +72,18 @@ + + ;;;; Now the real tests... + ++(with-test (:name (:with-mutex :timeout)) ++ (let ((m (make-mutex))) ++ (with-mutex (m) ++ (assert (null (join-thread (make-thread ++ (lambda () ++ (with-mutex (m :timeout 0.1) ++ t))))))) ++ (assert (join-thread (make-thread ++ (lambda () ++ (with-mutex (m :timeout 0.1) ++ t))))))) ++ + (with-test (:name (:interrupt-thread :deferrables-unblocked-by-lock)) + (let ((lock (sb-thread::make-mutex)) + (thread (make-join-thread (lambda () Modified: head/math/fricas/Makefile ============================================================================== --- head/math/fricas/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/math/fricas/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -4,7 +4,7 @@ PORTNAME= fricas PORTVERSION= 1.1.8 DISTVERSIONSUFFIX= -full -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= SF Modified: head/math/maxima/Makefile ============================================================================== --- head/math/maxima/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/math/maxima/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -3,7 +3,7 @@ PORTNAME= maxima PORTVERSION= 5.29.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math lisp tk MASTER_SITES= SF/maxima/Maxima-source/${PORTVERSION}-source Modified: head/math/open-axiom/Makefile ============================================================================== --- head/math/open-axiom/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/math/open-axiom/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -3,7 +3,7 @@ PORTNAME= open-axiom PORTVERSION= 1.4.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} Modified: head/math/wxMaxima/Makefile ============================================================================== --- head/math/wxMaxima/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/math/wxMaxima/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -3,7 +3,7 @@ PORTNAME= wxMaxima PORTVERSION= 12.04.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME:L}/${PORTNAME}/${PORTVERSION} Modified: head/security/cl-md5-sbcl/Makefile ============================================================================== --- head/security/cl-md5-sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/security/cl-md5-sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -2,7 +2,7 @@ PORTNAME= md5 PORTVERSION= 1.8.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= security lisp PKGNAMEPREFIX= cl- DISTFILES= # none Modified: head/textproc/cl-meta-sbcl/Makefile ============================================================================== --- head/textproc/cl-meta-sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/textproc/cl-meta-sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -3,7 +3,7 @@ PORTNAME= meta PORTVERSION= 0.1 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 1 CATEGORIES= textproc lisp PKGNAMEPREFIX= cl- Modified: head/textproc/cl-ppcre-sbcl/Makefile ============================================================================== --- head/textproc/cl-ppcre-sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/textproc/cl-ppcre-sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -3,7 +3,7 @@ PORTNAME= cl-ppcre PORTVERSION= 2.0.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= textproc lisp DISTFILES= # none Modified: head/www/cl-lml-sbcl/Makefile ============================================================================== --- head/www/cl-lml-sbcl/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/www/cl-lml-sbcl/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -3,7 +3,7 @@ PORTNAME= lml PORTVERSION= 2.5.7 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= www textproc PKGNAMEPREFIX= cl- DISTFILES= # none Modified: head/x11-wm/stumpwm/Makefile ============================================================================== --- head/x11-wm/stumpwm/Makefile Sun Mar 3 15:41:59 2013 (r313362) +++ head/x11-wm/stumpwm/Makefile Sun Mar 3 15:55:04 2013 (r313363) @@ -3,7 +3,7 @@ PORTNAME= stumpwm PORTVERSION= 0.9.7 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-wm lisp MASTER_SITES= SAVANNAH DISTFILES= ${DISTNAME}.tgz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303031555.r23Ft4Eh090888>