(devel/with-editor) +.include "../../wip/emacs-compat/buildlink3.mk"

[Makoto Fujiwara (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By:	mef
Date:		Mon Dec 30 12:29:35 2024 +0900
Changeset:	f2984bc4226b35c27fcb9287ea334c8847773dc1

Modified Files:
	with-editor/Makefile
	with-editor/distinfo
	with-editor/patches/patch-default.mk
Removed Files:
	with-editor/patches/patch-lisp_with-editor.el

Log Message:
(devel/with-editor) +.include "../../wip/emacs-compat/buildlink3.mk"

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f2984bc4226b35c27fcb9287ea334c8847773dc1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 with-editor/Makefile                          | 17 ++++++-----------
 with-editor/distinfo                          |  3 +--
 with-editor/patches/patch-default.mk          | 16 ++++++++++++----
 with-editor/patches/patch-lisp_with-editor.el | 15 ---------------
 4 files changed, 19 insertions(+), 32 deletions(-)

diffs:
diff --git a/with-editor/Makefile b/with-editor/Makefile
index 258d7f052d..66e3bbd19d 100644
--- a/with-editor/Makefile
+++ b/with-editor/Makefile
@@ -22,6 +22,11 @@ USE_LANGUAGES=	#
 USE_TOOLS+=	gmake makeinfo
 MAKE_JOBS_SAFE=	no
 
+SUBST_CLASSES+=         lisp
+SUBST_FILES.lisp=       default.mk
+SUBST_STAGE.lisp=       pre-build
+SUBST_SED.lisp=         -e s.@@PREFIX@@.${PREFIX}.
+
 .include "../../editors/emacs/modules.mk"
 
 #INFO_FILES=		yes
@@ -38,16 +43,6 @@ do-install:
 	${INSTALL_DATA} lisp/with-editor.elc          ${DESTDIR}${INSTALLATION_DIRS} ; \
 	)
 
+.include "../../wip/emacs-compat/buildlink3.mk"
 .include "../../wip/dash-el/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-
-
-# /tmp/wip/with-editor/work/with-editor-3.4.3/lisp:
-# total 288
-# drwxr-xr-x  2 makoto  wheel    240 Dec 30 04:34 .
-# drwxr-xr-x  5 makoto  wheel    576 Dec 30 04:34 ..
-# -rw-r--r--  1 makoto  wheel   1166 Dec  1 23:19 Makefile
-# -rw-r--r--  1 makoto  wheel   4137 Dec 30 04:34 with-editor-autoloads.el
-# -rw-r--r--  1 makoto  wheel  43284 Dec 30 04:34 with-editor.el
-# -rw-r--r--  1 makoto  wheel  43282 Dec  1 23:19 with-editor.el.orig
-# -rw-r--r--  1 makoto  wheel  36291 Dec 30 04:34 with-editor.elc
diff --git a/with-editor/distinfo b/with-editor/distinfo
index 5fd40ee4d0..ade0479cd6 100644
--- a/with-editor/distinfo
+++ b/with-editor/distinfo
@@ -3,6 +3,5 @@ $NetBSD$
 BLAKE2s (with-editor-3.4.3.tar.gz) = cdf2959edcf0275a24f9a670c22ad60b376a2658eacc3aa377fb54aeedaa5008
 SHA512 (with-editor-3.4.3.tar.gz) = f628617d2924ed05d901bea836c2174a88c88fa7bd5a2f4afc71e2f38d9853e5719cb74f2eeab46bab10d007ed9b74599824e16028735aa4f4be66745ae6f22a
 Size (with-editor-3.4.3.tar.gz) = 34087 bytes
-SHA1 (patch-default.mk) = 98716bceb03da0e0c71a9a1a1555a05d4f3aa93d
+SHA1 (patch-default.mk) = 7ee45a4733938f490a5229bfc184ba06dca5982e
 SHA1 (patch-docs_Makefile) = 588e442c590a139bcaacf04e958c310532788eb7
-SHA1 (patch-lisp_with-editor.el) = d79327212381e84ae06f7caade69c597e421cf2a
diff --git a/with-editor/patches/patch-default.mk b/with-editor/patches/patch-default.mk
index ee29796365..99e25ddea0 100644
--- a/with-editor/patches/patch-default.mk
+++ b/with-editor/patches/patch-default.mk
@@ -1,10 +1,18 @@
 $NetBSD$
 
 work around
-
---- default.mk.orig	2024-12-30 04:31:36.943965754 +0900
-+++ default.mk	2024-12-30 04:28:28.529903285 +0900
-@@ -26,6 +26,7 @@ ORG_LOAD_PATH  = -L ../../org/lisp
+ 
+--- default.mk.orig	2024-12-01 23:19:07.000000000 +0900
++++ default.mk	2024-12-30 12:24:32.887985629 +0900
+@@ -19,6 +19,7 @@ EMACS_ARGS ?=
+ EMACS_ARGS += --eval '(setq with-editor-emacsclient-executable nil)'
+ 
+ LOAD_PATH  ?= $(addprefix -L ../../,$(DEPS))
++LOAD_PATH  += -L  @@PREFIX@@/share/emacs/site-lisp/compat
+ LOAD_PATH  += -L .
+ 
+ ifndef ORG_LOAD_PATH
+@@ -26,6 +27,7 @@ ORG_LOAD_PATH  = -L ../../org/lisp
  endif
  
  INSTALL_INFO     ?= $(shell command -v ginstall-info || printf install-info)
diff --git a/with-editor/patches/patch-lisp_with-editor.el b/with-editor/patches/patch-lisp_with-editor.el
deleted file mode 100644
index ba56cc2429..0000000000
--- a/with-editor/patches/patch-lisp_with-editor.el
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-compat has been gone away (now built-in)
-
---- lisp/with-editor.el.orig	2024-12-01 23:19:07.000000000 +0900
-+++ lisp/with-editor.el	2024-12-29 21:21:50.844380634 +0900
-@@ -78,7 +78,7 @@
- ;;; Code:
- 
- (require 'cl-lib)
--(require 'compat)
-+;;(require 'compat)
- (require 'server)
- (require 'shell)
- (eval-when-compile (require 'subr-x))