3 files changed, 47 insertions, 8 deletions

diff --git a/editors/slime/Makefile b/editors/slime/Makefile
index c78539d5dd0c..f24c9eae302e 100644
--- a/editors/slime/Makefile
+++ b/editors/slime/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	slime
-PORTVERSION=	2.11
+PORTVERSION=	2.12
 CATEGORIES=	editors elisp
 MASTER_SITES=	https://codeload.github.com/slime/slime/legacy.tar.gz/v${PORTVERSION}?dummy=/
 
@@ -20,7 +20,7 @@ USES=		gmake
 USE_EMACS=	yes
 
 SLIME_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/slime
-WRKSRC=		${WRKDIR}/slime-slime-d7ae5d3
+WRKSRC=		${WRKDIR}/slime-slime-69e6eb2
 
 SUB_FILES=	pkg-message
 SUB_LIST=	SLIME_LISPDIR="${SLIME_LISPDIR}"
@@ -37,12 +37,18 @@ do-build:
 		-f batch-byte-compile *.el
 
 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} *.elc *.el *.lisp ${STAGEDIR}${SLIME_LISPDIR}
 	cd ${WRKSRC}/lib && ${INSTALL_DATA} *.el ${STAGEDIR}${SLIME_LISPDIR}/lib
-	cd ${WRKSRC}/contrib && ${INSTALL_DATA} *.el *.lisp \
+	cd ${WRKSRC}/contrib && ${INSTALL_DATA} \
+		*.el *.lisp *.scm *.sml *.ss \
 		${STAGEDIR}${SLIME_LISPDIR}/contrib
+	cd ${WRKSRC}/contrib/test && ${INSTALL_DATA} *.el *.txt \
+		${STAGEDIR}${SLIME_LISPDIR}/contrib/test
+	cd ${WRKSRC}/swank && ${INSTALL_DATA} *.lisp \
+		${STAGEDIR}${SLIME_LISPDIR}/swank
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${SLIME_LISPDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
diff --git a/editors/slime/distinfo b/editors/slime/distinfo
index 97af65656bb5..42845ea49538 100644
--- a/editors/slime/distinfo
+++ b/editors/slime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (slime-2.11.tar.gz) = 1109b13836e00c143c40de13ca16e7dac92c8018615b32523c8e1b876265380e
-SIZE (slime-2.11.tar.gz) = 1054603
+SHA256 (slime-2.12.tar.gz) = 0bf54258df9768a3085c09f6b27da13587bfbf6d8e5f09854142329c7a6bd199
+SIZE (slime-2.12.tar.gz) = 1057378
diff --git a/editors/slime/pkg-plist b/editors/slime/pkg-plist
index 8d4d98385052..02da7292ffbe 100644
--- a/editors/slime/pkg-plist
+++ b/editors/slime/pkg-plist
@@ -36,6 +36,7 @@
 %%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
@@ -46,21 +47,53 @@
 %%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-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-motd.lisp
 %%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-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/slime-trace-dialog.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-repl.lisp
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/slime/contrib/swank-util.lisp
+%%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-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/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/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/sbcl-pprint-patch.lisp