summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorBrendan Fabeny <bf@FreeBSD.org>2012-12-16 05:34:02 +0000
committerBrendan Fabeny <bf@FreeBSD.org>2012-12-16 05:34:02 +0000
commit8680d9196e3ef724a34c424cff387142e8bcd6c2 (patch)
tree797ca31ef62f41ddc077340aa315587d58424775 /lang
parentUpdate to 0.21 (diff)
update sbcl to 1.1.2 and maxima to 5.29.1; adjust dependent ports
Notes
Notes: svn path=/head/; revision=308981
Diffstat (limited to 'lang')
-rw-r--r--lang/sbcl/Makefile9
-rw-r--r--lang/sbcl/distinfo8
-rw-r--r--lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp11
-rw-r--r--lang/sbcl/pkg-plist2
4 files changed, 24 insertions, 6 deletions
diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index f5b1450f9ec5..12f7cb7f4916 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -5,7 +5,7 @@
#
PORTNAME= sbcl
-PORTVERSION= 1.0.58
+PORTVERSION= 1.1.2
PORTEPOCH= 1
CATEGORIES= lang lisp
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
@@ -64,7 +64,7 @@ SBCLCONFIG= Config.x86-64-freebsd
.endif
MAKE_SH_ARGS?= --prefix=${PREFIX} --dynamic-space-size=${DYNAMIC_SPACE_SIZE} \
---with-sb-core-compression
+--with-sb-core-compression --with-sb-qshow
NM?= /usr/bin/nm
NMFLAGS?= -gp
@@ -118,6 +118,11 @@ MAKE_SH_ARGS+= --with-sb-futex
.else
MAKE_SH_ARGS+= --without-sb-futex
.endif
+.if defined(WITH_SAFEPOINT)
+MAKE_SH_ARGS+= --with-sb-safepoint --with-sb-thruption --with-sb-wtimer
+.else
+MAKE_SH_ARGS+= --without-sb-safepoint --without-sb-thruption --without-sb-wtimer
+.endif
.else
MAKE_SH_ARGS+= --without-sb-thread
.endif
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index 53f03f4b77a0..4e38439a1400 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,7 +1,7 @@
-SHA256 (sbcl-1.0.58-source.tar.bz2) = 817972d3f0be2c37ef29a9ea4858e6772cccf87cfcc5b36361a5abe2a149d945
-SIZE (sbcl-1.0.58-source.tar.bz2) = 3618349
-SHA256 (sbcl-1.0.58-documentation-html.tar.bz2) = 7ae4654ef97e81738878474f4fbfd995a2b97c3271039b0f31cc4d525ce782b8
-SIZE (sbcl-1.0.58-documentation-html.tar.bz2) = 175205
+SHA256 (sbcl-1.1.2-source.tar.bz2) = 0c7a04d4ccf149324ff5919f230e1473757c223cda47623a97d749e018327713
+SIZE (sbcl-1.1.2-source.tar.bz2) = 3692248
+SHA256 (sbcl-1.1.2-documentation-html.tar.bz2) = 0be00e8afd311a0f03fe9c53af01c9d926582b60e733a7d543d557f83a6c36a4
+SIZE (sbcl-1.1.2-documentation-html.tar.bz2) = 178733
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-contrib__sb-concurrency__tests__test-frlock.lisp b/lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp
new file mode 100644
index 000000000000..d600cdf4e673
--- /dev/null
+++ b/lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp
@@ -0,0 +1,11 @@
+--- contrib/sb-concurrency/tests/test-frlock.lisp.orig 2012-12-01 06:32:36.000000000 -0500
++++ contrib/sb-concurrency/tests/test-frlock.lisp 2012-12-15 16:23:03.000000000 -0500
+@@ -80,7 +80,7 @@
+ (values (cdr w-e!) (cdr r-e!))))
+
+ #+sb-thread
+-(deftest* (frlock.1 :fails-on :win32)
++(deftest* (frlock.1 :fails-on (or :freebsd :win32))
+ (handler-case
+ (sb-ext:with-timeout 60 (test-frlocks))
+ (sb-ext:timeout (c)
diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist
index dbaee09bd645..ead9ec7ff0a5 100644
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -56,6 +56,8 @@ lib/sbcl/sb-cltl2/sb-cltl2.asd
lib/sbcl/sb-cltl2/sb-cltl2.fasl
lib/sbcl/sb-cltl2/tests.fasl
lib/sbcl/sb-cltl2/tests.lisp
+lib/sbcl/sb-concurrency/frlock.fasl
+lib/sbcl/sb-concurrency/frlock.lisp
lib/sbcl/sb-concurrency/gate.fasl
lib/sbcl/sb-concurrency/gate.lisp
lib/sbcl/sb-concurrency/mailbox.fasl