Update SBCL to version 1.0.1.

I would list the changes to the package here, but SBCL makes a new
release every month, and there are usually a dozen or more minor
changes per release.  The previous version of this package is about
18 months old...

6 files changed, 231 insertions, 81 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 57a386549c5..df15d2cf0f2 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/05/18 20:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/01/14 05:56:29 jonb Exp $
 
 DISTNAME=		${PKGNAME_NOREV}-source
-PKGNAME=		sbcl-0.9.1
-PKGREVISION=		1
+PKGNAME=		sbcl-1.0.1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sbcl/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,8 +10,6 @@ MAINTAINER=		jonb@NetBSD.org
 HOMEPAGE=		http://www.sbcl.org/
 COMMENT=		SBCL, a Common Lisp implementation
 
-BROKEN_IN=		pkgsrc-2005Q4 pkgsrc-2006Q1
-
 ONLY_FOR_PLATFORM=	NetBSD-[2-9]*-i386
 # It should be possible to have SBCL working on amd64, powerpc,
 # sparc, alpha, mips, and HPPA hardware also, but they probably
@@ -31,17 +28,30 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}/
 # SBCL needs an existing Common Lisp system to build it...
 # Currently allowed systems are CLisp, CMUCL, OpenMCL, and SBCL itself.
 #
-SBCL_BOOT_SYSTEM=	clisp
-#SBCL_BOOT_SYSTEM=	"lisp -batch"
-#SBCL_BOOT_SYSTEM=	"openmcl --batch"
-#SBCL_BOOT_SYSTEM=	sbcl
+#  Note that CLisp 2.39nb1 worked two or three times when testing
+#  this package and it failed to build SBCL twice.  It is also at
+#  least twice as slow as using SBCL when building on an i386 platform.
+#
+#  I have never been able to get CLisp to build on a SPARC system, so
+#  I had to cross build when trying to port SBCL to NetBSD/sparc.
+#  I have reports that CLisp will build on PowerPC platforms, but is
+#  unable to build SBCL.
+#
+#  If SBCL is installed in an unusual place when trying to build this
+#  package, you may need to set the full path in SBCL_BOOT_SYSTEM and
+#  build the package with "SBCL_HOME=/path/to/SBCL/core/image/ make"
+
+#SBCL_BOOT_SYSTEM=	clisp			# CLisp
+#SBCL_BOOT_SYSTEM=	"lisp -batch"		# CMUCL
+#SBCL_BOOT_SYSTEM=	"openmcl --batch"	# OpenMCL
+#SBCL_BOOT_SYSTEM=	sbcl			# SBCL
 
 .if defined(SBCL_BOOT_SYSTEM) && ${SBCL_BOOT_SYSTEM} == clisp
 BUILD_DEPENDS+=		clisp-[0-9]*:../../lang/clisp
 .endif
 
 .if !defined(SBCL_BOOT_SYSTEM)
-PKG_SKIP_REASON+=	"Sorry, need a Common Lisp system"
+PKG_SKIP_REASON+=	"Sorry, need a Common Lisp system.  See Makefile for details."
 .endif
 
 post-patch:
diff --git a/lang/sbcl/PLIST b/lang/sbcl/PLIST
index ab0876c0a1b..aefdc1819db 100644
--- a/lang/sbcl/PLIST
+++ b/lang/sbcl/PLIST
@@ -1,94 +1,234 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/06/23 03:00:20 jonb Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/01/14 05:56:29 jonb Exp $
 bin/sbcl
+lib/sbcl/asdf-install/.cvsignore
+lib/sbcl/asdf-install/CVS/Entries
+lib/sbcl/asdf-install/CVS/Repository
+lib/sbcl/asdf-install/CVS/Root
+lib/sbcl/asdf-install/Makefile
+lib/sbcl/asdf-install/README
+lib/sbcl/asdf-install/asdf-install.asd
 lib/sbcl/asdf-install/asdf-install.fasl
 lib/sbcl/asdf-install/defpackage.fasl
+lib/sbcl/asdf-install/defpackage.lisp
 lib/sbcl/asdf-install/installer.fasl
+lib/sbcl/asdf-install/installer.lisp
+lib/sbcl/asdf-install/installer.lisp.dist
+lib/sbcl/asdf-install/installer.lisp.orig
 lib/sbcl/asdf-install/test-passed
 lib/sbcl/asdf/asdf.fasl
