diff options
-rw-r--r-- | converters/cl-babel-sbcl/Makefile | 2 | ||||
-rw-r--r-- | devel/buildapp/Makefile | 2 | ||||
-rw-r--r-- | devel/cl-alexandria-sbcl/Makefile | 2 | ||||
-rw-r--r-- | devel/cl-cffi-sbcl/Makefile | 2 | ||||
-rw-r--r-- | devel/cl-infix-sbcl/Makefile | 2 | ||||
-rw-r--r-- | devel/cl-port-sbcl/Makefile | 2 | ||||
-rw-r--r-- | devel/cl-split-sequence-sbcl/Makefile | 2 | ||||
-rw-r--r-- | devel/cl-trivial-features-sbcl/Makefile | 2 | ||||
-rw-r--r-- | devel/cl-trivial-gray-streams-sbcl/Makefile | 2 | ||||
-rw-r--r-- | devel/cl-uffi-sbcl/Makefile | 2 | ||||
-rw-r--r-- | lang/sbcl/Makefile | 8 | ||||
-rw-r--r-- | lang/sbcl/distinfo | 8 | ||||
-rw-r--r-- | lang/sbcl/files/patch-20130303 | 101 | ||||
-rw-r--r-- | math/fricas/Makefile | 2 | ||||
-rw-r--r-- | math/maxima/Makefile | 2 | ||||
-rw-r--r-- | math/open-axiom/Makefile | 2 | ||||
-rw-r--r-- | math/wxMaxima/Makefile | 2 | ||||
-rw-r--r-- | security/cl-md5-sbcl/Makefile | 2 | ||||
-rw-r--r-- | textproc/cl-meta-sbcl/Makefile | 2 | ||||
-rw-r--r-- | textproc/cl-ppcre-sbcl/Makefile | 2 | ||||
-rw-r--r-- | www/cl-lml-sbcl/Makefile | 2 | ||||
-rw-r--r-- | x11-wm/stumpwm/Makefile | 2 |
22 files changed, 131 insertions, 24 deletions
diff --git a/converters/cl-babel-sbcl/Makefile b/converters/cl-babel-sbcl/Makefile index da356ec4ba2f..0bd1a0801230 100644 --- a/converters/cl-babel-sbcl/Makefile +++ b/converters/cl-babel-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= babel PORTVERSION= 2010.01.16 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= converters lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/buildapp/Makefile b/devel/buildapp/Makefile index 8aa04cc91e77..d3e08cfec144 100644 --- a/devel/buildapp/Makefile +++ b/devel/buildapp/Makefile @@ -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} diff --git a/devel/cl-alexandria-sbcl/Makefile b/devel/cl-alexandria-sbcl/Makefile index 4512e73723ae..5fdc2344bfed 100644 --- a/devel/cl-alexandria-sbcl/Makefile +++ b/devel/cl-alexandria-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= alexandria PORTVERSION= 2010.01.16 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-cffi-sbcl/Makefile b/devel/cl-cffi-sbcl/Makefile index abb2a9e6deb0..25cdc5df43d6 100644 --- a/devel/cl-cffi-sbcl/Makefile +++ b/devel/cl-cffi-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= cffi PORTVERSION= 0.10.6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-infix-sbcl/Makefile b/devel/cl-infix-sbcl/Makefile index 41802bd2eaef..92e02074f73f 100644 --- a/devel/cl-infix-sbcl/Makefile +++ b/devel/cl-infix-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= infix PORTVERSION= 19960628 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-port-sbcl/Makefile b/devel/cl-port-sbcl/Makefile index 6bd1ba992ece..1d9887134b3b 100644 --- a/devel/cl-port-sbcl/Makefile +++ b/devel/cl-port-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= port PORTVERSION= 2002.10.02.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-split-sequence-sbcl/Makefile b/devel/cl-split-sequence-sbcl/Makefile index 7f5b0c9a8fa1..e28d83b1aeb9 100644 --- a/devel/cl-split-sequence-sbcl/Makefile +++ b/devel/cl-split-sequence-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= split-sequence PORTVERSION= 20011114.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-trivial-features-sbcl/Makefile b/devel/cl-trivial-features-sbcl/Makefile index 74cf1382a62e..23bbc3a26bc8 100644 --- a/devel/cl-trivial-features-sbcl/Makefile +++ b/devel/cl-trivial-features-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= trivial-features PORTVERSION= 2010.01.16 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-trivial-gray-streams-sbcl/Makefile b/devel/cl-trivial-gray-streams-sbcl/Makefile index 841b77e8a6f2..d220f1d1076c 100644 --- a/devel/cl-trivial-gray-streams-sbcl/Makefile +++ b/devel/cl-trivial-gray-streams-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= trivial-gray-streams PORTVERSION= 2008.11.02 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-uffi-sbcl/Makefile b/devel/cl-uffi-sbcl/Makefile index 8b2001b6c28f..b806ba47c5aa 100644 --- a/devel/cl-uffi-sbcl/Makefile +++ b/devel/cl-uffi-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= uffi PORTVERSION= 2.0.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile index 564ab9672b54..87093a20d955 100644 --- a/lang/sbcl/Makefile +++ b/lang/sbcl/Makefile @@ -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 diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo index f659fadfd21e..0a14bfeb0436 100644 --- a/lang/sbcl/distinfo +++ b/lang/sbcl/distinfo @@ -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 diff --git a/lang/sbcl/files/patch-20130303 b/lang/sbcl/files/patch-20130303 new file mode 100644 index 000000000000..8406a09cf715 --- /dev/null +++ b/lang/sbcl/files/patch-20130303 @@ -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 () diff --git a/math/fricas/Makefile b/math/fricas/Makefile index 88bb9790af9d..43e28e8cac08 100644 --- a/math/fricas/Makefile +++ b/math/fricas/Makefile @@ -4,7 +4,7 @@ PORTNAME= fricas PORTVERSION= 1.1.8 DISTVERSIONSUFFIX= -full -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= SF diff --git a/math/maxima/Makefile b/math/maxima/Makefile index 126e61776f5b..768d4b4d2d28 100644 --- a/math/maxima/Makefile +++ b/math/maxima/Makefile @@ -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 diff --git a/math/open-axiom/Makefile b/math/open-axiom/Makefile index 3b684e51c3b4..dca20fadc10b 100644 --- a/math/open-axiom/Makefile +++ b/math/open-axiom/Makefile @@ -3,7 +3,7 @@ PORTNAME= open-axiom PORTVERSION= 1.4.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile index c09274fc6404..3cd5d241954c 100644 --- a/math/wxMaxima/Makefile +++ b/math/wxMaxima/Makefile @@ -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} diff --git a/security/cl-md5-sbcl/Makefile b/security/cl-md5-sbcl/Makefile index 718faa5e2667..2636174c1948 100644 --- a/security/cl-md5-sbcl/Makefile +++ b/security/cl-md5-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= md5 PORTVERSION= 1.8.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= security lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/textproc/cl-meta-sbcl/Makefile b/textproc/cl-meta-sbcl/Makefile index e7b14fdd7e30..68afaff9f7a2 100644 --- a/textproc/cl-meta-sbcl/Makefile +++ b/textproc/cl-meta-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= meta PORTVERSION= 0.1 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 1 CATEGORIES= textproc lisp PKGNAMEPREFIX= cl- diff --git a/textproc/cl-ppcre-sbcl/Makefile b/textproc/cl-ppcre-sbcl/Makefile index 5aede23482f5..c184795642fc 100644 --- a/textproc/cl-ppcre-sbcl/Makefile +++ b/textproc/cl-ppcre-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= cl-ppcre PORTVERSION= 2.0.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= textproc lisp DISTFILES= # none diff --git a/www/cl-lml-sbcl/Makefile b/www/cl-lml-sbcl/Makefile index 97924c8692a3..ab740725df50 100644 --- a/www/cl-lml-sbcl/Makefile +++ b/www/cl-lml-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= lml PORTVERSION= 2.5.7 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= www textproc PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/x11-wm/stumpwm/Makefile b/x11-wm/stumpwm/Makefile index 291a8662f64f..47157ce12635 100644 --- a/x11-wm/stumpwm/Makefile +++ b/x11-wm/stumpwm/Makefile @@ -3,7 +3,7 @@ PORTNAME= stumpwm PORTVERSION= 0.9.7 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-wm lisp MASTER_SITES= SAVANNAH DISTFILES= ${DISTNAME}.tgz |