Update to SBCL 1.0.30

Changes since previous packaged version are too long to list,
they include 1,5 years of continuous development, adding features,
compiler optimizations, and fixing bugs. See log at
http://www.sbcl.org/all-news.html

6 files changed, 90 insertions, 111 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 1e66ff9a866..8bc58083dbc 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -1,22 +1,23 @@
-# $NetBSD: Makefile,v 1.18 2008/06/25 23:42:19 obache Exp $
-
-.include "../../mk/bsd.prefs.mk"
+# $NetBSD: Makefile,v 1.19 2009/08/19 13:03:30 asau Exp $
 
 DISTNAME=		${PKGNAME_NOREV}-source
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
-			sbcl-${OPSYS}-${MACHINE_ARCH}-${OS_VERSION}.tgz
-PKGNAME=		sbcl-1.0.16
+PKGNAME=		sbcl-1.0.30
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sbcl/}
 EXTRACT_SUFX=		.tar.bz2
-SITES.sbcl-${OPSYS}-${MACHINE_ARCH}-${OS_VERSION}.tgz= \
-			ftp://ftp.NetBSD.org/pub/NetBSD/misc/jonb/sbcl/
 
 MAINTAINER=		jonb@NetBSD.org
 HOMEPAGE=		http://www.sbcl.org/
 COMMENT=		SBCL, a Common Lisp implementation
 
 ONLY_FOR_PLATFORM=	NetBSD-[2-9]*-i386
+ONLY_FOR_PLATFORM+=	FreeBSD-[2-9]*-i386
+ONLY_FOR_PLATFORM+=	Linux-*-i386
+# It should be possible to have SBCL working on amd64, powerpc,
+# sparc, alpha, mips, and HPPA hardware also, but they probably
+# need a bit of porting work done in SBCL itself.
+# In addition, SBCL should also work on Darwin, Solaris, OpenBSD,
+# and possibly Win32, OSF/1, HP-UX, and Irix.
 
 # SBCL creates a new release with minor updates and fixes every
 # month.  The maintainer of this package does not have the time
@@ -25,51 +26,74 @@ ONLY_FOR_PLATFORM=	NetBSD-[2-9]*-i386
 # 1) change the PKGNAME variable above as desired
 # 2) make fetch && make makesum && make package
 
-# It should be possible to have SBCL working on amd64, powerpc,
-# sparc, alpha, mips, and HPPA hardware also, but they probably
-# need a bit of porting work done in SBCL itself.
-# In addition, SBCL should also work on Linux, Darwin, Solaris,
-# FreeBSD, OpenBSD, and possibly Win32, OSF/1, HP-UX, and Irix.
+USE_TOOLS+=		gmake gtar:run
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
+.include "../../mk/bsd.prefs.mk"
+
+#
+# Bootstrap section.
+#
 # SBCL needs an existing Common Lisp system to build it...
-# In theory CLisp, CMUCL, OpenMCL, and SBCL itself should work.
-# In practice, CLisp has been a PITA, while CMUCL and OpenMCL
-# haven't been ported to NetBSD.  That leaves SBCL itself to
-# do the build, so pull in a working binary package of SBCL
-# along with the sources when building.
+# Currently allowed systems are CLISP, CMUCL, OpenMCL, and SBCL itself.
+#
+#  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 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"
 
-USE_TOOLS+=		gmake gtar:run
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
+#SBCL_BOOT_SYSTEM=	clisp			# CLisp
+#SBCL_BOOT_SYSTEM=	"lisp -batch"		# CMUCL
+#SBCL_BOOT_SYSTEM=	"openmcl --batch"	# OpenMCL
+#SBCL_BOOT_SYSTEM=	sbcl			# SBCL
 
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}/
+.if !defined(SBCL_BOOT_SYSTEM)
+# Use "clisp -ansi -on-error abort" to make the build more reproducible,
+# per Christophe Rhodes:
+SBCL_BOOT_SYSTEM=	clisp -ansi -on-error abort
+BUILD_DEPENDS+=		clisp-[0-9]*:../../lang/clisp
+ULIMIT_RESOURCES=	datasize
+.elif ${SBCL_BOOT_SYSTEM} == clisp
+BUILD_DEPENDS+=		clisp-[0-9]*:../../lang/clisp
+ULIMIT_RESOURCES=	datasize
+.elif ${SBCL_BOOT_SYSTEM} == sbcl
+# Get bootstrap version:
+BUILD_DEPENDS+=		sbcl-[0-9]*:../../lang/sbcl
+.endif
 
-SUBST_CLASSES+=		fix-paths
-SUBST_STAGE.fix-paths=	pre-configure
-SUBST_MESSAGE.fix-paths=fixing pathnames
-SUBST_FILES.fix-paths=	install.sh src/runtime/runtime.c doc/sbcl.1
-SUBST_SED.fix-paths=	-e 's,@PREFIX@,${PREFIX},g'
 