+lib/sbcl/sb-aclrepl/.cvsignore
+lib/sbcl/sb-aclrepl/CVS/Entries
+lib/sbcl/sb-aclrepl/CVS/Repository
+lib/sbcl/sb-aclrepl/CVS/Root
+lib/sbcl/sb-aclrepl/Makefile
+lib/sbcl/sb-aclrepl/README
 lib/sbcl/sb-aclrepl/debug.fasl
+lib/sbcl/sb-aclrepl/debug.lisp
 lib/sbcl/sb-aclrepl/inspect.fasl
+lib/sbcl/sb-aclrepl/inspect.lisp
 lib/sbcl/sb-aclrepl/repl.fasl
+lib/sbcl/sb-aclrepl/repl.lisp
+lib/sbcl/sb-aclrepl/sb-aclrepl.asd
 lib/sbcl/sb-aclrepl/sb-aclrepl.fasl
+lib/sbcl/sb-aclrepl/sb-aclrepl.texinfo
 lib/sbcl/sb-aclrepl/test-passed
 lib/sbcl/sb-aclrepl/tests.fasl
+lib/sbcl/sb-aclrepl/tests.lisp
 lib/sbcl/sb-aclrepl/toplevel.fasl
+lib/sbcl/sb-aclrepl/toplevel.lisp
+lib/sbcl/sb-bsd-sockets/.cvsignore
+lib/sbcl/sb-bsd-sockets/CVS/Entries
+lib/sbcl/sb-bsd-sockets/CVS/Repository
+lib/sbcl/sb-bsd-sockets/CVS/Root
+lib/sbcl/sb-bsd-sockets/FAQ
+lib/sbcl/sb-bsd-sockets/Makefile
+lib/sbcl/sb-bsd-sockets/NEWS
+lib/sbcl/sb-bsd-sockets/TODO
+lib/sbcl/sb-bsd-sockets/a.out
+lib/sbcl/sb-bsd-sockets/constants.fasl
+lib/sbcl/sb-bsd-sockets/constants.lisp
+lib/sbcl/sb-bsd-sockets/constants.lisp-temp
+lib/sbcl/sb-bsd-sockets/defpackage.fasl
+lib/sbcl/sb-bsd-sockets/defpackage.lisp
+lib/sbcl/sb-bsd-sockets/doc.lisp
+lib/sbcl/sb-bsd-sockets/foo.c
+lib/sbcl/sb-bsd-sockets/inet.fasl
+lib/sbcl/sb-bsd-sockets/inet.lisp
+lib/sbcl/sb-bsd-sockets/local.fasl
+lib/sbcl/sb-bsd-sockets/local.lisp
+lib/sbcl/sb-bsd-sockets/misc.fasl
+lib/sbcl/sb-bsd-sockets/misc.lisp
+lib/sbcl/sb-bsd-sockets/name-service.fasl
+lib/sbcl/sb-bsd-sockets/name-service.lisp
+lib/sbcl/sb-bsd-sockets/sb-bsd-sockets.asd
+lib/sbcl/sb-bsd-sockets/sb-bsd-sockets.fasl
+lib/sbcl/sb-bsd-sockets/sb-bsd-sockets.texinfo
+lib/sbcl/sb-bsd-sockets/sockets.fasl
+lib/sbcl/sb-bsd-sockets/sockets.lisp
+lib/sbcl/sb-bsd-sockets/sockopt.fasl
+lib/sbcl/sb-bsd-sockets/sockopt.lisp
+lib/sbcl/sb-bsd-sockets/split.fasl
+lib/sbcl/sb-bsd-sockets/split.lisp
+lib/sbcl/sb-bsd-sockets/test-passed
+lib/sbcl/sb-bsd-sockets/tests.fasl
+lib/sbcl/sb-bsd-sockets/tests.lisp
+lib/sbcl/sb-bsd-sockets/win32-constants.lisp
+lib/sbcl/sb-bsd-sockets/win32-lib.lisp
+lib/sbcl/sb-bsd-sockets/win32-sockets.lisp
+lib/sbcl/sb-cltl2/.cvsignore
+lib/sbcl/sb-cltl2/CVS/Entries
+lib/sbcl/sb-cltl2/CVS/Repository
+lib/sbcl/sb-cltl2/CVS/Root
+lib/sbcl/sb-cltl2/Makefile
 lib/sbcl/sb-cltl2/compiler-let.fasl
