4 files changed, 25 insertions, 36 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 7ce6812435ec..bceec2e03104 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sbcl
-PORTVERSION=	0.9.9
+PORTVERSION=	0.9.10
 CATEGORIES=	lang lisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sbcl
@@ -28,7 +28,7 @@ LISP_CMD=	""
 BUILD_DEPENDS=	lisp:${PORTSDIR}/lang/cmucl
 LISP_CMD=	"lisp -noinit -batch"
 .else
-BOOT_VERSION=	${PORTVERSION}
+BOOT_VERSION=	0.9.9
 .endif
 
 USE_BZIP2=	yes
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index f7b739779a32..8598d45c4e33 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,9 +1,9 @@
-MD5 (sbcl-0.9.9-source.tar.bz2) = 4aafb2ce07bd7933f7edec29b404a595
-SHA256 (sbcl-0.9.9-source.tar.bz2) = 117762d02aa4748964c814fb20b0481322fdec1948b748c9159b0942a675eb8c
-SIZE (sbcl-0.9.9-source.tar.bz2) = 2695081
-MD5 (sbcl-0.9.9-html.tar.bz2) = a884ab78a3e4f5ecc516fc7197fe2fd6
-SHA256 (sbcl-0.9.9-html.tar.bz2) = 324c36660f37f9cbccab9c07d4f714f761b177350585d34c3d890c9f4557f0b6
-SIZE (sbcl-0.9.9-html.tar.bz2) = 119734
+MD5 (sbcl-0.9.10-source.tar.bz2) = 58678d7081f32bdcd174c5233efba4f3
+SHA256 (sbcl-0.9.10-source.tar.bz2) = 85f2e815ab1342251170ae2ad9c1793665fae7b8a9ffab1969fc9c680a4883b4
+SIZE (sbcl-0.9.10-source.tar.bz2) = 2712120
+MD5 (sbcl-0.9.10-html.tar.bz2) = 2112bf40540c2d0cf9bd4914a26dd274
+SHA256 (sbcl-0.9.10-html.tar.bz2) = 5616a0bdaf8329a71ff8f617a08fd692d39c68dc00dd5802d9452b6dc0f3b1b5
+SIZE (sbcl-0.9.10-html.tar.bz2) = 120447
 MD5 (sbcl-0.9.9-x86-freebsd-binary.tar.bz2) = 864a882d553b62715079fce546189b4a
 SHA256 (sbcl-0.9.9-x86-freebsd-binary.tar.bz2) = 154ea8381cede582950dadd7c2e6182d9e598d401e5b76b14b46cdd6c165fc1b
 SIZE (sbcl-0.9.9-x86-freebsd-binary.tar.bz2) = 7276372
diff --git a/lang/sbcl/files/patch-backtrace b/lang/sbcl/files/patch-backtrace
index acd553e7b897..9a3dfee4da85 100644
--- a/lang/sbcl/files/patch-backtrace
+++ b/lang/sbcl/files/patch-backtrace
@@ -4,7 +4,7 @@ RCS file: /cvsroot/sbcl/sbcl/src/code/debug-int.lisp,v
 retrieving revision 1.101
 diff -u -r1.101 debug-int.lisp
 --- src/code/debug-int.lisp	28 Sep 2005 13:42:24 -0000	1.101