-SUBST_CLASSES+=		fix-gtar
-SUBST_STAGE.fix-gtar=	pre-configure
-SUBST_MESSAGE.fix-gtar=	fixing gtar references
-SUBST_FILES.fix-gtar=	contrib/asdf-install/installer.lisp
-SUBST_SED.fix-gtar=	-e 's,@GTAR@,${GTAR},g'
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		pre-configure
+SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
+SUBST_FILES.fix-paths=		install.sh src/runtime/runtime.c doc/sbcl.1
+SUBST_SED.fix-paths=		-e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.fix-paths+=           -e 's,/var/log,${VARBASE}/log,g'
 
-do-build:
-	export SBCL_HOME=${WRKDIR}/lib/sbcl/ \
-	&& cd ${WRKSRC} \
-	&& ${SH} make.sh ${WRKDIR}/bin/sbcl
+SUBST_CLASSES+=			fix-gtar
+SUBST_STAGE.fix-gtar=		pre-configure
+SUBST_MESSAGE.fix-gtar=		Fixing GNU tar references.
+SUBST_FILES.fix-gtar=		contrib/asdf-install/installer.lisp
+SUBST_SED.fix-gtar=		-e 's,@GTAR@,${GTAR},'
 
-# Rather not do this, but the file names seem to be hash values of
-# timestamps or something and the pkgsrc system does *not* like
-# randomly named and always changing file names
+do-build:
+	cd ${WRKSRC} && ${SH} make.sh ${SBCL_BOOT_SYSTEM:Q}
 post-build:
-	${RM} -rf ${WRKSRC}/contrib/sb-cover/test-output
+	cd ${WRKSRC} && ${RM} -f contrib/sb-cover/test-output/*
 
 do-install:
-	cd ${WRKSRC} \
-	&& INSTALL_ROOT=${PREFIX} \
-	   MAN_DIR=${PREFIX}/${PKGMANDIR} \
-	   ${SH} install.sh
+	cd ${WRKSRC} && BUILD_ROOT=${DESTDIR:Q} INSTALL_ROOT=${PREFIX:Q} MAN_DIR=${PREFIX:Q}/${PKGMANDIR} ${SH} install.sh
+	rm -f $(DESTDIR)$(PREFIX)/lib/sbcl/asdf-install/installer.lisp.orig
+
+do-test:
+	cd ${WRKSRC}/tests && ${SH} ./run-tests.sh
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/sbcl/PLIST b/lang/sbcl/PLIST
index 759c4bfc933..a07695d4f58 100644
--- a/lang/sbcl/PLIST
+++ b/lang/sbcl/PLIST
@@ -1,9 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 20:34:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/08/19 13:03:30 asau 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
@@ -12,13 +9,9 @@ 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.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
@@ -36,9 +29,6 @@ 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
@@ -74,9 +64,6 @@ 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
@@ -92,9 +79,6 @@ lib/sbcl/sb-cltl2/test-passed
 lib/sbcl/sb-cltl2/tests.fasl
 lib/sbcl/sb-cltl2/tests.lisp
 lib/sbcl/sb-cover/.cvsignore
-lib/sbcl/sb-cover/CVS/Entries
-lib/sbcl/sb-cover/CVS/Repository
-lib/sbcl/sb-cover/CVS/Root
 lib/sbcl/sb-cover/Makefile
 lib/sbcl/sb-cover/cover.fasl
 lib/sbcl/sb-cover/cover.lisp
@@ -112,9 +96,6 @@ lib/sbcl/sb-cover/tests.fasl
 lib/sbcl/sb-cover/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
@@ -129,9 +110,6 @@ 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
@@ -143,9 +121,6 @@ lib/sbcl/sb-md5/sb-md5.fasl
 lib/sbcl/sb-md5/sb-md5.texinfo
 lib/sbcl/sb-md5/test-passed
 lib/sbcl/sb-posix/.cvsignore
-lib/sbcl/sb-posix/CVS/Entries
-lib/sbcl/sb-posix/CVS/Repository
-lib/sbcl/sb-posix/CVS/Root
 lib/sbcl/sb-posix/Makefile
 lib/sbcl/sb-posix/README
 lib/sbcl/sb-posix/TODO
@@ -168,10 +143,8 @@ 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-queue/sb-queue.fasl
 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
@@ -190,9 +163,6 @@ 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
@@ -200,9 +170,6 @@ 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
@@ -246,6 +213,3 @@ share/doc/sbcl/BUGS
 share/doc/sbcl/COPYING
 share/doc/sbcl/CREDITS
 share/doc/sbcl/NEWS
-share/doc/sbcl/SUPPORT
-@pkgdir share/doc/sbcl/html
-@pkgdir lib/sbcl/site-systems
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index 8b9b0d2c933..b68dc57348d 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,18 +1,9 @@
-$NetBSD: distinfo,v 1.6 2008/05/28 14:06:31 jonb Exp $
+$NetBSD: distinfo,v 1.7 2009/08/19 13:03:30 asau Exp $
 
-SHA1 (sbcl-1.0.16-source.tar.bz2) = 81b05d25b2478e2bdee5d2885d2318612d09b6fd
-RMD160 (sbcl-1.0.16-source.tar.bz2) = 64082b1c1885ce5d31636ccc7a65bfd9334072f9
-Size (sbcl-1.0.16-source.tar.bz2) = 3213890 bytes
-SHA1 (sbcl-NetBSD-i386-3.0.3.tgz) = e7e43bd175bc56f25aa727f917686c24271f255e
-RMD160 (sbcl-NetBSD-i386-3.0.3.tgz) = fbefaa572a80cf016d61dbc737b6eed11b9f758e
-Size (sbcl-NetBSD-i386-3.0.3.tgz) = 9474559 bytes
-SHA1 (sbcl-NetBSD-i386-4.0.tgz) = 47edaac902e435ef7678a84837586fd243d2ea0a
-RMD160 (sbcl-NetBSD-i386-4.0.tgz) = 5f4ccc3075a42f3801db458ca157e38f83f005a1
-Size (sbcl-NetBSD-i386-4.0.tgz) = 9334199 bytes
-SHA1 (sbcl-NetBSD-i386-4.0_STABLE.tgz) = 47edaac902e435ef7678a84837586fd243d2ea0a
-RMD160 (sbcl-NetBSD-i386-4.0_STABLE.tgz) = 5f4ccc3075a42f3801db458ca157e38f83f005a1
-Size (sbcl-NetBSD-i386-4.0_STABLE.tgz) = 9334199 bytes
-SHA1 (patch-aa) = 8f1c02fc96233af1063ca8dd62bc6033eb435db2
-SHA1 (patch-ab) = 5b3e831bae400f4d61b0144d7812864a8d5e6c86
+SHA1 (sbcl-1.0.30-source.tar.bz2) = 446fe474566f4709d9852278e950f253a20722d6
+RMD160 (sbcl-1.0.30-source.tar.bz2) = 96c5b38d495bbd959730162828b4d58ead245b5e
+Size (sbcl-1.0.30-source.tar.bz2) = 3348181 bytes
+SHA1 (patch-aa) = 3bd72ba259fc23c3ae09bf104c8e395f3826fff0
+SHA1 (patch-ab) = e8420a7aa51f6920d6556e84ef3f0ca32fdeb2fd
 SHA1 (patch-ac) = bce87555a5944cfeb25c65df9d41c3f49b5d4866
-SHA1 (patch-ad) = 2bb746d49ee22fc0aa532129997726393a35d267
+SHA1 (patch-ad) = 4a10e7d498b686a09b067c527010981c15f0f8c8
diff --git a/lang/sbcl/patches/patch-aa b/lang/sbcl/patches/patch-aa
index 72292597bec..e45f35ec376 100644
--- a/lang/sbcl/patches/patch-aa
+++ b/lang/sbcl/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/06/23 03:00:20 jonb Exp $
+$NetBSD: patch-aa,v 1.2 2009/08/19 13:03:30 asau Exp $
 
---- src/runtime/runtime.c.orig	2005-05-05 21:07:13.000000000 +0000
-+++ src/runtime/runtime.c
-@@ -62,7 +62,7 @@
+--- src/runtime/runtime.c.orig	2009-03-23 00:44:07.000000000 +0300
++++ src/runtime/runtime.c	2009-05-24 09:46:18.000000000 +0400
+@@ -67,7 +67,7 @@
  #endif
  
  #ifndef SBCL_HOME
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/06/23 03:00:20 jonb Exp $
 +#define SBCL_HOME "@PREFIX@/lib/sbcl/"
  #endif
  
- 
+ #ifdef LISP_FEATURE_HPUX
diff --git a/lang/sbcl/patches/patch-ab b/lang/sbcl/patches/patch-ab
index 70249e77caa..88960ee1812 100644
--- a/lang/sbcl/patches/patch-ab
+++ b/lang/sbcl/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2007/01/14 05:56:29 jonb Exp $
+$NetBSD: patch-ab,v 1.3 2009/08/19 13:03:30 asau Exp $
 
---- 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 @@
+--- doc/sbcl.1.orig	2009-02-17 00:36:13.000000000 +0300
++++ doc/sbcl.1	2009-05-24 10:38:55.000000000 +0400
+@@ -400,7 +400,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
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2007/01/14 05:56:29 jonb Exp $
  packager.
  
  .SH FILES
-@@ -498,7 +498,7 @@
+@@ -434,7 +434,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-ad b/lang/sbcl/patches/patch-ad
index 8aaf81e48b5..bd0ff8dbe6b 100644
--- a/lang/sbcl/patches/patch-ad
+++ b/lang/sbcl/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2007/03/06 05:40:33 jonb Exp $
+$NetBSD: patch-ad,v 1.4 2009/08/19 13:03:30 asau Exp $
 
---- ./contrib/asdf-install/installer.lisp.orig	2007-02-20 19:29:03.000000000 +0000
-+++ ./contrib/asdf-install/installer.lisp	2007-03-05 01:20:43.000000000 +0000
-@@ -263,7 +263,7 @@
+--- contrib/asdf-install/installer.lisp.orig	2008-02-27 19:56:30.000000000 +0300
++++ contrib/asdf-install/installer.lisp	2009-05-24 10:44:06.000000000 +0400
+@@ -264,7 +264,7 @@
    (progn
      "tar"
      #+darwin "gnutar"