+lib/sbcl/sb-cltl2/compiler-let.lisp
 lib/sbcl/sb-cltl2/defpackage.fasl
+lib/sbcl/sb-cltl2/defpackage.lisp
 lib/sbcl/sb-cltl2/env.fasl
+lib/sbcl/sb-cltl2/env.lisp
 lib/sbcl/sb-cltl2/macroexpand.fasl
+lib/sbcl/sb-cltl2/macroexpand.lisp
+lib/sbcl/sb-cltl2/sb-cltl2.asd
 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-executable/sb-executable.fasl
+lib/sbcl/sb-grovel/.cvsignore
+lib/sbcl/sb-grovel/CVS/Entries
+lib/sbcl/sb-grovel/CVS/Repository
+lib/sbcl/sb-grovel/CVS/Root
+lib/sbcl/sb-grovel/Makefile
 lib/sbcl/sb-grovel/def-to-lisp.fasl
+lib/sbcl/sb-grovel/def-to-lisp.lisp
 lib/sbcl/sb-grovel/defpackage.fasl
+lib/sbcl/sb-grovel/defpackage.lisp
+lib/sbcl/sb-grovel/example-constants.lisp
 lib/sbcl/sb-grovel/foreign-glue.fasl
+lib/sbcl/sb-grovel/foreign-glue.lisp
+lib/sbcl/sb-grovel/sb-grovel.asd
 lib/sbcl/sb-grovel/sb-grovel.fasl
+lib/sbcl/sb-grovel/sb-grovel.texinfo
 lib/sbcl/sb-grovel/test-passed
 lib/sbcl/sb-introspect/sb-introspect.fasl
+lib/sbcl/sb-md5/.cvsignore
+lib/sbcl/sb-md5/CVS/Entries
+lib/sbcl/sb-md5/CVS/Repository
+lib/sbcl/sb-md5/CVS/Root
+lib/sbcl/sb-md5/Makefile
+lib/sbcl/sb-md5/README
 lib/sbcl/sb-md5/md5-tests.fasl
+lib/sbcl/sb-md5/md5-tests.lisp
 lib/sbcl/sb-md5/md5.fasl
+lib/sbcl/sb-md5/md5.lisp
+lib/sbcl/sb-md5/sb-md5.asd
 lib/sbcl/sb-md5/sb-md5.fasl
+lib/sbcl/sb-md5/sb-md5.texinfo
 lib/sbcl/sb-md5/test-passed
-lib/sbcl/sb-posix/a.out
-lib/sbcl/sb-posix/alien.so
-lib/sbcl/sb-posix/alien/stat-macros.o
-lib/sbcl/sb-posix/alien/waitpid-macros.o
-lib/sbcl/sb-posix/constants.fasl
-lib/sbcl/sb-posix/constants.lisp-temp
-lib/sbcl/sb-posix/defpackage.fasl
-lib/sbcl/sb-posix/designator.fasl
-lib/sbcl/sb-posix/foo.c
-lib/sbcl/sb-posix/interface.fasl
-lib/sbcl/sb-posix/macros.fasl
-lib/sbcl/sb-posix/posix-tests.fasl
-lib/sbcl/sb-posix/sb-posix.fasl
-lib/sbcl/sb-posix/test-passed
+lib/sbcl/sb-rotate-byte/.cvsignore
+lib/sbcl/sb-rotate-byte/CVS/Entries
+lib/sbcl/sb-rotate-byte/CVS/Repository
+lib/sbcl/sb-rotate-byte/CVS/Root
+lib/sbcl/sb-rotate-byte/Makefile
+lib/sbcl/sb-rotate-byte/README
 lib/sbcl/sb-rotate-byte/compiler.fasl
+lib/sbcl/sb-rotate-byte/compiler.lisp
 lib/sbcl/sb-rotate-byte/package.fasl
+lib/sbcl/sb-rotate-byte/package.lisp
+lib/sbcl/sb-rotate-byte/ppc-vm.lisp
 lib/sbcl/sb-rotate-byte/rotate-byte-tests.fasl
