3 files changed, 36 insertions, 118 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index b26dd110c8dd..65d28f0dda29 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sbcl
-PORTVERSION=	0.8.10
+PORTVERSION=	0.8.11
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sbcl
@@ -34,7 +34,7 @@ USE_GMAKE=	yes
 # Can currently only bootstrap using cmucl, which is i386-only
 ONLY_FOR_ARCHS=	i386
 
-MAN1=		sbcl.1 sbcl-asdf-install.1
+MAN1=		sbcl.1
 
 post-extract:
 	(${FIND} ${WRKSRC} -type d -name CVS -print0 | ${XARGS} -0 ${RM} -rf)
@@ -44,13 +44,11 @@ do-build:
 
 do-install:
 	(cd ${WRKSRC} && ${SETENV} INSTALL_ROOT=${PREFIX} \
-	    MAN_DIR=${PREFIX}/man ${SH} install.sh)
-	${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} BUGS COPYING CREDITS ${DOCSDIR})
+	    MAN_DIR=${PREFIX}/man DOC_DIR=${DOCSDIR} \
+	    INFO_DIR=${DOCSDIR}/info ${SH} install.sh)
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/manual
-	(cd ${WRKSRC}/doc/manual/sbcl && ${FIND} . -print | \
-	    ${CPIO} -pdmu -R${DOCOWN}:${DOCGRP} ${DOCSDIR}/manual)
+	(cd ${WRKSRC}/doc/html && ${FIND} . -print | \
+	    ${CPIO} -pdmu -R${DOCOWN}:${DOCGRP} ${DOCSDIR}/html)
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index cd683d217b24..b342ced60559 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,4 +1,4 @@
-MD5 (sbcl-0.8.10-source.tar.bz2) = e42f384cbbadcf626342d4048889061b
-SIZE (sbcl-0.8.10-source.tar.bz2) = 2109999
-MD5 (sbcl-0.8.10-html.tar.bz2) = 2648661efbd7d4516e56a53f4e0c3a6d
-SIZE (sbcl-0.8.10-html.tar.bz2) = 63094
+MD5 (sbcl-0.8.11-source.tar.bz2) = 2fcf2ff8703249af465a05158911b65e
+SIZE (sbcl-0.8.11-source.tar.bz2) = 2128159
+MD5 (sbcl-0.8.11-html.tar.bz2) = 767a6969e060ce473c814be6aee40f64
+SIZE (sbcl-0.8.11-html.tar.bz2) = 47433
diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist
index b7635afebe2f..de3af0546885 100644
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -1,108 +1,29 @@
 %%DOCSDIR%%/BUGS
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/manual/Accessing-Foreign-Values.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Beyond-The-ANSI-Standard.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Calling-Lisp-From-C.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Coercing-Foreign-Values.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Colophon.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Compiler-Policy.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Concept-Index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Contributed-Modules.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Controlling-Printing-in-the-Debugger.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Customization-Hooks-for-Users.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Debug-Tail-Recursion.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Debugger-Policy-Control.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Defining-Foreign-Types.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Dynamic-extent-allocation.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Efficiency-Hacks.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Efficiency.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Error-Messages.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Error-Severity.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Errors-During-Macroexpansion.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Exiting-Commands.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Extensions.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/External-Foreign-Variables.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Foreign-Data-Structure-Examples.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Foreign-Dynamic-Allocation.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Foreign-Function-Calls.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Foreign-Type-Specifiers.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Foreign-Types-and-Lisp-Types.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Foreign-Types.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Foreign-Variables.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Function-Index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Function-Names.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Function-Tracing.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Funny-Frames.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Getting-Existing-Programs-to-Run.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Handling-of-Types.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/How-Arguments-are-Printed.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/How-the-Source-is-Found.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Idiosyncrasies.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Implementation-Limitations.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Information-Commands.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Interface-To-Low-Level-SBCL-Implementation.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Introduction-to-the-Foreign-Function-Interface.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Loading-Unix-Object-Files.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Local-Foreign-Variables.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Modular-arithmetic.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/More-Common-Lisp-Information.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/More-SBCL-Information.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Non-Conformance-With-The-ANSI-Standard.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Note-On-Lexical-Variable-Access.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Open-Coding-and-Inline-Expansion.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Operations-On-Foreign-Values.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Overview.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Precise-Type-Checking.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Read-Errors.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Source-Location-Availability.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Source-Location-Printing.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Stack-Frames.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Stack-Motion.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Stale-Extensions.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Starting-the-Debugger.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Step-By-Step-Example-of-the-Foreign-Function-Interface.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Support-For-Unix.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/The-Compiler.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/The-Debugger-Command-Loop.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/The-Debugger.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/The-Foreign-Function-Interface.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/The-Original-and-Actual-Source.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/The-Parts-of-the-Error-Message.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/The-alien-funcall-Primitive.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/The-define-alien-routine-Macro.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Things-Which-Might-Be-In-The-Next-ANSI-Standard.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Threading.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Tools-To-Help-Developers.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Type-Errors-at-Compile-Time.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Unknown-Locations-and-Interrupts.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Variable-Access.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Variable-Index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Variable-Value-Availability.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/Weakened-Type-Checking.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/define-alien-routine-Example.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fun-common-lisp-require.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fun-sb-ext-posix-getenv.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fun-sb-ext-purify.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fun-sb-ext-quit.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fun-sb-ext-save-lisp-and-die.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fun-sb-md5-md5sum-file.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fun-sb-md5-md5sum-sequence.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fun-sb-md5-md5sum-stream.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fun-sb-rotate-byte-rotate-byte.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/macro-common-lisp-trace.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/macro-common-lisp-untrace.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/sb-aclrepl.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/sb-md5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/sb-rotate-byte.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/special-operator-sb-ext-truly-the.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/var-sb-debug-star-max-trace-indentation-star.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/var-sb-debug-star-trace-encapsulate-default-star.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/var-sb-debug-star-trace-indentation-step-star.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/var-sb-debug-star-trace-values-star.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/var-sb-ext-star-module-provider-functions-star.html
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/SUPPORT
+%%PORTDOCS%%%%DOCSDIR%%/html/beyond-ansi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/colophon.html
+%%PORTDOCS%%%%DOCSDIR%%/html/compiler-policy.html
+%%PORTDOCS%%%%DOCSDIR%%/html/compiler-types.html
+%%PORTDOCS%%%%DOCSDIR%%/html/compiler.html
+%%PORTDOCS%%%%DOCSDIR%%/html/efficiency.html
+%%PORTDOCS%%%%DOCSDIR%%/html/extensions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ffi-example.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ffi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/foreign-data-structure.html
+%%PORTDOCS%%%%DOCSDIR%%/html/foreign-function-calls.html
+%%PORTDOCS%%%%DOCSDIR%%/html/foreign-types.html
+%%PORTDOCS%%%%DOCSDIR%%/html/foreign-values.html
+%%PORTDOCS%%%%DOCSDIR%%/html/foreign-variables.html
+%%PORTDOCS%%%%DOCSDIR%%/html/idiosyncrasies.html
+%%PORTDOCS%%%%DOCSDIR%%/html/implementation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/load-object.html
+%%PORTDOCS%%%%DOCSDIR%%/html/open-coding.html
+%%PORTDOCS%%%%DOCSDIR%%/html/where-more.html
 bin/sbcl
 lib/sbcl/asdf-install/.cvsignore
 lib/sbcl/asdf-install/Makefile
@@ -192,9 +113,6 @@ lib/sbcl/sb-cltl2/tests.lisp
 lib/sbcl/sb-executable/sb-executable.fasl
 lib/sbcl/sb-grovel/.cvsignore
 lib/sbcl/sb-grovel/Makefile
-lib/sbcl/sb-grovel/README
-lib/sbcl/sb-grovel/array-data.fasl
-lib/sbcl/sb-grovel/array-data.lisp
 lib/sbcl/sb-grovel/def-to-lisp.fasl
 lib/sbcl/sb-grovel/def-to-lisp.lisp
 lib/sbcl/sb-grovel/defpackage.fasl
@@ -204,6 +122,7 @@ 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
@@ -314,7 +233,8 @@ 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
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
+@dirrm %%DOCSDIR%%/info
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 @dirrm %%DOCSDIR%%
 @dirrm lib/sbcl/systems
 @dirrm lib/sbcl/site-systems