- Update to 1.0.43. [1]

- Allow memory upper bound on amd64, too. [1]
- Respect CC, *FLAGS, and toolchain-related variables. [1]
- Disable failing tests on threaded build: mailbox.interrupts-safety.1
    and get-protocol-by-name/error. [2]
- Prevent local SBCL_HOME from interfering with installation. [2]
- Delete both .bak *and* .orig files in WRKSRC. [2]
- Install supplied documentation, both for the SBCL itself and the modules.
- Provide a way to install HTML, PDF and PS versions of manuals.  Install
  PDF and HTML by defaul.
- Substitue the correct build date in sbcl.1 manual page before installing.
- Don't install empty dirs and other temporary files.
- Respect NOPORTDOCS.

PR:		ports/146623
Submitted by:	bf <bf1783@gmail.com> [1], Anonymous <swell.k@gmail.com> [2]

5 files changed, 215 insertions, 126 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 69be1fc48b51..078662822a2c 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -9,7 +9,7 @@
 #
 
 PORTNAME=	sbcl
-PORTVERSION=	1.0.34.0
+PORTVERSION=	1.0.43.0
 PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	lang lisp
@@ -29,17 +29,54 @@ ONLY_FOR_ARCHS_REASON=	is a native code compiler, and has not been ported to thi
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-CFLAGS+=	-DSBCL_HOME=\\"${PREFIX}/lib/sbcl/\\"
+CFLAGS+=	-DSBCL_HOME=\\\"${SBCL_HOME}\\\"
+CPPFLAGS+=	-I.
+SBCL_HOME=	${PREFIX}/lib/sbcl/
 
 OPTIONS=	SBCL "Use installed SBCL binary if available" off \
-		THREADS "Enable experimental threading support" off
+		THREADS "Enable experimental threading support" off \
+		PDF "Build PDF documentation" on \
+		PS "Build PostScript documentation" off
 
+#LICENSE=	BSD
+#LICENSE_FILE=	${WRKSRC}/COPYING
 MAN1=		sbcl.1
-INFO=		asdf sbcl
 INFODIR=	${PREFIX}/${INFO_PATH}
+.if !defined(NOPORTDOCS)
+INFO=	${MANUALS_SRC} sbcl-internals
+MANUALS_SRC=	asdf sbcl
+TEXTDOCS=	BUGS CREDITS COPYING NEWS PRINCIPLES STYLE TLA TODO
+MANUALS=	${MANUALS_SRC:S,$,.html,g}
+MODULESDOCS=	asdf/README asdf/README.SBCL	\
+		asdf-install/README 		\
+		sb-aclrepl/README		\
+		sb-bsd-sockets/FAQ sb-bsd-sockets/NEWS \
+		sb-md5/README			\
+		sb-posix/README			\
+		sb-rotate-byte/README		\
+		sb-simple-streams/README
+.endif
 
 OSVER_MAJOR=	${OSVERSION:C/([0-9]).*/\1/}
 NEWBOOTNAME=	${PORTNAME}-${PORTVERSION:R}-${ARCH}-freebsd${OSVER_MAJOR}
+DOC_TARGETS=	info html
+CONTRIB_MODULES=	asdf			\
+			asdf-install		\
+			sb-aclrepl		\
+			sb-bsd-sockets		\
+			sb-cltl2		\
+			sb-concurrency		\
+			sb-cover		\
+			sb-executable		\
+			sb-grovel		\
+			sb-introspect		\
+			sb-md5			\
+			sb-posix		\
+			sb-queue		\
+			sb-rotate-byte		\
+			sb-rt			\
+			sb-simple-streams	\
+			sb-sprof
 
 .if ${PORTVERSION:E} == 0
 SBCLPATCHLEVEL=	#empty
@@ -49,18 +86,38 @@ SBCLPATCHLEVEL=	-r${PORTVERSION:E}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
-# Empty dirs in distribution to keep
-EMPTY_DIRS=	sb-bsd-sockets/alien sb-posix/alien sb-posix/test-lab \
-		site-systems
+.include <bsd.port.pre.mk>
 