-+++ src/code/debug-int.lisp	26 Jan 2006 01:59:07 -0000
++++ src/code/debug-int.lisp	27 Feb 2006 10:52:45 -0000
 @@ -559,6 +559,9 @@
  
  (defconstant sb!vm::nargs-offset #.sb!vm::ecx-offset)
@@ -31,21 +31,21 @@ diff -u -r1.101 debug-int.lisp
 Index: src/runtime/bsd-os.c
 ===================================================================
 RCS file: /cvsroot/sbcl/sbcl/src/runtime/bsd-os.c,v
-retrieving revision 1.31
-diff -u -r1.31 bsd-os.c
---- src/runtime/bsd-os.c	22 Jan 2006 18:55:07 -0000	1.31
-+++ src/runtime/bsd-os.c	26 Jan 2006 01:59:07 -0000
+retrieving revision 1.36
+diff -u -r1.36 bsd-os.c
+--- src/runtime/bsd-os.c	21 Feb 2006 23:40:36 -0000	1.36
++++ src/runtime/bsd-os.c	27 Feb 2006 10:52:45 -0000
 @@ -53,6 +53,8 @@
  
  #ifdef __FreeBSD__
  #include <sys/sysctl.h>
 +#include <link.h>
 +#include <dlfcn.h>
+ #include <osreldate.h>
  
  static void freebsd_init();
- #endif /* __FreeBSD__ */
-@@ -311,6 +313,25 @@
-         fast_bzero_pointer = fast_bzero_base;
+@@ -310,6 +312,25 @@
+         fast_bzero_pointer = fast_bzero_detect;
      }
  #endif /* LISP_FEATURE_X86 */
 +    /* extract lowermost address from linkmap */
@@ -73,10 +73,10 @@ diff -u -r1.31 bsd-os.c
 Index: src/runtime/globals.c
 ===================================================================
 RCS file: /cvsroot/sbcl/sbcl/src/runtime/globals.c,v
-retrieving revision 1.18
-diff -u -r1.18 globals.c
---- src/runtime/globals.c	14 Jul 2005 15:41:11 -0000	1.18
-+++ src/runtime/globals.c	26 Jan 2006 01:59:07 -0000
+retrieving revision 1.19
+diff -u -r1.19 globals.c
+--- src/runtime/globals.c	21 Feb 2006 22:59:33 -0000	1.19
++++ src/runtime/globals.c	27 Feb 2006 10:52:45 -0000
 @@ -16,6 +16,7 @@
  #include <stdio.h>
  #include <sys/types.h>
@@ -103,11 +103,11 @@ diff -u -r1.18 globals.c
 Index: src/runtime/globals.h
 ===================================================================
 RCS file: /cvsroot/sbcl/sbcl/src/runtime/globals.h,v
-retrieving revision 1.25
-diff -u -r1.25 globals.h
---- src/runtime/globals.h	14 Jul 2005 15:41:11 -0000	1.25
-+++ src/runtime/globals.h	26 Jan 2006 01:59:07 -0000
-@@ -99,4 +99,7 @@
+retrieving revision 1.26
+diff -u -r1.26 globals.h
+--- src/runtime/globals.h	21 Feb 2006 22:59:33 -0000	1.26
++++ src/runtime/globals.h	27 Feb 2006 10:52:46 -0000
+@@ -108,4 +108,7 @@
  
  #endif /* LANGUAGE_ASSEMBLY */
  
diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist
index f4754daa1eab..cce75806c4c6 100644
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -529,23 +529,12 @@ lib/sbcl/sb-simple-streams/test-data.tmp
 lib/sbcl/sb-simple-streams/test-passed
 lib/sbcl/sb-sprof/sb-sprof.fasl
 lib/sbcl/sbcl.core
-lib/sbcl/systems/asdf-install.asd
-lib/sbcl/systems/sb-aclrepl.asd
-lib/sbcl/systems/sb-bsd-sockets.asd
-lib/sbcl/systems/sb-cltl2.asd
-lib/sbcl/systems/sb-grovel.asd
-lib/sbcl/systems/sb-md5.asd
-lib/sbcl/systems/sb-posix.asd
-lib/sbcl/systems/sb-rotate-byte.asd
-lib/sbcl/systems/sb-rt.asd
-lib/sbcl/systems/sb-simple-streams.asd
 @exec mkdir -p %D/lib/sbcl/site-systems
 @exec mkdir -p %D/lib/sbcl/sb-posix/test-lab
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/sbcl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/asdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 @dirrm %%DOCSDIR%%
-@dirrm lib/sbcl/systems
 @dirrm lib/sbcl/site-systems
 @dirrm lib/sbcl/sb-sprof
 @dirrm lib/sbcl/sb-simple-streams