+lib/sbcl/sb-rotate-byte/rotate-byte-tests.lisp
 lib/sbcl/sb-rotate-byte/rotate-byte.fasl
+lib/sbcl/sb-rotate-byte/rotate-byte.lisp
+lib/sbcl/sb-rotate-byte/sb-rotate-byte.asd
 lib/sbcl/sb-rotate-byte/sb-rotate-byte.fasl
+lib/sbcl/sb-rotate-byte/sb-rotate-byte.texinfo
 lib/sbcl/sb-rotate-byte/test-passed
 lib/sbcl/sb-rotate-byte/x86-vm.fasl
+lib/sbcl/sb-rotate-byte/x86-vm.lisp
+lib/sbcl/sb-rt/.cvsignore
+lib/sbcl/sb-rt/CVS/Entries
+lib/sbcl/sb-rt/CVS/Repository
+lib/sbcl/sb-rt/CVS/Root
+lib/sbcl/sb-rt/Makefile
 lib/sbcl/sb-rt/rt.fasl
+lib/sbcl/sb-rt/rt.lisp
+lib/sbcl/sb-rt/sb-rt.asd
 lib/sbcl/sb-rt/sb-rt.fasl
 lib/sbcl/sb-rt/test-passed
+lib/sbcl/sb-simple-streams/.cvsignore
+lib/sbcl/sb-simple-streams/CVS/Entries
+lib/sbcl/sb-simple-streams/CVS/Repository
+lib/sbcl/sb-simple-streams/CVS/Root
+lib/sbcl/sb-simple-streams/Makefile
+lib/sbcl/sb-simple-streams/README
+lib/sbcl/sb-simple-streams/TODO
+lib/sbcl/sb-simple-streams/classes.fasl
+lib/sbcl/sb-simple-streams/classes.lisp
+lib/sbcl/sb-simple-streams/direct.fasl
+lib/sbcl/sb-simple-streams/direct.lisp
+lib/sbcl/sb-simple-streams/file.fasl
+lib/sbcl/sb-simple-streams/file.lisp
+lib/sbcl/sb-simple-streams/fndb.fasl
+lib/sbcl/sb-simple-streams/fndb.lisp
+lib/sbcl/sb-simple-streams/impl.fasl
+lib/sbcl/sb-simple-streams/impl.lisp
+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/null.fasl
+lib/sbcl/sb-simple-streams/null.lisp
+lib/sbcl/sb-simple-streams/package.fasl
+lib/sbcl/sb-simple-streams/package.lisp
+lib/sbcl/sb-simple-streams/sb-simple-streams.asd
+lib/sbcl/sb-simple-streams/sb-simple-streams.fasl
+lib/sbcl/sb-simple-streams/sb-simple-streams.texinfo
+lib/sbcl/sb-simple-streams/simple-stream-tests.fasl
+lib/sbcl/sb-simple-streams/simple-stream-tests.lisp
+lib/sbcl/sb-simple-streams/socket.fasl
+lib/sbcl/sb-simple-streams/socket.lisp
+lib/sbcl/sb-simple-streams/strategy.fasl
+lib/sbcl/sb-simple-streams/strategy.lisp
+lib/sbcl/sb-simple-streams/string.fasl
+lib/sbcl/sb-simple-streams/string.lisp
+lib/sbcl/sb-simple-streams/terminal.fasl
+lib/sbcl/sb-simple-streams/terminal.lisp
+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-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
+man/man1/sbcl.1
 share/doc/sbcl/BUGS
 share/doc/sbcl/COPYING
 share/doc/sbcl/CREDITS
 share/doc/sbcl/NEWS
 share/doc/sbcl/SUPPORT
-share/man/man1/sbcl.1
 @exec ${MKDIR} %D/share/doc/sbcl/html
 @dirrm share/doc/sbcl/html
 @dirrm share/doc/sbcl
-@dirrm lib/sbcl/systems
 @exec ${MKDIR} %D/lib/sbcl/site-systems
 @dirrm lib/sbcl/site-systems
 @dirrm lib/sbcl/sb-sprof
+@dirrm lib/sbcl/sb-simple-streams/CVS
+@dirrm lib/sbcl/sb-simple-streams
+@dirrm lib/sbcl/sb-rt/CVS
 @dirrm lib/sbcl/sb-rt
