(devel/magit) +.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 10:47:03 2024 +0900
Changeset:	8643592f74e62a989950f8dd5706329e412499fc

Modified Files:
	magit-git/Makefile
	magit-git/distinfo
	magit-git/patches/patch-default.mk

Log Message:
(devel/magit) +.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=8643592f74e62a989950f8dd5706329e412499fc

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

diffstat:
 magit-git/Makefile                 |  1 +
 magit-git/distinfo                 |  4 +---
 magit-git/patches/patch-default.mk | 14 +++++++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diffs:
diff --git a/magit-git/Makefile b/magit-git/Makefile
index 0dfc36af29..e88a794421 100644
--- a/magit-git/Makefile
+++ b/magit-git/Makefile
@@ -36,6 +36,7 @@ MAKE_JOBS_SAFE=	no
 #UILD_TARGET=	lisp
 TEST_TARGET=	check
 
+.include "../../wip/emacs-compat/buildlink3.mk"
 .include "../../wip/dash-el/buildlink3.mk"
 .include "../../wip/with-editor/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/magit-git/distinfo b/magit-git/distinfo
index 77dcc649f4..0a06bedd1f 100644
--- a/magit-git/distinfo
+++ b/magit-git/distinfo
@@ -4,6 +4,4 @@ BLAKE2s (magit-4.1.3.tar.gz) = b9c8bab2b4002a537ac4e2efb9b737f43eafb6fa37aea4213
 SHA512 (magit-4.1.3.tar.gz) = 1f589b9d08e29a072d71e363c4326db341890e25e52d8c5dd75c0f9dd5bb1e663d2fc0d5c6be396dd557318725cc063b7cb0ed2acddbf9fa980c6e36a415edf3
 Size (magit-4.1.3.tar.gz) = 676146 bytes
 SHA1 (patch-Makefile) = f5ca5309c2f62fa731dc40316622d8b7b13591ae
-SHA1 (patch-default.mk) = 06d1402efeb29898279fc8039044c50d3f325442
-SHA1 (patch-lisp_magit-base.el) = 411583a93a88c8307cd9eb12f936f71812d43daa
-SHA1 (patch-lisp_magit-section.el) = 5c129ad6ca17858b7dce8030f0b7f8b7d0086aa8
+SHA1 (patch-default.mk) = 2a2ebceb835a1aaa2974b60ad3fba460be5939af
diff --git a/magit-git/patches/patch-default.mk b/magit-git/patches/patch-default.mk
index e0b4afeecf..a11f86d8ef 100644
--- a/magit-git/patches/patch-default.mk
+++ b/magit-git/patches/patch-default.mk
@@ -7,7 +7,7 @@ $NetBSD$
 3. set INSTALL_INFO
 
 --- default.mk.orig	2024-12-07 07:14:31.000000000 +0900
-+++ default.mk	2024-12-30 06:30:25.917649857 +0900
++++ default.mk	2024-12-30 10:40:17.647071777 +0900
 @@ -34,8 +34,10 @@ BATCH       = $(EMACS) -Q --batch $(EMAC
  LISP_EXTRA_TARGETS ?= check-declare
  
@@ -19,7 +19,15 @@ $NetBSD$
  
  GITSTATS      ?= gitstats
  GITSTATS_DIR  ?= $(TOP)docs/stats
-@@ -151,6 +153,7 @@ DASH_DIR ?= $(shell \
+@@ -144,6 +146,7 @@ COMPAT_DIR ?= $(shell \
+ ifeq "$(COMPAT_DIR)" ""
+   COMPAT_DIR = $(TOP)../compat
+ endif
++COMPAT_DIR = @@PREFIX@@/share/emacs/site-lisp/compat
+ 
+ DASH_DIR ?= $(shell \
+   find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/dash-[.0-9]*' 2> /dev/null | \
+@@ -151,6 +154,7 @@ DASH_DIR ?= $(shell \
  ifeq "$(DASH_DIR)" ""
    DASH_DIR = $(TOP)../dash
  endif
@@ -27,7 +35,7 @@ $NetBSD$
  
  SEQ_DIR ?= $(shell \
    find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/seq-[.0-9]*' 2> /dev/null | \
-@@ -172,6 +175,7 @@ WITH_EDITOR_DIR ?= $(shell \
+@@ -172,6 +176,7 @@ WITH_EDITOR_DIR ?= $(shell \
  ifeq "$(WITH_EDITOR_DIR)" ""
    WITH_EDITOR_DIR = $(TOP)../with-editor/lisp
  endif