-DYNAMIC_SPACE_SIZE?=	512
+.if !defined(WITHOUT_PDF)
+BUILD_DEPENDS+=	texi2dvi:${PORTSDIR}/print/teTeX-base \
+		dot:${PORTSDIR}/graphics/graphviz
+DOC_TARGETS+=	pdf
+PLIST_SUB+=	PDF=""
+. if !defined(NOPORTDOCS)
+MANUALS+=	${MANUALS_SRC:S,$,.pdf,g}
+. endif
+.else
+PLIST_SUB+=	PDF="@comment "
+.endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITH_PS)
+BUILD_DEPENDS+=	dvips:${PORTSDIR}/print/dvips
+DOC_TARGETS+=	ps
+PLIST_SUB+=	PS=""
+. if !defined(NOPORTDOCS)
+MANUALS+=	${MANUALS_SRC:S,$,.ps,g}
+. endif
+.else
+PLIST_SUB+=	PS="@comment "
+.endif
 
 .if ${ARCH} == "i386"
-PLIST_SUB+=	I386_ONLY=""
+PLIST_SUB+=	I386_ONLY="" AMD64_ONLY="@comment "
+SBCLCONFIG=	 Config.x86-freebsd
+DYNAMIC_SPACE_SIZE?=	512
 .else
-PLIST_SUB+=	I386_ONLY="@comment "
+PLIST_SUB+=	I386_ONLY="@comment " AMD64_ONLY=""
+SBCLCONFIG=	Config.x86-64-freebsd
 .endif
 
 # If WITH_SBCL is defined, try to use existing "sbcl" first.
@@ -80,7 +137,7 @@ BOOT_ARCH_OS_LIST=	${ARCH}-freebsd${OSVER_MAJOR}
 .  endif
 . endif
 
-. if ${ARCH} == "i386"
+. ifdef(DYNAMIC_SPACE_SIZE)
 LISP_EXTRA_ARG=	--dynamic-space-size ${DYNAMIC_SPACE_SIZE}
 . endif
 
@@ -105,36 +162,94 @@ pre-everything::
 	@${ECHO_MSG}
 
 post-patch:
-	@${REINPLACE_CMD} -E -e 's|(CFLAGS =) .*|\1 ${CFLAGS}|' \
-		${WRKSRC}/src/runtime/GNUmakefile
-	@${FIND} ${WRKSRC} -name '*.orig' -o -name '*.bak' -delete
+	@${ECHO_CMD} "CC=${CC}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
+	@${ECHO_CMD} "CFLAGS=${CFLAGS} -fno-omit-frame-pointer" >> \
+	    ${WRKSRC}/src/runtime/${SBCLCONFIG}
+	@${ECHO_CMD} "CPPFLAGS=${CPPFLAGS}" >> \
+	    ${WRKSRC}/src/runtime/${SBCLCONFIG}
+	@${ECHO_CMD} "GREP=${GREP}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
+	@${ECHO_CMD} "LD=${LD}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
+	@${ECHO_CMD} "LINKFLAGS=${LDFLAGS} -dynamic -rdynamic" >> \
+	    ${WRKSRC}/src/runtime/${SBCLCONFIG}
+	@${REINPLACE_CMD} -E -e 's,-lthr,-pthread,g' \
+	    -e 's,-lpthread,-pthread,g' ${WRKSRC}/src/runtime/${SBCLCONFIG}
+.ifdef(NM)
+	@${ECHO_CMD} "NM=${NM} -gp" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
+.endif
+	@${REINPLACE_CMD} \
+		-e 's|/etc/sbclrc|${PREFIX}&|g' \
+		-e 's|/usr/local|${PREFIX}|g' \
+		${WRKSRC}/doc/sbcl.1 \
+		${WRKSRC}/doc/manual/*.texinfo \
+		${WRKSRC}/src/code/toplevel.lisp
+	@${REINPLACE_CMD} -e '\|CC=|s|gcc|${CC}|'  ${WRKSRC}/contrib/asdf-module.mk
+	@${REINPLACE_CMD} -e 's|"cc"|"${CC}"|' \
+		-e 's|"-O3"|"${CFLAGS}"|' \
+			${WRKSRC}/tests/swap-lispobjs.impure.lisp
+	@${REINPLACE_CMD} -e 's|cc -c|${CC} -c|' \
+		-e 's|ld \$$SO_FLAGS|${LD} \$$SO_FLAGS|' \
+			 ${WRKSRC}/tests/foreign.test.sh
+	@${FIND} ${WRKSRC} \( -name '*.orig' -o -name '*.bak' \) -delete
 .if defined(WITH_THREADS)
 	@${CP} ${FILESDIR}/customize-target-features.lisp ${WRKSRC}
 .endif
+	@${REINPLACE_CMD} -E -e 's,makeinfo,makeinfo --no-split,g' \
+		${WRKSRC}/doc/internals/Makefile
 
 do-build:
-	@(cd ${WRKSRC} && ${SETENV} INSTALL_ROOT=${PREFIX} \
+	@(cd ${WRKSRC} && ${SETENV} CC="${CC}" INSTALL_ROOT=${PREFIX} \
 		LISP_EXTRA_ARG="${LISP_EXTRA_ARG}" \
 		${SH} make.sh ${LISP_CMD})
 	@${RM} -rf ${WRKSRC}/contrib/sb-cover/test-output
+.if !defined(NOPORTDOCS)
 	@(cd ${WRKSRC}/doc/manual && ${SETENV} \
 		LISP_EXTRA_ARG="${LISP_EXTRA_ARG}" \
-		${GMAKE} MAKEINFO='makeinfo --no-split' info)
+		${GMAKE} MAKEINFO='makeinfo --no-split' ${DOC_TARGETS})
+	@(cd ${WRKSRC}/doc/internals && ${GMAKE} sbcl-internals.info)
+.endif
+.if !defined(WITHOUT_PDF)
+	@(cd ${WRKSRC}/doc/internals && ${GMAKE} sbcl-internals.pdf)
+.endif
+	@${REINPLACE_CMD} -E -e \
+		's|\$$Date\$$|'"`${SETENV} LANG=C /bin/date '+%B %d, %Y'`|g" \
+		${WRKSRC}/doc/sbcl.1
 
 do-install:
-	(cd ${WRKSRC} && ${SETENV} INSTALL_ROOT=${PREFIX} \
-		MAN_DIR=${PREFIX}/man DOC_DIR=${DOCSDIR} \
-		INFO_DIR=${INFODIR} ${SH} install.sh)
-	@${RMDIR} ${DOCSDIR}/html
-
-post-install:
-.for DIR in ${EMPTY_DIRS}
-	${MKDIR} ${PREFIX}/lib/sbcl/${DIR}/
-	@${TOUCH} ${PREFIX}/lib/sbcl/${DIR}/.keep_me
+	${MKDIR} ${SBCL_HOME}/
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}/
+.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/src/runtime/sbcl ${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/output/sbcl.core ${SBCL_HOME}/
+.for MOD in ${CONTRIB_MODULES}
+	${MKDIR} ${SBCL_HOME}/${MOD}
+	${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.fasl ${SBCL_HOME}/${MOD}/
+	${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.lisp ${SBCL_HOME}/${MOD}/
+	(if test -f ${WRKSRC}/contrib/${MOD}/${MOD}.asd; then ${INSTALL_DATA} \
+	    ${WRKSRC}/contrib/${MOD}/${MOD}.asd ${SBCL_HOME}/${MOD}/; fi)
 .endfor
+.if !defined(NOPORTDOCS)
+	${INSTALL_DATA} ${MANUALS_SRC:S,^,${WRKSRC}/doc/manual/,g:S,$,.info,g} \
+	    ${INFODIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/internals/sbcl-internals.info \
+	    ${INFODIR}/
+.if !defined(WITHOUT_PDF)
+	${INSTALL_DATA} ${WRKSRC}/doc/internals/sbcl-internals.pdf \
+	    ${DOCSDIR}/
+.endif
+	${INSTALL_DATA} ${MANUALS:S,^, ${WRKSRC}/doc/manual/,g} ${DOCSDIR}/
+	${INSTALL_DATA} ${TEXTDOCS:S,^,${WRKSRC}/,g} ${DOCSDIR}/
+	${MKDIR} ${MODULESDOCS:C,/[^/]+$,,g:u:S,^,${DOCSDIR}/,g}
+. for MODDOC in ${MODULESDOCS}
+	${INSTALL_DATA} ${WRKSRC}/contrib/${MODDOC} ${DOCSDIR}/${MODDOC}
+. endfor
+.endif
+	${INSTALL_MAN} ${WRKSRC}/doc/sbcl.1 ${MAN1PREFIX}/man/man1
+	${MKDIR} ${SBCL_HOME}/site-systems
+	@${TOUCH} ${SBCL_HOME}/site-systems/.keep_me
 
 test:	build
-	(cd ${WRKSRC}/tests && ${SH} run-tests.sh)
+	(cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" ${SH} run-tests.sh)
 
 bootstrap:
 	${CP} -r ${WRKSRC} ${WRKDIR}/${NEWBOOTNAME}
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index 7887c63f7602..3f5fb96a1b4a 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.43-source.tar.bz2) = 2b125844371881a99cfdf63c286e74cd
+SHA256 (sbcl-1.0.43-source.tar.bz2) = 98ad7abf7c3649890b52b40fedef07c1c0b3449be7ddd3fba6f2015f999c5e33
+SIZE (sbcl-1.0.43-source.tar.bz2) = 3504724
 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-disable-failing-tests b/lang/sbcl/files/patch-disable-failing-tests
new file mode 100644
index 000000000000..d1f58204aee9
--- /dev/null
+++ b/lang/sbcl/files/patch-disable-failing-tests
@@ -0,0 +1,20 @@
+--- contrib/sb-bsd-sockets/tests.lisp~
++++ contrib/sb-bsd-sockets/tests.lisp
+@@ -20,6 +20,7 @@
+   (integerp (get-protocol-by-name "udp"))
+   t)
+ 
++#-(and sb-thread freebsd)
+ (deftest get-protocol-by-name/error
+   (handler-case (get-protocol-by-name "nonexistent-protocol")
+     (unknown-protocol ()
+--- contrib/sb-concurrency/tests/test-mailbox.lisp~
++++ contrib/sb-concurrency/tests/test-mailbox.lisp
+@@ -181,6 +185,7 @@
+   (:errors   . 0)
+   (:timeouts . 0))
+ 
++#-(and sb-thread freebsd)
+ (deftest mailbox.interrupts-safety.1
+     (multiple-value-bind (received garbage errors timeouts)
+         (test-mailbox-producers-consumers
diff --git a/lang/sbcl/files/patch-install.sh b/lang/sbcl/files/patch-install.sh
deleted file mode 100644
index cbbb53b4b132..000000000000
--- a/lang/sbcl/files/patch-install.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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/pkg-plist b/lang/sbcl/pkg-plist
index b1be39e6ddb6..acb7ac40fcc4 100644
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -1,22 +1,12 @@
-%%DOCSDIR%%/BUGS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/CREDITS
-%%DOCSDIR%%/NEWS
 bin/sbcl
-lib/sbcl/asdf-install/.cvsignore
-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/test-passed
 lib/sbcl/asdf/asdf.fasl
-lib/sbcl/sb-aclrepl/.cvsignore
-lib/sbcl/sb-aclrepl/Makefile
-lib/sbcl/sb-aclrepl/README
+lib/sbcl/asdf/asdf.lisp
 lib/sbcl/sb-aclrepl/debug.fasl
 lib/sbcl/sb-aclrepl/debug.lisp
 lib/sbcl/sb-aclrepl/inspect.fasl
@@ -25,25 +15,14 @@ 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/FAQ
-lib/sbcl/sb-bsd-sockets/Makefile
-lib/sbcl/sb-bsd-sockets/NEWS
-lib/sbcl/sb-bsd-sockets/TODO
-lib/sbcl/sb-bsd-sockets/alien/.keep_me
-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/foo.c
 lib/sbcl/sb-bsd-sockets/inet.fasl
 lib/sbcl/sb-bsd-sockets/inet.lisp
 lib/sbcl/sb-bsd-sockets/local.fasl
@@ -54,21 +33,17 @@ 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/Makefile
 lib/sbcl/sb-cltl2/compiler-let.fasl
 lib/sbcl/sb-cltl2/compiler-let.lisp
 lib/sbcl/sb-cltl2/defpackage.fasl
@@ -79,28 +54,30 @@ 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-cover/.cvsignore
-lib/sbcl/sb-cover/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-cover/cover.fasl
 lib/sbcl/sb-cover/cover.lisp
 lib/sbcl/sb-cover/sb-cover.asd
 lib/sbcl/sb-cover/sb-cover.fasl
-lib/sbcl/sb-cover/sb-cover.texinfo
 lib/sbcl/sb-cover/test-data-1.fasl
 lib/sbcl/sb-cover/test-data-1.lisp
 lib/sbcl/sb-cover/test-data-2.fasl
 lib/sbcl/sb-cover/test-data-2.lisp
 lib/sbcl/sb-cover/test-data-3.fasl
 lib/sbcl/sb-cover/test-data-3.lisp
-lib/sbcl/sb-cover/test-passed
 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/Makefile
+lib/sbcl/sb-executable/sb-executable.lisp
 lib/sbcl/sb-grovel/def-to-lisp.fasl
 lib/sbcl/sb-grovel/def-to-lisp.lisp
 lib/sbcl/sb-grovel/defpackage.fasl
@@ -110,48 +87,30 @@ 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/.cvsignore
-lib/sbcl/sb-introspect/Makefile
 lib/sbcl/sb-introspect/introspect.fasl
 lib/sbcl/sb-introspect/introspect.lisp
 lib/sbcl/sb-introspect/sb-introspect.asd
 lib/sbcl/sb-introspect/sb-introspect.fasl
 lib/sbcl/sb-introspect/test-driver.fasl
 lib/sbcl/sb-introspect/test-driver.lisp
-lib/sbcl/sb-introspect/test-passed
 lib/sbcl/sb-introspect/test.fasl
 lib/sbcl/sb-introspect/test.lisp
 lib/sbcl/sb-introspect/xref-test-data.fasl
 lib/sbcl/sb-introspect/xref-test-data.lisp
 lib/sbcl/sb-introspect/xref-test.fasl
 lib/sbcl/sb-introspect/xref-test.lisp
-lib/sbcl/sb-md5/.cvsignore
-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/.cvsignore
-lib/sbcl/sb-posix/Makefile
-lib/sbcl/sb-posix/README
-lib/sbcl/sb-posix/TODO
-lib/sbcl/sb-posix/alien/.keep_me
-lib/sbcl/sb-posix/a.out
 lib/sbcl/sb-posix/constants.fasl
 lib/sbcl/sb-posix/constants.lisp
-lib/sbcl/sb-posix/constants.lisp-temp
 lib/sbcl/sb-posix/defpackage.fasl
 lib/sbcl/sb-posix/defpackage.lisp
 lib/sbcl/sb-posix/designator.fasl
 lib/sbcl/sb-posix/designator.lisp
-lib/sbcl/sb-posix/foo.c
 lib/sbcl/sb-posix/interface.fasl
 lib/sbcl/sb-posix/interface.lisp
 lib/sbcl/sb-posix/macros.fasl
@@ -160,22 +119,10 @@ lib/sbcl/sb-posix/posix-tests.fasl
 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-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/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/compiler.fasl
 lib/sbcl/sb-rotate-byte/compiler.lisp
 lib/sbcl/sb-rotate-byte/package.fasl
@@ -187,21 +134,13 @@ 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
-%%I386_ONLY%%lib/sbcl/sb-rotate-byte/x86-vm.fasl
+lib/sbcl/sb-rotate-byte/x86-64-vm.fasl
+lib/sbcl/sb-rotate-byte/x86-64-vm.lisp
 lib/sbcl/sb-rotate-byte/x86-vm.lisp
-lib/sbcl/sb-rt/.cvsignore
-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/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
@@ -222,7 +161,6 @@ 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
@@ -233,28 +171,58 @@ 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/sb-sprof/sb-sprof.lisp
 lib/sbcl/sbcl.core
 lib/sbcl/site-systems/.keep_me
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/PRINCIPLES
+%%PORTDOCS%%%%DOCSDIR%%/STYLE
+%%PORTDOCS%%%%DOCSDIR%%/TLA
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/asdf-install/README
+%%PORTDOCS%%%%DOCSDIR%%/asdf.html
+%%PDF%%%%PORTDOCS%%%%DOCSDIR%%/asdf.pdf
+%%PS%%%%PORTDOCS%%%%DOCSDIR%%/asdf.ps
+%%PORTDOCS%%%%DOCSDIR%%/asdf/README
+%%PORTDOCS%%%%DOCSDIR%%/asdf/README.SBCL
+%%PORTDOCS%%%%DOCSDIR%%/sb-aclrepl/README
+%%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/sb-md5/README
+%%PORTDOCS%%%%DOCSDIR%%/sb-posix/README
+%%PORTDOCS%%%%DOCSDIR%%/sb-rotate-byte/README
+%%PORTDOCS%%%%DOCSDIR%%/sb-simple-streams/README
+%%PDF%%%%PORTDOCS%%%%DOCSDIR%%/sbcl-internals.pdf
+%%PORTDOCS%%%%DOCSDIR%%/sbcl.html
+%%PDF%%%%PORTDOCS%%%%DOCSDIR%%/sbcl.pdf
+%%PS%%%%PORTDOCS%%%%DOCSDIR%%/sbcl.ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sb-simple-streams
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sb-rotate-byte
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sb-posix
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sb-md5
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sb-bsd-sockets
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sb-aclrepl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/asdf-install
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/asdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/sbcl/site-systems
 @dirrm lib/sbcl/sb-sprof
 @dirrm lib/sbcl/sb-simple-streams
 @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
 @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
 @dirrm lib/sbcl/sb-cltl2
-@dirrm lib/sbcl/sb-bsd-sockets/alien
 @dirrm lib/sbcl/sb-bsd-sockets
 @dirrm lib/sbcl/sb-aclrepl
 @dirrm lib/sbcl/asdf-install