+@dirrm lib/sbcl/sb-rotate-byte/CVS
 @dirrm lib/sbcl/sb-rotate-byte
-@exec ${MKDIR} %D/lib/sbcl/sb-posix/test-lab
-@dirrm lib/sbcl/sb-posix/test-lab
-@dirrm lib/sbcl/sb-posix/alien
-@dirrm lib/sbcl/sb-posix
+@dirrm lib/sbcl/sb-md5/CVS
 @dirrm lib/sbcl/sb-md5
 @dirrm lib/sbcl/sb-introspect
+@dirrm lib/sbcl/sb-grovel/CVS
 @dirrm lib/sbcl/sb-grovel
 @dirrm lib/sbcl/sb-executable
+@dirrm lib/sbcl/sb-cltl2/CVS
 @dirrm lib/sbcl/sb-cltl2
+@dirrm lib/sbcl/sb-bsd-sockets/CVS
+@dirrm lib/sbcl/sb-bsd-sockets
+@dirrm lib/sbcl/sb-aclrepl/CVS
 @dirrm lib/sbcl/sb-aclrepl
+@dirrm lib/sbcl/asdf-install/CVS
 @dirrm lib/sbcl/asdf-install
 @dirrm lib/sbcl/asdf
 @dirrm lib/sbcl
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index 25ee2ec3720..512a90045c1 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2005/07/22 02:38:13 jonb Exp $
+$NetBSD: distinfo,v 1.3 2007/01/14 05:56:29 jonb Exp $
 
-SHA1 (sbcl-0.9.1-source.tar.bz2) = c12a123eadf99625d1821df7f3b3081637a921d2
-RMD160 (sbcl-0.9.1-source.tar.bz2) = 7c9e6d2e51f4b578255cfb1dd6592d572945595b
-Size (sbcl-0.9.1-source.tar.bz2) = 2458526 bytes
+SHA1 (sbcl-1.0.1-source.tar.bz2) = ddd1a7595ea83ed1655c716fc7c967ee8ff13878
+RMD160 (sbcl-1.0.1-source.tar.bz2) = c86b352f547f3526288704e1a74463718ba11fe9
+Size (sbcl-1.0.1-source.tar.bz2) = 2902375 bytes
 SHA1 (patch-aa) = 8f1c02fc96233af1063ca8dd62bc6033eb435db2
-SHA1 (patch-ab) = c52f6a54783fbc7e55f198a070430b4c7378e6e7
-SHA1 (patch-ac) = b814853d6259be62cd18a5b68760ec1db7efe634
-SHA1 (patch-ad) = 2e6815271752c555740576045fe3c8aab46f9bf0
+SHA1 (patch-ab) = 5b3e831bae400f4d61b0144d7812864a8d5e6c86
+SHA1 (patch-ac) = bce87555a5944cfeb25c65df9d41c3f49b5d4866
+SHA1 (patch-ad) = 5b9c4c30066c7d3591727585d698ad5c3523ad4e
diff --git a/lang/sbcl/patches/patch-ab b/lang/sbcl/patches/patch-ab
index 7927f3fd8bf..70249e77caa 100644
--- a/lang/sbcl/patches/patch-ab
+++ b/lang/sbcl/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/06/23 03:00:20 jonb Exp $
+$NetBSD: patch-ab,v 1.2 2007/01/14 05:56:29 jonb Exp $
 
---- doc/sbcl.1.orig	2005-05-05 21:08:44.000000000 +0000
-+++ doc/sbcl.1
-@@ -472,7 +472,7 @@ place to look for support.
+--- doc/sbcl.1.orig	2006-11-02 09:18:37.000000000 -0800
++++ doc/sbcl.1	2007-01-12 22:28:41.000000000 -0800
+@@ -458,7 +458,7 @@
  This variable controls where files like "sbclrc", "sbcl.core", and the
  add-on "contrib" systems are searched for.  If it is not set, then
  sbcl sets it from a compile-time default location which is usually
--/usr/local/lib/sbcl/ but may have been changed e.g. by a third-party
-+@PREFIX@/lib/sbcl/ but may have been changed e.g. by a third-party
+-/usr/local/lib/sbcl/ but may have been changed \fIe.g.\fR by a third-party
++@PREFIX@/lib/sbcl/ but may have been changed \fIe.g.\fR by a third-party
  packager.
  
  .SH FILES
