diff --git a/editors/sly/Makefile b/editors/sly/Makefile index 01b7ac36fd54..1ff0803048b8 100644 --- a/editors/sly/Makefile +++ b/editors/sly/Makefile @@ -1,71 +1,70 @@ PORTNAME= sly -DISTVERSION= 1.0.43-20230624 -PORTREVISION= 4 +DISTVERSION= 1.0.43-20240809 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= df62abae73bd511885c9c7ec0ea7ea1469a00923 +GH_TAGNAME= 742355f7554ab6c46e5c1c9bdb89068f55359eaa 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 04049fb2af66..b1da6a4f0fc2 100644 --- a/editors/sly/distinfo +++ b/editors/sly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692890116 -SHA256 (joaotavora-sly-1.0.43-20230624-df62abae73bd511885c9c7ec0ea7ea1469a00923_GH0.tar.gz) = 9e961e06cd80bfa9a993446e30da8b378ba92b3d69e52d56c3ac2e18115a0889 -SIZE (joaotavora-sly-1.0.43-20230624-df62abae73bd511885c9c7ec0ea7ea1469a00923_GH0.tar.gz) = 1840949 +TIMESTAMP = 1736445917 +SHA256 (joaotavora-sly-1.0.43-20240809-742355f7554ab6c46e5c1c9bdb89068f55359eaa_GH0.tar.gz) = ffa627a3f4740372e88990113a2af8178f7bce0771f36b35896f8018b34b6e5f +SIZE (joaotavora-sly-1.0.43-20240809-742355f7554ab6c46e5c1c9bdb89068f55359eaa_GH0.tar.gz) = 1841274 diff --git a/editors/sly/files/patch-sly.el b/editors/sly/files/patch-sly.el index 22aa9c81ed7c..cd96a7e4bb54 100644 --- a/editors/sly/files/patch-sly.el +++ b/editors/sly/files/patch-sly.el @@ -1,46 +1,53 @@ ---- sly.el.orig 2023-05-23 12:54:52 UTC +--- sly.el.orig 2024-08-09 21:19:04 UTC +++ sly.el -@@ -7475,22 +7475,30 @@ can be found." - ;;;###autoload - (add-hook 'lisp-mode-hook 'sly-editing-mode) +@@ -7487,24 +7487,35 @@ other non-nil value to unconditionally replace SLIME." + (const :tag "Do not replace SLIME" nil) + (const :tag "Do replace SLIME" t))) -(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?") +- (if (eq sly-replace-slime 'ask) +- (y-or-n-p "[sly] SLIME detected in `lisp-mode-hook', causes keybinding conflicts. Remove it for this Emacs session?") +- sly-replace-slime) - (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) ++ (lambda () ++ (if (eq sly-replace-slime 'ask) ++ t ++ sly-replace-slime)) + (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?"))) ++ (if (eq sly-replace-slime 'ask) ++ (y-or-n-p ++ (eval-when-compile ++ (concat "[sly] SLIME detected. Try to disable it " ++ "for this Emacs session?"))) ++ sly-replace-slime) + 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) - (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)