8 files changed, 110 insertions, 13 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index f20ddaa5373b..f6c12f6ebe28 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -9,8 +9,7 @@
 #
 
 PORTNAME=	sbcl
-PORTVERSION=	1.0.34.0
-PORTREVISION=	0
+PORTVERSION=	1.0.40.0
 CATEGORIES=	lang lisp
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} \
 		ftp://ftp.SpringDaemons.com/soft/sbcl-binary/:binaries
@@ -113,9 +112,11 @@ post-patch:
 
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} INSTALL_ROOT=${PREFIX} \
+		LISP_EXTRA_ARG="${LISP_EXTRA_ARG}" \
 		${SH} make.sh ${LISP_CMD})
 	@${RM} -rf ${WRKSRC}/contrib/sb-cover/test-output
-	@(cd ${WRKSRC}/doc/manual && \
+	@(cd ${WRKSRC}/doc/manual && ${SETENV} \
+		LISP_EXTRA_ARG="${LISP_EXTRA_ARG}" \
 		${GMAKE} MAKEINFO='makeinfo --no-split' info)
 
 do-install:
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index 7887c63f7602..03d627bbbca1 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,6 +1,6 @@
-MD5 (sbcl-1.0.34-source.tar.bz2) = 78c1a003281d11690f54609b4f5303f4
-SHA256 (sbcl-1.0.34-source.tar.bz2) = 59b90544acbfd0232a2e05154223e9cbf6b7bfc7f05ddc26ee850bd0bc220170
-SIZE (sbcl-1.0.34-source.tar.bz2) = 3384606
+MD5 (sbcl-1.0.40-source.tar.bz2) = 36adc46abbd3038c82ac3e2ff572a0d9
+SHA256 (sbcl-1.0.40-source.tar.bz2) = f800825363fced70b8bf70f9ab55a1b341685c5efa6e6d70b69a5fc37d635650
+SIZE (sbcl-1.0.40-source.tar.bz2) = 3428830
 MD5 (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = eb21c4c454d0ef9784d679d9c913f789
 SHA256 (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 06a1e4e3a5f5f8e012ff6037a51624d7d1f34bff0979ce45e70418a293412b4e
 SIZE (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 8397764
diff --git a/lang/sbcl/files/patch-doc_manual_make-tempfiles.sh b/lang/sbcl/files/patch-doc_manual_make-tempfiles.sh
new file mode 100644
index 000000000000..07e32c8da07a
--- /dev/null
+++ b/lang/sbcl/files/patch-doc_manual_make-tempfiles.sh
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/manual/make-tempfiles.sh.orig
++++ doc/manual/make-tempfiles.sh
+@@ -33,7 +33,7 @@
+     SBCLRUNTIME="$1"
+ fi
+ 
+-SBCL="$SBCLRUNTIME --noinform --no-sysinit --no-userinit --noprint --disable-debugger"
++SBCL="$SBCLRUNTIME ${LISP_EXTRA_ARG} --noinform --no-sysinit --no-userinit --noprint --disable-debugger"
+ 
+ # extract version and date
+ VERSION=`$SBCL --eval '(write-line (lisp-implementation-version))' --eval '(sb-ext:quit)'`
diff --git a/lang/sbcl/files/patch-install.sh b/lang/sbcl/files/patch-install.sh
new file mode 100644
index 000000000000..cbbb53b4b132
--- /dev/null
+++ b/lang/sbcl/files/patch-install.sh
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- install.sh.orig
++++ install.sh
+@@ -72,7 +72,7 @@
+ . ./sbcl-pwd.sh
+ sbcl_pwd
+ 
+-SBCL="$SBCL_PWD/src/runtime/sbcl --noinform --core $SBCL_PWD/output/sbcl.core --no-userinit --no-sysinit --disable-debugger"
++SBCL="$SBCL_PWD/src/runtime/sbcl ${LISP_EXTRA_ARG} --noinform --core $SBCL_PWD/output/sbcl.core --no-userinit --no-sysinit --disable-debugger"
+ SBCL_BUILDING_CONTRIB=1
+ export SBCL SBCL_BUILDING_CONTRIB
+ 
diff --git a/lang/sbcl/files/patch-make-target-2.sh b/lang/sbcl/files/patch-make-target-2.sh
new file mode 100644
index 000000000000..f4d5539a87da
--- /dev/null
+++ b/lang/sbcl/files/patch-make-target-2.sh
@@ -0,0 +1,19 @@
+
+$FreeBSD$
+
+--- make-target-2.sh.orig
++++ make-target-2.sh
+@@ -31,11 +31,13 @@
+ # for much longer than that, don't worry, it's likely to be normal.
+ echo //doing warm init - compilation phase
+ ./src/runtime/sbcl \
++${LISP_EXTRA_ARG} \
+ --core output/cold-sbcl.core \
+ --lose-on-corruption \
+ --no-sysinit --no-userinit < make-target-2.lisp
+ echo //doing warm init - load and dump phase
+ ./src/runtime/sbcl \
++${LISP_EXTRA_ARG} \
+ --core output/cold-sbcl.core \
+ --lose-on-corruption \
+ --no-sysinit --no-userinit < make-target-2-load.lisp
diff --git a/lang/sbcl/files/patch-make-target-contrib.sh b/lang/sbcl/files/patch-make-target-contrib.sh
new file mode 100644
index 000000000000..249aa068a919
--- /dev/null
+++ b/lang/sbcl/files/patch-make-target-contrib.sh
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- make-target-contrib.sh.orig
++++ make-target-contrib.sh
+@@ -32,7 +32,7 @@
+     SBCL_PWD=`echo $SBCL_PWD | sed s/\ /\\\\\\\\\ /g`
+ fi
+ 
+-SBCL="$SBCL_PWD/src/runtime/sbcl --noinform --core $SBCL_PWD/output/sbcl.core \
++SBCL="$SBCL_PWD/src/runtime/sbcl ${LISP_EXTRA_ARG} --noinform --core $SBCL_PWD/output/sbcl.core \
+ --lose-on-corruption --disable-debugger --no-sysinit --no-userinit"
+ SBCL_BUILDING_CONTRIB=1
+ export SBCL SBCL_BUILDING_CONTRIB
diff --git a/lang/sbcl/files/patch-tests_subr.sh b/lang/sbcl/files/patch-tests_subr.sh
new file mode 100644
index 000000000000..fa296efaa960
--- /dev/null
+++ b/lang/sbcl/files/patch-tests_subr.sh
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- tests/subr.sh.orig
++++ tests/subr.sh
+@@ -29,7 +29,7 @@
+ SBCL_HOME="$SBCL_PWD/../contrib"
+ SBCL_CORE="$SBCL_PWD/../output/sbcl.core"
+ SBCL_RUNTIME="$SBCL_PWD/../src/runtime/sbcl"
+-SBCL_ARGS="--noinform --no-sysinit --no-userinit --noprint --disable-debugger"
++SBCL_ARGS="${LISP_EXTRA_ARG} --noinform --no-sysinit --no-userinit --noprint --disable-debugger"
+ 
+ # Scripts that use these variables should quote them.
+ TEST_BASENAME="$(basename $0)"
diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist
index b1be39e6ddb6..c2734265ac90 100644
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -82,6 +82,25 @@ lib/sbcl/sb-cltl2/sb-cltl2.fasl
 lib/sbcl/sb-cltl2/test-passed
 lib/sbcl/sb-cltl2/tests.fasl
 lib/sbcl/sb-cltl2/tests.lisp
+lib/sbcl/sb-concurrency/Makefile
+lib/sbcl/sb-concurrency/mailbox.fasl
+lib/sbcl/sb-concurrency/mailbox.lisp
+lib/sbcl/sb-concurrency/package.fasl
+lib/sbcl/sb-concurrency/package.lisp
+lib/sbcl/sb-concurrency/queue.fasl
+lib/sbcl/sb-concurrency/queue.lisp
+lib/sbcl/sb-concurrency/sb-concurrency.asd
+lib/sbcl/sb-concurrency/sb-concurrency.fasl
+lib/sbcl/sb-concurrency/sb-concurrency.texinfo
+lib/sbcl/sb-concurrency/test-passed
+lib/sbcl/sb-concurrency/tests/package.fasl
+lib/sbcl/sb-concurrency/tests/package.lisp
+lib/sbcl/sb-concurrency/tests/test-mailbox.fasl
+lib/sbcl/sb-concurrency/tests/test-mailbox.lisp
+lib/sbcl/sb-concurrency/tests/test-queue.fasl
+lib/sbcl/sb-concurrency/tests/test-queue.lisp
+lib/sbcl/sb-concurrency/tests/test-utils.fasl
+lib/sbcl/sb-concurrency/tests/test-utils.lisp
 lib/sbcl/sb-cover/.cvsignore
 lib/sbcl/sb-cover/Makefile
 lib/sbcl/sb-cover/cover.fasl
@@ -161,21 +180,20 @@ lib/sbcl/sb-posix/posix-tests.lisp
 lib/sbcl/sb-posix/sb-posix.asd
 lib/sbcl/sb-posix/sb-posix.fasl
 lib/sbcl/sb-posix/sb-posix.texinfo
-lib/sbcl/sb-posix/test-passed
 lib/sbcl/sb-posix/test-lab/.keep_me
+lib/sbcl/sb-posix/test-passed
 lib/sbcl/sb-queue/.cvsignore
 lib/sbcl/sb-queue/Makefile
-lib/sbcl/sb-queue/queue.fasl
-lib/sbcl/sb-queue/queue.lisp
+lib/sbcl/sb-queue/package.fasl
+lib/sbcl/sb-queue/package.lisp
 lib/sbcl/sb-queue/sb-queue.asd
-lib/sbcl/sb-queue/sb-queue.texinfo
 lib/sbcl/sb-queue/sb-queue.fasl
+lib/sbcl/sb-queue/sb-queue.texinfo
 lib/sbcl/sb-queue/test-passed
-lib/sbcl/sb-queue/test-queue.fasl
-lib/sbcl/sb-queue/test-queue.lisp
 lib/sbcl/sb-rotate-byte/.cvsignore
 lib/sbcl/sb-rotate-byte/Makefile
 lib/sbcl/sb-rotate-byte/README
+lib/sbcl/sb-rotate-byte/x86-64-vm.lisp
 lib/sbcl/sb-rotate-byte/compiler.fasl
 lib/sbcl/sb-rotate-byte/compiler.lisp
 lib/sbcl/sb-rotate-byte/package.fasl
@@ -216,6 +234,7 @@ lib/sbcl/sb-simple-streams/internal.fasl
 lib/sbcl/sb-simple-streams/internal.lisp
 lib/sbcl/sb-simple-streams/iodefs.fasl
 lib/sbcl/sb-simple-streams/iodefs.lisp
+lib/sbcl/sb-simple-streams/lp491087.txt
 lib/sbcl/sb-simple-streams/null.fasl
 lib/sbcl/sb-simple-streams/null.lisp
 lib/sbcl/sb-simple-streams/package.fasl
@@ -245,14 +264,16 @@ lib/sbcl/site-systems/.keep_me
 @dirrm lib/sbcl/sb-rt
 @dirrm lib/sbcl/sb-rotate-byte
 @dirrm lib/sbcl/sb-queue
-@dirrm lib/sbcl/sb-posix/alien
 @dirrm lib/sbcl/sb-posix/test-lab
+@dirrm lib/sbcl/sb-posix/alien
 @dirrm lib/sbcl/sb-posix
 @dirrm lib/sbcl/sb-md5
 @dirrm lib/sbcl/sb-introspect
 @dirrm lib/sbcl/sb-grovel
 @dirrm lib/sbcl/sb-executable
 @dirrm lib/sbcl/sb-cover
+@dirrm lib/sbcl/sb-concurrency/tests
+@dirrm lib/sbcl/sb-concurrency
 @dirrm lib/sbcl/sb-cltl2
 @dirrm lib/sbcl/sb-bsd-sockets/alien
 @dirrm lib/sbcl/sb-bsd-sockets