Attachment 222980 Details for Bug 254016 – SVN diff from ports' root

[patch] SVN diff from ports' root

editors_sly-asdf.patch (text/plain), 10.93 KB, created by Olivier Certner on 2021-03-04 17:45:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Certner

Created: 2021-03-04 17:45:09 UTC

Size: 10.93 KB

patch

obsolete

>Index: editors/sly-asdf/Makefile
>===================================================================
>--- editors/sly-asdf/Makefile	(nonexistent)
>+++ editors/sly-asdf/Makefile	(copie de travail)
>@@ -0,0 +1,53 @@
>+# $FreeBSD$
>+
>+PORTNAME=	sly-asdf
>+PORTVERSION=	20200306
>+CATEGORIES=	editors elisp
>+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
>+
>+MAINTAINER=	olce.freebsd.ports@certner.fr
>+COMMENT=	SLY support for ASDF
>+
>+LICENSE=	GPLv3
>+
>+MY_DEPENDS=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/sly/sly.el:editors/sly
>+BUILD_DEPENDS=	${MY_DEPENDS}
>+RUN_DEPENDS=	${MY_DEPENDS}
>+
>+USES=		emacs
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	mmgeorge
>+GH_TAGNAME=	32ce14994e8faee9321605cec36d156b02996c46
>+
>+NO_ARCH=	yes
>+
>+EMACS_COMPILE=	${EMACS_CMD} --batch --no-site-file -L ${WRKSRC} \
>+		-f batch-byte-compile
>+
>+THIS_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
>+PLIST_SUB=	THIS_LISPDIR=${THIS_LISPDIR}
>+
>+OPTIONS_DEFINE=	DOCS
>+
>+PORTDOCS=	README.md
>+
>+post-patch:
>+	cd ${WRKSRC} && rm -f *flymake*
>+
>+do-build:
>+	cd ${WRKSRC} && ${EMACS_COMPILE} sly-*.el
>+
>+do-install:
>+	@${MKDIR} ${STAGEDIR}${THIS_LISPDIR}
>+	(cd ${WRKSRC} && \
>+		${COPYTREE_SHARE} . ${STAGEDIR}${THIS_LISPDIR} \
>+		"! ( -depth 1 ( ${PORTDOCS:C/^(.*)$/-name \1 -o/} \
>+			-name LICENSE -o -name *\.md ) -o \
>+			-path \./test* -o -path \./.[^.]* -o \
>+			-name *\.orig )")
>+
>+post-install-DOCS-on:
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${PORTDOCS:%=${WRKSRC}/%} ${STAGEDIR}${DOCSDIR}
>+
>+.include <bsd.port.mk>
>
>Property changes on: editors/sly-asdf/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: editors/sly-asdf/distinfo
>===================================================================
>--- editors/sly-asdf/distinfo	(nonexistent)
>+++ editors/sly-asdf/distinfo	(copie de travail)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1614800779
>+SHA256 (mmgeorge-sly-asdf-20200306-32ce14994e8faee9321605cec36d156b02996c46_GH0.tar.gz) = 8923faee95e995363d36e34d321d1381ecfdcef34f2219cebdc1978bbdd2d1a2
>+SIZE (mmgeorge-sly-asdf-20200306-32ce14994e8faee9321605cec36d156b02996c46_GH0.tar.gz) = 42930
>
>Property changes on: editors/sly-asdf/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: editors/sly-asdf/files/patch-README.md
>===================================================================
>--- editors/sly-asdf/files/patch-README.md	(nonexistent)
>+++ editors/sly-asdf/files/patch-README.md	(copie de travail)
>@@ -0,0 +1,15 @@
>+--- README.md.orig	2020-03-06 04:33:38 UTC
>++++ README.md
>+@@ -16,8 +16,8 @@ Installing manually will require the contrib be regist
>+ ```
>+ (add-to-list 'sly-contribs 'sly-asdf 'append)
>+ ```
>++
>+ ## Experimental
>+-SLY-ASDF currently supports a very experimental system-aware checker that builds on flymake. This loads the system in a separate process and highlights any compilation/load errors for currently opened buffers. Only tested with SBCL. Enable this with 
>+-```
>+-(setq sly-asdf-enable-experimental-syntax-checking t)
>+-```
>++Upstream currently supports a very experimental system-aware checker that
>++builds on flymake. It is not available in this port (please use some ELPA
>++package instead).
>
>Property changes on: editors/sly-asdf/files/patch-README.md
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: editors/sly-asdf/files/patch-sly-asdf.el
>===================================================================
>--- editors/sly-asdf/files/patch-sly-asdf.el	(nonexistent)
>+++ editors/sly-asdf/files/patch-sly-asdf.el	(copie de travail)
>@@ -0,0 +1,92 @@
>+--- sly-asdf.el.orig	2020-03-06 04:33:38 UTC
>++++ sly-asdf.el
>+@@ -32,7 +32,6 @@
>+ (require 'sly)
>+ (require 'cl-lib)
>+ (require 'grep)
>+-(require 'sly-asdf-flymake)
>+ 
>+ (defvar sly-mrepl-shortcut-alist) ;; declared in sly-mrepl
>+ 
>+@@ -58,13 +57,23 @@
>+   (:license "GPL")
>+   (:slynk-dependencies slynk-asdf)
>+   (:on-load
>+-   (add-hook 'sly-connected-hook
>+-             ;; MG: Investigate race, due to when ASDF loads?
>+-             (lambda () (run-with-idle-timer .5 nil #'sly-asdf-flymake)))
>+    (setq sly-mrepl-shortcut-alist
>+          (append sly-mrepl-shortcut-alist sly-asdf-shortcut-alist))))
>+ 
>+ 
>++(defvar *sly-asdf-lisp-extensions* (list "lisp")
>++  "File extensions to look for when finding open Lisp files.")
>++
>++(defun sly-asdf--lisp-buffer-p (buffer)
>++  "Check whether BUFFER refers to a Lisp buffer."
>++  (member (file-name-extension (buffer-name buffer)) *sly-asdf-lisp-extensions*))
>++
>++
>++(defun sly-asdf--current-lisp-buffers ()
>++  "Traverses the current `buffer-list`, returning those buffers with a .lisp extension."
>++  (cl-remove-if-not #'sly-asdf--lisp-buffer-p (buffer-list)))
>++
>++
>+ ;;; Interactive functions
>+ 
>+ (defun sly-asdf-load-system (&optional system)
>+@@ -178,26 +187,21 @@ buffer's working directory"
>+     (isearch-forward)))
>+ 
>+ 
>+-(defun sly-asdf-query-replace-system (_name from to &optional delimited)
>+-  "Run `query-replace' on an ASDF system with NAME given FROM and TO with optional DELIMITED."
>+-  ;; MG: Underscore added to _name to suppress an unused-lexical-arg warning that fires
>+-  ;; despite the var being used in the condition-case below.
>++(defun sly-asdf-query-replace-system (name from to &optional delimited)
>++  "Query-replace in all files of an ASDF system.
>++
>++NAME is the ASDF's sytem name, FROM is the string to replace, TO
>++its replacement, and the optional DELIMITED when true restricts
>++replacements to word-delimited matches."
>+   (interactive (let ((system (sly-asdf-read-system-name)))
>+                  (cons system (sly-asdf-read-query-replace-args
>+                                "Query replace throughout `%s'" system))))
>+-  (condition-case c
>+-      ;; `tags-query-replace' actually uses `query-replace-regexp'
>+-      ;; internally.
>+-      (tags-query-replace (regexp-quote from) to delimited
>+-                          '(mapcar 'sly-from-lisp-filename
>+-                                   (sly-eval `(slynk-asdf:asdf-system-files ,_name))))
>+-    (error
>+-     ;; Kludge: `tags-query-replace' does not actually return but
>+-     ;; signals an unnamed error with the below error
>+-     ;; message. (<=23.1.2, at least.)
>+-     (unless (string-equal (error-message-string c) "All files processed")
>+-       (signal (car c) (cdr c)))        ; resignal
>+-     t)))
>++  (fileloop-initialize-replace
>++   (regexp-quote from) to 'default
>++   (mapcar #'sly-from-lisp-filename
>++           (sly-eval `(slynk-asdf:asdf-system-files ,name)))
>++   delimited)
>++  (fileloop-continue))
>+ 
>+ 
>+ (defun sly-asdf-query-replace-system-and-dependents
>+@@ -344,14 +348,10 @@ in the directory of the current buffer."
>+     (setf sly-last-compilation-result result) ;; For interactive use
>+     (when sly-highlight-compiler-notes
>+       (sly-highlight-notes notes))
>++    (when message (message message))
>+     ;; Conditionally show compilation log and other options defined in settings
>+     (run-hook-with-args 'sly-compilation-finished-hook successp notes buffer t)))
>+ 
>+-    
>+-
>+-;;;###autoload
>+-(with-eval-after-load 'sly
>+-  (add-to-list 'sly-contribs 'sly-asdf 'append))
>+ 
>+ 
>+ (provide 'sly-asdf)
>
>Property changes on: editors/sly-asdf/files/patch-sly-asdf.el
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: editors/sly-asdf/pkg-descr
>===================================================================
>--- editors/sly-asdf/pkg-descr	(nonexistent)
>+++ editors/sly-asdf/pkg-descr	(copie de travail)
>@@ -0,0 +1,4 @@
>+sly-asdf is an external contrib for SLY that enables specific support and
>+shortcuts for ASDF operations.
>+
>+WWW: https://github.com/mmgeorge/sly-asdf
>
>Property changes on: editors/sly-asdf/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: editors/sly-asdf/pkg-message
>===================================================================
>--- editors/sly-asdf/pkg-message	(nonexistent)
>+++ editors/sly-asdf/pkg-message	(copie de travail)
>@@ -0,0 +1,27 @@
>+[
>+{ type: install
>+  message: <<EOM
>+To use the sly-asdf contrib, you must:
>+1. Register sly-asdf into SLY. You just have to add this line to some init
>+   file:
>+(require 'sly-asdf)
>+   Doing this is not strictly necessary if you want to automatically activate
>+   this contrib using `sly-contribs' (see below), but it never hurts.
>+   This contrib's automatic activation at load was disabled, contrary to what
>+   upstream does.
>+2. Ensure that ASDF is loaded by your Common Lisp implementation.
>+
>+If you want sly-asdf to be automatically activated on each new SLY
>+session, put it in the `sly-contribs' list. E.g., you can add something like
>+this in some Emacs' init file:
>+(setq sly-contribs '(sly-fancy sly-asdf))
>+or customize the variable.
>+
>+To enable it on demand in already running SLY sessions instead, just use the
>+`sly-enable-contrib' command, or modify `sly-contribs' and run `sly-setup'.
>+
>+NOTE: The experimental Flymake code has been elided from this port (it requires
>+dependencies that are not in ports currently).
>+EOM
>+}
>+]
>
>Property changes on: editors/sly-asdf/pkg-message
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: editors/sly-asdf/pkg-plist
>===================================================================
>--- editors/sly-asdf/pkg-plist	(nonexistent)
>+++ editors/sly-asdf/pkg-plist	(copie de travail)
>@@ -0,0 +1,4 @@
>+%%THIS_LISPDIR%%/sly-asdf.el
>+%%THIS_LISPDIR%%/sly-asdf.elc
>+%%THIS_LISPDIR%%/slynk-asdf.asd
>+%%THIS_LISPDIR%%/slynk-asdf.lisp
>
>Property changes on: editors/sly-asdf/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 254016: 222980 | 223271