-@@ -512,7 +512,7 @@ been installed, the command
+@@ -498,7 +498,7 @@
  should give you access to the complete manual. Depending on your
  installation it may also be available in HTML and PDF formats in eg.
  .IP
diff --git a/lang/sbcl/patches/patch-ac b/lang/sbcl/patches/patch-ac
index c6147319766..f6343f0ff48 100644
--- a/lang/sbcl/patches/patch-ac
+++ b/lang/sbcl/patches/patch-ac
@@ -1,18 +1,17 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/06/23 03:00:20 jonb Exp $
+$NetBSD: patch-ac,v 1.2 2007/01/14 05:56:29 jonb Exp $
 
---- install.sh.orig	2004-10-21 13:00:23.000000000 +0000
-+++ install.sh
-@@ -9,7 +9,7 @@ ensure_dirs () 
-     done;
- }
- 
--INSTALL_ROOT=${INSTALL_ROOT-/usr/local}
--MAN_DIR=${MAN_DIR-$INSTALL_ROOT/share/man}
--INFO_DIR=${INFO_DIR-$INSTALL_ROOT/share/info}
+--- ./install.sh.orig	2006-09-24 08:47:27.000000000 -0700
++++ ./install.sh	2007-01-12 22:34:18.000000000 -0800
+@@ -19,9 +19,9 @@
+     RUNTIME=sbcl
+     OLD_RUNTIME=sbcl.old
+ fi
+-INSTALL_ROOT=${INSTALL_ROOT-$DEFAULT_INSTALL_ROOT}
+-MAN_DIR=${MAN_DIR-"$INSTALL_ROOT"/share/man}
+-INFO_DIR=${INFO_DIR-"$INSTALL_ROOT"/share/info}
 +INSTALL_ROOT=${INSTALL_ROOT-@PREFIX@}
-+MAN_DIR=${MAN_DIR-$INSTALL_ROOT/man}
-+INFO_DIR=${INFO_DIR-$INSTALL_ROOT/info}
- DOC_DIR=${DOC_DIR-$INSTALL_ROOT/share/doc/sbcl}
++MAN_DIR=${MAN_DIR-"$INSTALL_ROOT"/man}
++INFO_DIR=${INFO_DIR-"$INSTALL_ROOT"/info}
+ DOC_DIR=${DOC_DIR-"$INSTALL_ROOT"/share/doc/sbcl}
  
- SBCL_SOURCE=`pwd`
- if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then
+ # Does the environment look sane?
diff --git a/lang/sbcl/patches/patch-ad b/lang/sbcl/patches/patch-ad
index b747f063b91..d147cc66ae9 100644
--- a/lang/sbcl/patches/patch-ad
+++ b/lang/sbcl/patches/patch-ad
@@ -1,14 +1,15 @@
-$NetBSD: patch-ad,v 1.1 2005/07/30 00:21:30 jonb Exp $
+$NetBSD: patch-ad,v 1.2 2007/01/14 05:56:29 jonb Exp $
 
---- contrib/asdf-install/installer.lisp.orig	2005-07-20 22:08:29.000000000 +0000
-+++ contrib/asdf-install/installer.lisp	2005-07-20 22:10:27.000000000 +0000
-@@ -249,8 +249,7 @@
-   (let* ((tar
- 	  (with-output-to-string (o)
- 	    (or
--	     (sb-ext:run-program #-darwin "tar"
--				 #+darwin "gnutar"
-+	     (sb-ext:run-program "@GTAR@"
- 				 (list "-C" (namestring source)
- 				       "-xzvf" (namestring packagename))
- 				 :output o
+--- ./contrib/asdf-install/installer.lisp.orig	2006-09-07 01:49:39.000000000 -0700
++++ ./contrib/asdf-install/installer.lisp	2007-01-12 22:37:22.000000000 -0800
+@@ -256,8 +256,8 @@
+ 
+ (defparameter *tar-program*
+   #+darwin "gnutar"
+-  #+sunos "gtar"
+-  #-(or darwin sunos) "tar")
++  #+(or netbsd sunos) "gtar"
++  #-(or darwin netbsd sunos) "tar")
+ 
+ (defun get-tar-directory (packagename)
+   (let* ((tar (with-output-to-string (o)