editors/slime: Update to version 2.23

Other port changes:
- use the upstream build target
- pacify portlint
- conform to the Porter's Handbook "Order of Variables" recommendations

Upstream changes: https://github.com/slime/slime/blob/master/NEWS

PR:		234977
Approved by:	joe@thrallingpenguin.com (maintainer)
Differential Revision:	https://reviews.freebsd.org/D18845

5 files changed, 201 insertions, 160 deletions

diff --git a/editors/slime/Makefile b/editors/slime/Makefile
index 97615c60fd77..51efff609e60 100644
--- a/editors/slime/Makefile
+++ b/editors/slime/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	slime
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.20
-PORTREVISION=   2
+DISTVERSION=	2.23
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
@@ -17,40 +16,24 @@ BUILD_DEPENDS=	texinfo>=5.2:print/texinfo
 
 USES=		emacs gmake
 USE_GITHUB=	yes
-NO_ARCH=	yes
-
-SLIME_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/slime
-
-SUB_FILES=	pkg-message
-SUB_LIST=	SLIME_LISPDIR="${SLIME_LISPDIR}"
 
+ALL_TARGET=	all contrib-compile doc-slime.info
 INFO=		slime
+NO_ARCH=	yes
 PORTDOCS=	CONTRIBUTING.md NEWS PROBLEMS README.md
+SUB_FILES=	pkg-message
+SUB_LIST=	SLIME_LISPDIR="${SLIME_LISPDIR}"
 
 OPTIONS_DEFINE=	DOCS
 
-do-build:
-	cd ${WRKSRC}/doc && ${MAKE_CMD} slime.info
-	cd ${WRKSRC} && ${EMACS_CMD} -batch \
-		-eval '(setq load-path (cons nil load-path))' \
-		-f batch-byte-compile *.el
+SLIME_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/slime
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${SLIME_LISPDIR}/contrib
-	@${MKDIR} ${STAGEDIR}${SLIME_LISPDIR}/contrib/test
-	@${MKDIR} ${STAGEDIR}${SLIME_LISPDIR}/lib
-	@${MKDIR} ${STAGEDIR}${SLIME_LISPDIR}/swank
-	cd ${WRKSRC} && ${INSTALL_DATA} *.asd *.el *.lisp ${STAGEDIR}${SLIME_LISPDIR}
-	cd ${WRKSRC}/lib && ${INSTALL_DATA} *.el ${STAGEDIR}${SLIME_LISPDIR}/lib
-	cd ${WRKSRC}/contrib && ${INSTALL_DATA} \
-		*.el *.lisp *.ss *.scm *.sml \
-		${STAGEDIR}${SLIME_LISPDIR}/contrib
-	cd ${WRKSRC}/contrib/test && ${INSTALL_DATA} *.txt *.el \
-		${STAGEDIR}${SLIME_LISPDIR}/contrib/test
-	cd ${WRKSRC}/swank && ${INSTALL_DATA} *.lisp \
-		${STAGEDIR}${SLIME_LISPDIR}/swank
-	${INSTALL_DATA} ${INSTALL_WRKSRC}/doc/slime.info \
-		${STAGEDIR}${PREFIX}/${INFO_PATH}
+	@${MKDIR} ${STAGEDIR}${SLIME_LISPDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${SLIME_LISPDIR} \
+		"! ( -name CONTRIBUTING.md -o -name NEWS -o -name PROBLEMS \
+		-o -name README.md -o -name Makefile -o -name doc \
+		-o -path \./doc/* )")
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/editors/slime/distinfo b/editors/slime/distinfo
index c291f425b0bc..4ff2e5d35fe0 100644
--- a/editors/slime/distinfo
+++ b/editors/slime/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516376959
-SHA256 (slime-slime-v2.20_GH0.tar.gz) = f385fcb9f4b4ffe4370b1f8ec72afaff7ebf7b17206ae061e449ee4b7cc1d420
-SIZE (slime-slime-v2.20_GH0.tar.gz) = 803127
+TIMESTAMP = 1547558591
+SHA256 (slime-slime-v2.23_GH0.tar.gz) = cc962654d08324f6552097f0f0c7fd11699285b670657ee30e9db9781dcef305
+SIZE (slime-slime-v2.23_GH0.tar.gz) = 811527
diff --git a/editors/slime/files/patch-doc-Makefile b/editors/slime/files/patch-doc-Makefile
index befd2dddc54b..e88861fe6e21 100644
--- a/editors/slime/files/patch-doc-Makefile
+++ b/editors/slime/files/patch-doc-Makefile
@@ -1,6 +1,6 @@
---- doc/Makefile.orig	2014-10-07 19:28:38.000000000 -0700
-+++ doc/Makefile	2014-10-07 19:29:45.000000000 -0700
-@@ -35,13 +35,13 @@
+--- doc/Makefile.orig	2018-12-14 22:54:16 UTC
++++ doc/Makefile
+@@ -35,13 +35,13 @@ slime.ps: slime.dvi
  	dvips -o $@ $<
  
  slime.info: $(TEXI)
