lang/sbcl: Install contrib modules (again)

The module support should not have been removed.  It caused ports
dependent on sbcl to break during building.  Fix partially taken
from PR below:

PR:	198688

2 files changed, 135 insertions, 12 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 4e790fdc216..1f2182d76ea 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	sbcl
 PORTVERSION=	1.2.9
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang lisp
 MASTER_SITES=	SF/sbcl/sbcl/${PORTVERSION} LOCAL/marino:binaries
@@ -18,9 +19,11 @@ USES=		gmake tar:bzip2
 ONLY_FOR_ARCHS=	i386 amd64
 SBCL_HOME=	${PREFIX}/lib/sbcl
 MANUALS=	asdf.html sbcl.html
-MODULESDOCS=	asdf/README asdf/README.SBCL	\
+MODULESDOCS=	asdf/README 			\
+		asdf/README.SBCL		\
 		sb-aclrepl/README		\
-		sb-bsd-sockets/FAQ sb-bsd-sockets/NEWS \
+		sb-bsd-sockets/FAQ 		\
+		sb-bsd-sockets/NEWS 		\
 		sb-md5/README			\
 		sb-posix/README			\
 		sb-rotate-byte/README		\
@@ -28,6 +31,10 @@ MODULESDOCS=	asdf/README asdf/README.SBCL	\
 TEXTDOCS=	BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO
 CFLAGS+=	-fno-omit-frame-pointer
 CPPFLAGS+=	-I. -DSBCL_PREFIX=\\\"\$$(SBCL_PREFIX)\\\"
+CONMODULES=	asdf sb-aclrepl sb-bsd-sockets sb-cltl2 sb-concurrency \
+		sb-cover sb-executable sb-gmp sb-grovel sb-introspect \
+		sb-md5 sb-mpfr sb-posix sb-queue sb-rotate-byte sb-rt \
+		sb-simple-streams sb-sprof
 
 MAKE_SH_ARGS?=	--prefix=${PREFIX} \
 		--dynamic-space-size=${DYNAMIC_SPACE_SIZE} \
@@ -170,23 +177,35 @@ do-build:
 		${WRKSRC}/doc/sbcl.1
 
 do-install:
-	${MKDIR} ${STAGEDIR}${SBCL_HOME}/contrib
-	${INSTALL_PROGRAM} ${WRKSRC}/src/runtime/sbcl ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/output/sbcl_core ${STAGEDIR}${SBCL_HOME}/
-	${INSTALL_DATA} ${WRKSRC}/obj/sbcl-home/contrib/*.fasl ${STAGEDIR}${SBCL_HOME}/contrib/
-	${INSTALL_DATA} ${WRKSRC}/obj/sbcl-home/contrib/*.asd ${STAGEDIR}${SBCL_HOME}/contrib/
+	${MKDIR} ${STAGEDIR}${SBCL_HOME}/contrib \
+		${STAGEDIR}${SBCL_HOME}/site-systems
+	${INSTALL_PROGRAM} ${WRKSRC}/src/runtime/sbcl ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/output/sbcl_core ${STAGEDIR}${SBCL_HOME}
+	${INSTALL_DATA} ${WRKSRC}/obj/sbcl-home/contrib/*.fasl \
+		${STAGEDIR}${SBCL_HOME}/contrib/
+	${INSTALL_DATA} ${WRKSRC}/obj/sbcl-home/contrib/*.asd \
+		${STAGEDIR}${SBCL_HOME}/contrib/
+.for MOD in ${CONMODULES}
+	${MKDIR} ${STAGEDIR}${SBCL_HOME}/${MOD}
+	- ${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.lisp \
+		${STAGEDIR}${SBCL_HOME}/${MOD}
+	- ${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.fasl \
+		${STAGEDIR}${SBCL_HOME}/${MOD}
+	- ${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/${MOD}.asd \
+		${STAGEDIR}${SBCL_HOME}/${MOD}
+.endfor
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	${INSTALL_DATA} ${MANUALS:S,^, ${WRKSRC}/doc/manual/,g} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${MANUALS:S,^, ${WRKSRC}/doc/manual/,g} \
+		${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${TEXTDOCS:S,^,${WRKSRC}/,g} ${STAGEDIR}${DOCSDIR}/
 	${MKDIR} ${MODULESDOCS:C,/[^/]+$,,g:u:S,^,${STAGEDIR}${DOCSDIR}/,g}
 . for MODDOC in ${MODULESDOCS}
-	${INSTALL_DATA} ${WRKSRC}/contrib/${MODDOC} ${STAGEDIR}${DOCSDIR}/${MODDOC}
+	${INSTALL_DATA} ${WRKSRC}/contrib/${MODDOC} \
+		${STAGEDIR}${DOCSDIR}/${MODDOC}
 . endfor
 .endif
 	${INSTALL_MAN} ${WRKSRC}/doc/sbcl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${MKDIR} ${STAGEDIR}${SBCL_HOME}/site-systems
-	@${TOUCH} ${STAGEDIR}${SBCL_HOME}/site-systems/.keep_me
 
 check regression-test test: build
 	(cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" ${SH} run-tests.sh)
diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist
index dfee3e8a92a..0b6de23eb67 100644
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -1,4 +1,6 @@
 bin/sbcl
+lib/sbcl/asdf/asdf.lisp
+lib/sbcl/asdf/uiop.lisp
 lib/sbcl/contrib/asdf.fasl
 lib/sbcl/contrib/sb-aclrepl.asd
 lib/sbcl/contrib/sb-aclrepl.fasl
@@ -35,8 +37,109 @@ lib/sbcl/contrib/sb-simple-streams.fasl
 lib/sbcl/contrib/sb-sprof.asd
 lib/sbcl/contrib/sb-sprof.fasl
 lib/sbcl/contrib/uiop.fasl
+lib/sbcl/sb-aclrepl/debug.lisp
+lib/sbcl/sb-aclrepl/inspect.lisp
+lib/sbcl/sb-aclrepl/repl.lisp
+lib/sbcl/sb-aclrepl/sb-aclrepl.asd
+lib/sbcl/sb-aclrepl/tests.lisp
+lib/sbcl/sb-aclrepl/toplevel.lisp
+lib/sbcl/sb-bsd-sockets/constants.lisp
+lib/sbcl/sb-bsd-sockets/defpackage.lisp
+lib/sbcl/sb-bsd-sockets/inet.lisp
+lib/sbcl/sb-bsd-sockets/inet4.lisp
+lib/sbcl/sb-bsd-sockets/inet6.lisp
+lib/sbcl/sb-bsd-sockets/local.lisp
+lib/sbcl/sb-bsd-sockets/misc.lisp
+lib/sbcl/sb-bsd-sockets/name-service.lisp
+lib/sbcl/sb-bsd-sockets/protocol.lisp
+lib/sbcl/sb-bsd-sockets/sb-bsd-sockets.asd
+lib/sbcl/sb-bsd-sockets/sockets.lisp
+lib/sbcl/sb-bsd-sockets/sockopt.lisp
+lib/sbcl/sb-bsd-sockets/tests.lisp
+lib/sbcl/sb-bsd-sockets/util.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/compiler-let.lisp
+lib/sbcl/sb-cltl2/defpackage.lisp
+lib/sbcl/sb-cltl2/env.lisp
+lib/sbcl/sb-cltl2/macroexpand.lisp
+lib/sbcl/sb-cltl2/sb-cltl2.asd
+lib/sbcl/sb-cltl2/tests.lisp
+lib/sbcl/sb-concurrency/frlock.lisp
+lib/sbcl/sb-concurrency/gate.lisp
+lib/sbcl/sb-concurrency/mailbox.lisp
+lib/sbcl/sb-concurrency/package.lisp
+lib/sbcl/sb-concurrency/queue.lisp
+lib/sbcl/sb-concurrency/sb-concurrency.asd
+lib/sbcl/sb-cover/cover.lisp
+lib/sbcl/sb-cover/sb-cover.asd
+lib/sbcl/sb-cover/test-data-1.lisp
+lib/sbcl/sb-cover/test-data-2.lisp
+lib/sbcl/sb-cover/test-data-3.lisp
+lib/sbcl/sb-cover/tests.lisp
+lib/sbcl/sb-executable/sb-executable.lisp
+lib/sbcl/sb-gmp/bench.lisp
+lib/sbcl/sb-gmp/gmp.lisp
+lib/sbcl/sb-gmp/sb-gmp.asd
+lib/sbcl/sb-gmp/tests-stress.lisp
+lib/sbcl/sb-gmp/tests.lisp
+lib/sbcl/sb-grovel/def-to-lisp.lisp
+lib/sbcl/sb-grovel/defpackage.lisp
+lib/sbcl/sb-grovel/example-constants.lisp
+lib/sbcl/sb-grovel/foreign-glue.lisp
+lib/sbcl/sb-grovel/sb-grovel.asd
+lib/sbcl/sb-introspect/introspect.lisp
+lib/sbcl/sb-introspect/load-test.lisp
+lib/sbcl/sb-introspect/sb-introspect.asd
+lib/sbcl/sb-introspect/test-driver.lisp
+lib/sbcl/sb-introspect/test.lisp
+lib/sbcl/sb-introspect/xref-test-data.lisp
+lib/sbcl/sb-introspect/xref-test.lisp
+lib/sbcl/sb-md5/md5-tests.lisp
+lib/sbcl/sb-md5/md5.lisp
+lib/sbcl/sb-md5/sb-md5.asd
+lib/sbcl/sb-mpfr/mpfr.lisp
+lib/sbcl/sb-mpfr/sb-mpfr.asd
+lib/sbcl/sb-mpfr/tests.lisp
+lib/sbcl/sb-posix/constants.lisp
+lib/sbcl/sb-posix/defpackage.lisp
+lib/sbcl/sb-posix/designator.lisp
+lib/sbcl/sb-posix/interface.lisp
+lib/sbcl/sb-posix/macros.lisp
+lib/sbcl/sb-posix/posix-tests.lisp
+lib/sbcl/sb-posix/sb-posix.asd
+lib/sbcl/sb-queue/package.lisp
+lib/sbcl/sb-queue/sb-queue.asd
+lib/sbcl/sb-rotate-byte/arm-vm.lisp
+lib/sbcl/sb-rotate-byte/compiler.lisp
+lib/sbcl/sb-rotate-byte/package.lisp
+lib/sbcl/sb-rotate-byte/ppc-vm.lisp
+lib/sbcl/sb-rotate-byte/rotate-byte-tests.lisp
+lib/sbcl/sb-rotate-byte/rotate-byte.lisp
+lib/sbcl/sb-rotate-byte/sb-rotate-byte.asd
+lib/sbcl/sb-rotate-byte/x86-64-vm.lisp
+lib/sbcl/sb-rotate-byte/x86-vm.lisp
+lib/sbcl/sb-rt/rt.lisp
+lib/sbcl/sb-rt/sb-rt.asd
+lib/sbcl/sb-simple-streams/classes.lisp
+lib/sbcl/sb-simple-streams/direct.lisp
+lib/sbcl/sb-simple-streams/file.lisp
+lib/sbcl/sb-simple-streams/fndb.lisp
+lib/sbcl/sb-simple-streams/impl.lisp
+lib/sbcl/sb-simple-streams/internal.lisp
+lib/sbcl/sb-simple-streams/iodefs.lisp
+lib/sbcl/sb-simple-streams/null.lisp
+lib/sbcl/sb-simple-streams/package.lisp
+lib/sbcl/sb-simple-streams/sb-simple-streams.asd
+lib/sbcl/sb-simple-streams/simple-stream-tests.lisp
+lib/sbcl/sb-simple-streams/socket.lisp
+lib/sbcl/sb-simple-streams/strategy.lisp
+lib/sbcl/sb-simple-streams/string.lisp
+lib/sbcl/sb-simple-streams/terminal.lisp
+lib/sbcl/sb-sprof/sb-sprof.lisp
+lib/sbcl/sb-sprof/test.lisp
 lib/sbcl/sbcl_core
-lib/sbcl/site-systems/.keep_me
 man/man1/sbcl.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
@@ -56,3 +159,4 @@ man/man1/sbcl.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/sb-rotate-byte/README
 %%PORTDOCS%%%%DOCSDIR%%/sb-simple-streams/README
 %%PORTDOCS%%%%DOCSDIR%%/sbcl.html
+@dir lib/sbcl/site-systems