(devel/magit) Add two patches for path adjustment

[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 06:16:57 2024 +0900
Changeset:	f3d3fa7003b0546f4faab1dbd748dfcb406759c5

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

Log Message:
(devel/magit) Add two patches for path adjustment

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

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

diffstat:
 magit-git/Makefile                 | 10 +++++++---
 magit-git/distinfo                 |  3 ++-
 magit-git/patches/patch-Makefile   | 34 ++++++++++++++++++++++++++++++++++
 magit-git/patches/patch-default.mk | 31 +++++++++++++++++++++++++++++++
 4 files changed, 74 insertions(+), 4 deletions(-)

diffs:
diff --git a/magit-git/Makefile b/magit-git/Makefile
index eccb48498e..0dfc36af29 100644
--- a/magit-git/Makefile
+++ b/magit-git/Makefile
@@ -15,12 +15,15 @@ LICENSE=	gnu-gpl-v3
 DEPENDS+=	gtexinfo-[0-9]*:../../devel/gtexinfo
 DEPENDS+=	p5-gettext-[0-9]*:../../devel/p5-gettext
 
-MAKE_ENV=	MANUAL_HTML_ARGS=
+#MAKE_ENV+=	MANUAL_HTML_ARGS=
+#MAKE_ENV+=	-DPREFIX=${PREFIX}
+#MAKE_ENV+=	-DDASH_DIR=${PREFIX}/share/emacs/site-lisp/dash
+#MAKE_ENV+=	-DINSTALL_INFO=install-info
 
 SUBST_CLASSES+=		lisp
 SUBST_FILES.lisp=	default.mk
 SUBST_STAGE.lisp=	pre-build
-SUBST_SED.lisp=		-e s.@@@PREFIX@@@.${PREFIX}.
+SUBST_SED.lisp=		-e s.@@PREFIX@@.${PREFIX}.
 
 NO_CONFIGURE=	yes
 USE_LANGUAGES=	#
@@ -30,8 +33,9 @@ MAKE_JOBS_SAFE=	no
 .include "../../editors/emacs/modules.mk"
 
 #INFO_FILES=	yes
-#UILD_TARGET=	all
+#UILD_TARGET=	lisp
 TEST_TARGET=	check
 
 .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 1e017950b4..aed45b15a0 100644
--- a/magit-git/distinfo
+++ b/magit-git/distinfo
@@ -3,6 +3,7 @@ $NetBSD$
 BLAKE2s (magit-4.1.3.tar.gz) = b9c8bab2b4002a537ac4e2efb9b737f43eafb6fa37aea4213dba502cce0f17c0
 SHA512 (magit-4.1.3.tar.gz) = 1f589b9d08e29a072d71e363c4326db341890e25e52d8c5dd75c0f9dd5bb1e663d2fc0d5c6be396dd557318725cc063b7cb0ed2acddbf9fa980c6e36a415edf3
 Size (magit-4.1.3.tar.gz) = 676146 bytes
-SHA1 (patch-default.mk) = 73b21b3f68b1cd880ac1db3a6a847980e4c09516
+SHA1 (patch-Makefile) = 81822d9a722472f1c79d1d4550f644e7796be37a
+SHA1 (patch-default.mk) = 1a5e17b74ff13431a9469fd10e01b8109b9a39c4
 SHA1 (patch-lisp_magit-base.el) = 411583a93a88c8307cd9eb12f936f71812d43daa
 SHA1 (patch-lisp_magit-section.el) = 5c129ad6ca17858b7dce8030f0b7f8b7d0086aa8
diff --git a/magit-git/patches/patch-Makefile b/magit-git/patches/patch-Makefile
new file mode 100644
index 0000000000..e054e1e6a2
--- /dev/null
+++ b/magit-git/patches/patch-Makefile
@@ -0,0 +1,34 @@
+$NetBSD$
+
+disable docs info (not effective now, sorry)
+
+--- Makefile.orig	2024-12-07 07:14:31.000000000 +0900
++++ Makefile	2024-12-30 06:06:28.996306843 +0900
+@@ -3,14 +3,14 @@ include default.mk
+ 
+ ## ###################################################################
+ 
+-.PHONY: lisp docs \
+-	install install-lisp install-docs install-info \
++.PHONY: lisp \
++	install install-lisp \
+ 	test test-interactive magit \
+ 	clean clean-lisp clean-docs clean-archives \
+ 	stats \
+ 	dist versionlib magit-$(VERSION).tar.gz
+ 
+-all: lisp docs
++all: lisp
+ 
+ help:
+ 	$(info )
+@@ -77,7 +77,8 @@ lisp:
+ redo: clean-lisp lisp
+ 
+ docs:
+-	@$(MAKE) -C docs docs
++	${NADA}
++#	@$(MAKE) -C docs docs
+ 
+ redo-docs:
+ 	@$(MAKE) -C docs redo-docs
diff --git a/magit-git/patches/patch-default.mk b/magit-git/patches/patch-default.mk
new file mode 100644
index 0000000000..dfe359c200
--- /dev/null
+++ b/magit-git/patches/patch-default.mk
@@ -0,0 +1,31 @@
+$NetBSD$
+1. makeinfo unknown option css-ref
+
+2. adjust ELPA package to pkgsrc (DASH_DIR)
+
+--- default.mk.orig	2024-12-07 07:14:31.000000000 +0900
++++ default.mk	2024-12-30 05:41:23.292302015 +0900
+@@ -36,6 +36,7 @@
+ INSTALL_INFO     ?= $(shell command -v ginstall-info || printf install-info)
+ MAKEINFO         ?= makeinfo
+ MANUAL_HTML_ARGS ?= --css-ref /assets/page.css
++MANUAL_HTML_ARGS =
+ 
+ GITSTATS      ?= gitstats
+ GITSTATS_DIR  ?= $(TOP)docs/stats
+@@ -151,6 +152,7 @@
+ ifeq "$(DASH_DIR)" ""
+   DASH_DIR = $(TOP)../dash
+ endif
++DASH_DIR = @@PREFIX@@/share/emacs/site-lisp/dash
+ 
+ SEQ_DIR ?= $(shell \
+   find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/seq-[.0-9]*' 2> /dev/null | \
+@@ -172,6 +174,7 @@
+ ifeq "$(WITH_EDITOR_DIR)" ""
+   WITH_EDITOR_DIR = $(TOP)../with-editor/lisp
+ endif
++WITH_EDITOR_DIR = @@PREFIX@@/share/emacs/site-lisp/with-editor
+ 
+ MAGIT_SECTION_DIR ?= $(shell \
+   find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/magit-section-[.0-9]*' 2> /dev/null | \