diff --git a/editors/sly/Makefile b/editors/sly/Makefile index d2d4c8b6aa21..d33de1e94981 100644 --- a/editors/sly/Makefile +++ b/editors/sly/Makefile @@ -1,70 +1,70 @@ PORTNAME= sly -DISTVERSION= 1.0.43 -PORTREVISION= 8 +DISTVERSION= 1.0.43-20230523 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= olce.freebsd.ports@certner.fr COMMENT= Sylvester the Cat's Common Lisp IDE for Emacs WWW= https://github.com/joaotavora/sly LICENSE= PD USES= emacs gmake USE_GITHUB= yes GH_ACCOUNT= joaotavora +GH_TAGNAME= e6bc13d9f55e3763e6daea527cb88a776c479d8e NO_ARCH= yes INFO= sly ALL_TARGET= all doc-sly.info PLIST_THIS_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/sly THIS_LISPDIR= ${PREFIX}/${PLIST_THIS_LISPDIR} PLIST_SUB+= THIS_LISPDIR=${PLIST_THIS_LISPDIR} PORTSCOUT= limit:^[0-9] OPTIONS_DEFINE= DOCS DOCS_PDF OPTIONS_DEFAULT=DOCS DOCS_PDF DOCS_PDF_DESC= Build PDF documentation (requires DOCS) ROOT_DOCS_FILES= CONTRIBUTING.md NEWS.md PROBLEMS.md README.md GENERATED_DOCS_FILES= sly.html DOCS_BUILD_DEPENDS= texinfo>=5.2:print/texinfo DOCS_PDF_IMPLIES= DOCS DOCS_PDF_USES= tex DOCS_PDF_USE= TEX=latex:build,pdftex:build,dvipsk:build .include .if !empty(PORT_OPTIONS:MDOCS_PDF) GENERATED_DOCS_FILES+= sly.pdf sly-refcard.pdf .endif ALL_TARGET+= ${GENERATED_DOCS_FILES:%=doc-%} PORTDOCS:= CONTRIBUTING.md NEWS.md PROBLEMS.md README.md \ ${GENERATED_DOCS_FILES} do-install: @${MKDIR} ${STAGEDIR}${THIS_LISPDIR} (cd ${WRKSRC} && \ ${COPYTREE_SHARE} . ${STAGEDIR}${THIS_LISPDIR} \ "! ( -depth 1 ( -name Makefile -o -name *\.md -o \ -name \.[^.]* ) -o \ -path \./doc* )") ${INSTALL_DATA} ${WRKSRC}/doc/${INFO}.info \ ${STAGEDIR}${PREFIX}/${INFO_PATH} # DOCS_PDF depends on DOCS post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${ROOT_DOCS_FILES:%=${WRKSRC}/%} \ ${GENERATED_DOCS_FILES:%=${WRKSRC}/doc/%} \ ${STAGEDIR}${DOCSDIR} .include diff --git a/editors/sly/distinfo b/editors/sly/distinfo index 668407632de4..8364d98da01a 100644 --- a/editors/sly/distinfo +++ b/editors/sly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1613556780 -SHA256 (joaotavora-sly-1.0.43_GH0.tar.gz) = 84b2d8326a429dcc621022d2ebbde7ed4813594d7445f264cb6ff5bf5f3bf9e9 -SIZE (joaotavora-sly-1.0.43_GH0.tar.gz) = 1835404 +TIMESTAMP = 1685093015 +SHA256 (joaotavora-sly-1.0.43-20230523-e6bc13d9f55e3763e6daea527cb88a776c479d8e_GH0.tar.gz) = 9dcc07863f96ff6d3b9fd8cb329d8155e111a99f56fd3576688cc87a852222b5 +SIZE (joaotavora-sly-1.0.43-20230523-e6bc13d9f55e3763e6daea527cb88a776c479d8e_GH0.tar.gz) = 1840930 diff --git a/editors/sly/files/patch-doc_Makefile b/editors/sly/files/patch-doc_Makefile index d280eeef6021..f9acd14c51d7 100644 --- a/editors/sly/files/patch-doc_Makefile +++ b/editors/sly/files/patch-doc_Makefile @@ -1,20 +1,11 @@ ---- doc/Makefile.orig 2021-01-14 09:12:56 UTC +--- doc/Makefile.orig 2023-05-23 12:54:52 UTC +++ doc/Makefile -@@ -14,7 +14,7 @@ INSTALL_CMD=install -m 644 - # Info files generated here. - infofiles=sly.info - --TEXI = sly.texi contributors.texi -+TEXI = sly.texi - - help: - @echo -e "\ @@ -38,7 +38,7 @@ sly.info: $(TEXI) makeinfo $< sly.html: $(TEXI) - texi2html --css-include=sly.css $< + makeinfo -o $@ --css-include=sly.css --html --no-split $< html/index.html: $(TEXI) makeinfo -o html --css-include=sly.css --html $< diff --git a/editors/sly/files/patch-doc_sly.texi b/editors/sly/files/patch-doc_sly.texi index 4dce84be1ce8..ba98f728b9d5 100644 --- a/editors/sly/files/patch-doc_sly.texi +++ b/editors/sly/files/patch-doc_sly.texi @@ -1,25 +1,25 @@ ---- doc/sly.texi.orig 2021-01-14 09:12:56 UTC +--- doc/sly.texi.orig 2023-05-23 12:54:52 UTC +++ doc/sly.texi -@@ -3157,17 +3157,13 @@ buffer you can enter Lisp expressions and evaluate the +@@ -3202,17 +3202,13 @@ buffer you can enter Lisp expressions and evaluate the @unnumberedsec Hackers of the good hack @SLY{} is a fork of SLIME which is itself an Extension -of @acronym{SLIM} by Eric Marsden. At the time of writing, the authors -and code-contributors of @SLY{} are: +of @acronym{SLIM} by Eric Marsden. Please consult the Git repository +for a list of authors and code-contributors of @SLY{}, as well as the +bundled code from @file{hyperspec.el}, @cite{CLOCC}, and the @cite{CMU +AI Repository}. -@include contributors.texi - -... not counting the bundled code from @file{hyperspec.el}, -@cite{CLOCC}, and the @cite{CMU AI Repository}. - Many people on the @code{sly-devel} mailing list have made non-code -contributions to @SLY{}. Life is hard though: you gotta send code to -get your name in the manual. @code{:-)} +contributions to @SLY{}. @unnumberedsec Thanks! diff --git a/editors/sly/files/patch-sly.el b/editors/sly/files/patch-sly.el index 4f9c8a3cf619..22aa9c81ed7c 100644 --- a/editors/sly/files/patch-sly.el +++ b/editors/sly/files/patch-sly.el @@ -1,46 +1,46 @@ ---- sly.el.orig 2021-01-14 09:12:56 UTC +--- sly.el.orig 2023-05-23 12:54:52 UTC +++ sly.el -@@ -7463,22 +7463,30 @@ can be found." +@@ -7475,22 +7475,30 @@ can be found." ;;;###autoload (add-hook 'lisp-mode-hook 'sly-editing-mode) -(cond - ((or (not (memq 'slime-lisp-mode-hook lisp-mode-hook)) - noninteractive - (prog1 - (y-or-n-p "[sly] SLIME detected in `lisp-mode-hook', causes keybinding conflicts. Remove it for this Emacs session?") - (warn "To restore SLIME in this session, customize `lisp-mode-hook' -and replace `sly-editing-mode' with `slime-lisp-mode-hook'."))) - (remove-hook 'lisp-mode-hook 'slime-lisp-mode-hook) +(let ((proceed-p + (if noninteractive + (lambda () t) + (let (asked resp) + (lambda () + (unless asked + (setq resp + (y-or-n-p + (eval-when-compile + (concat "[sly] SLIME detected. Try to disable it " + "for this Emacs session?"))) + asked t)) + resp))))) + (when (and (memq 'slime-lisp-mode-hook lisp-mode-hook) + (funcall proceed-p)) + (warn "To restore SLIME in this session, customize `lisp-mode-hook' and +replace `sly-editing-mode' with `slime-lisp-mode-hook'.") + (remove-hook 'lisp-mode-hook 'slime-lisp-mode-hook)) (dolist (buffer (buffer-list)) (with-current-buffer buffer (when (eq major-mode 'lisp-mode) -- (sly-editing-mode 1) -- (ignore-errors (funcall 'slime-mode -1)))))) +- (unless sly-editing-mode (sly-editing-mode 1)) +- (ignore-errors (and (featurep 'slime) (funcall 'slime-mode -1))))))) - (t - (warn - "`sly.el' loaded OK. To use SLY, customize `lisp-mode-hook' and remove `slime-lisp-mode-hook'."))) + (when (and (boundp 'slime-mode) slime-mode (funcall proceed-p)) + (ignore-errors (funcall 'slime-mode -1))) + (sly-editing-mode 1))))) (provide 'sly) diff --git a/editors/sly/pkg-plist b/editors/sly/pkg-plist index 97b7bb463672..e02ce303bd52 100644 --- a/editors/sly/pkg-plist +++ b/editors/sly/pkg-plist @@ -1,91 +1,92 @@ %%THIS_LISPDIR%%/contrib/sly-autodoc.el %%THIS_LISPDIR%%/contrib/sly-autodoc.elc %%THIS_LISPDIR%%/contrib/sly-fancy-inspector.el %%THIS_LISPDIR%%/contrib/sly-fancy-inspector.elc %%THIS_LISPDIR%%/contrib/sly-fancy-trace.el %%THIS_LISPDIR%%/contrib/sly-fancy-trace.elc %%THIS_LISPDIR%%/contrib/sly-fancy.el %%THIS_LISPDIR%%/contrib/sly-fancy.elc %%THIS_LISPDIR%%/contrib/sly-fontifying-fu.el %%THIS_LISPDIR%%/contrib/sly-fontifying-fu.elc %%THIS_LISPDIR%%/contrib/sly-indentation.el %%THIS_LISPDIR%%/contrib/sly-indentation.elc %%THIS_LISPDIR%%/contrib/sly-mrepl.el %%THIS_LISPDIR%%/contrib/sly-mrepl.elc %%THIS_LISPDIR%%/contrib/sly-package-fu.el %%THIS_LISPDIR%%/contrib/sly-package-fu.elc %%THIS_LISPDIR%%/contrib/sly-profiler.el %%THIS_LISPDIR%%/contrib/sly-profiler.elc %%THIS_LISPDIR%%/contrib/sly-retro.el %%THIS_LISPDIR%%/contrib/sly-retro.elc %%THIS_LISPDIR%%/contrib/sly-scratch.el %%THIS_LISPDIR%%/contrib/sly-scratch.elc %%THIS_LISPDIR%%/contrib/sly-stickers.el %%THIS_LISPDIR%%/contrib/sly-stickers.elc %%THIS_LISPDIR%%/contrib/sly-trace-dialog.el %%THIS_LISPDIR%%/contrib/sly-trace-dialog.elc %%THIS_LISPDIR%%/contrib/sly-tramp.el %%THIS_LISPDIR%%/contrib/sly-tramp.elc %%THIS_LISPDIR%%/contrib/slynk-arglists.lisp %%THIS_LISPDIR%%/contrib/slynk-fancy-inspector.lisp %%THIS_LISPDIR%%/contrib/slynk-indentation.lisp %%THIS_LISPDIR%%/contrib/slynk-mrepl.lisp %%THIS_LISPDIR%%/contrib/slynk-package-fu.lisp %%THIS_LISPDIR%%/contrib/slynk-profiler.lisp %%THIS_LISPDIR%%/contrib/slynk-retro.lisp %%THIS_LISPDIR%%/contrib/slynk-stickers.lisp %%THIS_LISPDIR%%/contrib/slynk-trace-dialog.lisp %%THIS_LISPDIR%%/contrib/sylvesters.txt %%THIS_LISPDIR%%/lib/.nosearch %%THIS_LISPDIR%%/lib/hyperspec.el %%THIS_LISPDIR%%/lib/hyperspec.elc %%THIS_LISPDIR%%/lib/sly-buttons.el %%THIS_LISPDIR%%/lib/sly-buttons.elc %%THIS_LISPDIR%%/lib/sly-cl-indent.el %%THIS_LISPDIR%%/lib/sly-cl-indent.elc %%THIS_LISPDIR%%/lib/sly-common.el %%THIS_LISPDIR%%/lib/sly-common.elc %%THIS_LISPDIR%%/lib/sly-completion.el %%THIS_LISPDIR%%/lib/sly-completion.elc %%THIS_LISPDIR%%/lib/sly-messages.el %%THIS_LISPDIR%%/lib/sly-messages.elc %%THIS_LISPDIR%%/lib/sly-parse.el %%THIS_LISPDIR%%/lib/sly-parse.elc %%THIS_LISPDIR%%/lib/sly-tests.el %%THIS_LISPDIR%%/lib/sly-tests.elc %%THIS_LISPDIR%%/sly-autoloads.el %%THIS_LISPDIR%%/sly.el %%THIS_LISPDIR%%/sly.elc %%THIS_LISPDIR%%/slynk/backend/abcl.lisp %%THIS_LISPDIR%%/slynk/backend/allegro.lisp %%THIS_LISPDIR%%/slynk/backend/ccl.lisp %%THIS_LISPDIR%%/slynk/backend/clasp.lisp %%THIS_LISPDIR%%/slynk/backend/clisp.lisp %%THIS_LISPDIR%%/slynk/backend/cmucl.lisp %%THIS_LISPDIR%%/slynk/backend/corman.lisp %%THIS_LISPDIR%%/slynk/backend/ecl.lisp %%THIS_LISPDIR%%/slynk/backend/lispworks.lisp %%THIS_LISPDIR%%/slynk/backend/mkcl.lisp %%THIS_LISPDIR%%/slynk/backend/sbcl.lisp %%THIS_LISPDIR%%/slynk/backend/scl.lisp %%THIS_LISPDIR%%/slynk/metering.lisp %%THIS_LISPDIR%%/slynk/slynk-apropos.lisp %%THIS_LISPDIR%%/slynk/slynk-backend.lisp %%THIS_LISPDIR%%/slynk/slynk-completion.lisp %%THIS_LISPDIR%%/slynk/slynk-gray.lisp %%THIS_LISPDIR%%/slynk/slynk-loader.lisp %%THIS_LISPDIR%%/slynk/slynk-match.lisp %%THIS_LISPDIR%%/slynk/slynk-rpc.lisp %%THIS_LISPDIR%%/slynk/slynk-source-file-cache.lisp %%THIS_LISPDIR%%/slynk/slynk-source-path-parser.lisp %%THIS_LISPDIR%%/slynk/slynk.asd %%THIS_LISPDIR%%/slynk/slynk.lisp %%THIS_LISPDIR%%/slynk/start-slynk.lisp %%THIS_LISPDIR%%/slynk/xref.lisp %%THIS_LISPDIR%%/test/sly-autodoc-tests.el %%THIS_LISPDIR%%/test/sly-cl-indent-test.txt %%THIS_LISPDIR%%/test/sly-fontifying-fu-tests.el %%THIS_LISPDIR%%/test/sly-indentation-tests.el %%THIS_LISPDIR%%/test/sly-mrepl-tests.el +%%THIS_LISPDIR%%/test/sly-package-fu-tests.el %%THIS_LISPDIR%%/test/sly-parse-tests.el %%THIS_LISPDIR%%/test/sly-stickers-tests.el