diff --git a/editors/slime/files/pkg-message.in b/editors/slime/files/pkg-message.in
index 54dea1775a14..95873826dcaa 100644
--- a/editors/slime/files/pkg-message.in
+++ b/editors/slime/files/pkg-message.in
@@ -1,10 +1,10 @@
+======================================================================
+To activate SLIME, add these lines to your Emacs initialization.
 
-========================================================
-To activate SLIME put the following code into ~/.emacs:
 (setq inferior-lisp-program "PATH_TO_YOUR_LISP_BINARY")
-(add-to-list 'load-path "%%SLIME_LISPDIR%%"
-        "%%SLIME_LISPDIR%%/contrib")
+(add-to-list 'load-path
+             "%%SLIME_LISPDIR%%"
+             "%%SLIME_LISPDIR%%/contrib")
 (require 'slime)
 (slime-setup '(slime-repl))
-========================================================
-
+======================================================================
diff --git a/editors/slime/pkg-plist b/editors/slime/pkg-plist
index 38135657ebeb..21226b8649fb 100644
--- a/editors/slime/pkg-plist
+++ b/editors/slime/pkg-plist
@@ -1,123 +1,181 @@
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/.gitref
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/.travis.yml
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/bridge.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/bridge.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/inferior-slime.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/inferior-slime.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-asdf.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-asdf.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-autodoc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-autodoc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-banner.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-banner.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-c-p-c.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-c-p-c.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-cl-indent.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-cl-indent.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-clipboard.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-clipboard.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-compiler-notes-tree.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-compiler-notes-tree.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-editing-commands.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-editing-commands.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-enclosing-context.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-enclosing-context.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fancy-inspector.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fancy-inspector.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fancy-trace.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fancy-trace.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fancy.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fancy.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fontifying-fu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fontifying-fu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fuzzy.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fuzzy.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-highlight-edits.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-highlight-edits.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-hyperdoc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-hyperdoc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-indentation.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-indentation.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-listener-hooks.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-listener-hooks.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-macrostep.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-macrostep.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-mdot-fu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-mdot-fu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-media.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-media.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-mrepl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-mrepl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-package-fu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-package-fu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-parse.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-parse.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-presentation-streams.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-presentation-streams.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-presentations.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-presentations.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-quicklisp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-quicklisp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-references.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-references.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-repl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-repl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-sbcl-exts.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-sbcl-exts.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-scheme.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-scheme.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-scratch.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-scratch.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-snapshot.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-snapshot.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-sprof.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-sprof.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-trace-dialog.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-trace-dialog.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-tramp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-tramp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-typeout-frame.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-typeout-frame.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-xref-browser.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-xref-browser.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-arglists.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-asdf.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-c-p-c.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-clipboard.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-fancy-inspector.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-fuzzy.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-goo.goo
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-hyperdoc.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-ikarus.ss
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-indentation.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-jolt.k
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-kawa.scm
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-larceny.scm
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-listener-hooks.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-macrostep.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-media.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-mit-scheme.scm
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-mlworks.sml
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-mrepl.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-package-fu.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-presentation-streams.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-presentations.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-quicklisp.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-r6rs.scm
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-repl.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-sbcl-exts.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-snapshot.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-sprof.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-trace-dialog.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-util.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank.rb
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-autodoc-tests.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-autodoc-tests.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-c-p-c-tests.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-c-p-c-tests.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-cl-indent-test.txt
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-enclosing-context-tests.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-enclosing-context-tests.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-fontifying-fu-tests.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-fontifying-fu-tests.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-indentation-tests.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-indentation-tests.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-macrostep-tests.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-macrostep-tests.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-mdot-fu-tests.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-mdot-fu-tests.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-parse-tests.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-parse-tests.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-presentations-tests.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-presentations-tests.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-repl-tests.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-repl-tests.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/.nosearch
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/cl-lib.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/cl-lib.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/ert-x.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/ert-x.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/ert.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/ert.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/hyperspec.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/hyperspec.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/macrostep.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/macrostep.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/metering.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/nregex.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/packages.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/sbcl-pprint-patch.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/slime-autoloads.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/slime-tests.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/slime-tests.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/slime.el
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/slime.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/start-swank.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank-loader.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank.asd
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/abcl.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/allegro.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/backend.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/ccl.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/clasp.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/clisp.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/cmucl.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/corman.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/ecl.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/gray.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/lispworks.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/match.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/mezzano.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/mkcl.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/rpc.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/sbcl.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/scl.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/source-file-cache.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/source-path-parser.lisp
+%%EMACS_VERSION_SITE_LISPDIR%%/slime/xref.lisp
 %%PORTDOCS%%%%DOCSDIR%%/README-contrib.md
 %%PORTDOCS%%%%DOCSDIR%%/slime-refcard.pdf
 %%PORTDOCS%%%%DOCSDIR%%/slime-small.pdf
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/test/slime-autodoc-tests.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/test/slime-c-p-c-tests.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/test/slime-cl-indent-test.txt
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/test/slime-enclosing-context-tests.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/test/slime-fontifying-fu-tests.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/test/slime-indentation-tests.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/test/slime-macrostep-tests.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/test/slime-mdot-fu-tests.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/test/slime-parse-tests.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/test/slime-presentations-tests.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/test/slime-repl-tests.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/bridge.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/inferior-slime.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-asdf.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-autodoc.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-banner.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-c-p-c.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-cl-indent.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-clipboard.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-compiler-notes-tree.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-editing-commands.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-enclosing-context.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-fancy-inspector.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-fancy-trace.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-fancy.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-fontifying-fu.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-fuzzy.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-highlight-edits.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-hyperdoc.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-indentation.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-listener-hooks.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-macrostep.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-mdot-fu.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-media.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-mrepl.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-package-fu.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-parse.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-presentation-streams.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-presentations.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-quicklisp.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-references.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-repl.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-sbcl-exts.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-scheme.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-scratch.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-snapshot.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-sprof.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-trace-dialog.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-tramp.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-typeout-frame.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/slime-xref-browser.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-arglists.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-asdf.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-c-p-c.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-clipboard.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-fancy-inspector.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-fuzzy.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-hyperdoc.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-ikarus.ss
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-indentation.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-kawa.scm
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-larceny.scm
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-listener-hooks.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-macrostep.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-media.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-mit-scheme.scm
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-mlworks.sml
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-mrepl.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-package-fu.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-presentation-streams.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-presentations.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-quicklisp.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-r6rs.scm
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-repl.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-sbcl-exts.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-snapshot.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-sprof.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-trace-dialog.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-util.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/abcl.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/allegro.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/backend.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/ccl.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/clasp.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/clisp.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/cmucl.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/corman.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/ecl.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/gray.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/lispworks.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/match.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/mkcl.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/rpc.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/sbcl.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/scl.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/source-file-cache.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank/source-path-parser.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/metering.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/nregex.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/packages.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/sbcl-pprint-patch.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/slime-autoloads.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/slime.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/slime-tests.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/start-swank.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank-loader.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank.asd
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/xref.lisp
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/lib/cl-lib.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/lib/ert-x.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/lib/ert.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/lib/hyperspec.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/lib/macrostep.el
-@dir %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/test
-@dir %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib
-@dir %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/swank
-@dir %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/lib
-@dir %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime
-%%PORTDOCS%%@dir %%DOCSDIR%%