(devel/magit) Trying to update to recent, on the way (missing with-editor)

[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:		Sun Dec 29 21:55:54 2024 +0900
Changeset:	2c6e619056b0f4fe017e29c2174bf4b47fa3c346

Modified Files:
	magit-git/Makefile
	magit-git/TODO
	magit-git/distinfo
Removed Files:
	magit-git/patches/patch-Makefile

Log Message:
(devel/magit) Trying to update to recent, on the way (missing with-editor)

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

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

diffstat:
 magit-git/Makefile               | 50 ++++++++++++++++------------------------
 magit-git/TODO                   | 15 +++++++-----
 magit-git/distinfo               |  9 ++++++--
 magit-git/patches/patch-Makefile | 26 ---------------------
 4 files changed, 36 insertions(+), 64 deletions(-)

diffs:
diff --git a/magit-git/Makefile b/magit-git/Makefile
index ab2f9a5230..eccb48498e 100644
--- a/magit-git/Makefile
+++ b/magit-git/Makefile
@@ -1,47 +1,37 @@
-# $NetBSD: Makefile,v 1.4 2014/10/08 04:20:15 makoto Exp $
+# $NetBSD$
 
-DISTNAME=	magit-1.2.0.50
+VERSION=	4.1.3
+DISTNAME=	magit-${VERSION}
 CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=magit/}
+GITHUB_TAG=	v${VERSION}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/magit/
 COMMENT=	Emacs client for scm Git
 LICENSE=	gnu-gpl-v3
 
-GIT_REPOSITORIES=	master
-GIT_REPO.master=	https://github.com/magit/magit.git
-GIT_MODULE.master=	magit
-# for "SSL certificate problem: unable to get local issuer certificate"
-GIT_ENV.master+=	GIT_SSL_NO_VERIFY=true
+# (still getting) (still getting) makeinfo: unknown option -- css-ref
+DEPENDS+=	gtexinfo-[0-9]*:../../devel/gtexinfo
+DEPENDS+=	p5-gettext-[0-9]*:../../devel/p5-gettext
+
+MAKE_ENV=	MANUAL_HTML_ARGS=
+
+SUBST_CLASSES+=		lisp
+SUBST_FILES.lisp=	default.mk
+SUBST_STAGE.lisp=	pre-build
+SUBST_SED.lisp=		-e s.@@@PREFIX@@@.${PREFIX}.
 
-WRKSRC=		${WRKDIR}/${PKGBASE}
 NO_CONFIGURE=	yes
-USE_LANGUAGES=	# none
+USE_LANGUAGES=	#
 USE_TOOLS+=	gmake makeinfo
+MAKE_JOBS_SAFE=	no
 
 .include "../../editors/emacs/modules.mk"
 
-SUBST_CLASSES+=		prefix
-SUBST_FILES.prefix=	Makefile
-SUBST_MESSAGE.prefix=	Converting /usr/local to ${PREFIX}, share/info to info, not install 50magit.el
-SUBST_STAGE.prefix=	post-patch
-SUBST_SED.prefix=	-e 's,/usr/local,${PREFIX},'
-SUBST_SED.prefix+=	-e 's,share/info,info,'
-SUBST_SED.prefix+=	-e '/50magit/s,^	install,\#	install,'
-
-SUBST_CLASSES+=			buildlink
-SUBST_MESSAGE.buildlink=	Add site-lisp in buildlink dir for byte-compile
-SUBST_FILES.buildlink=		Makefile
-SUBST_STAGE.buildlink=		post-patch
-SUBST_SED.buildlink=		-e 's,@@BUILDLINK_DIR@@,${BUILDLINK_DIR},'
-
-INFO_FILES=	yes
-BUILD_TARGET=	all
+#INFO_FILES=	yes
+#UILD_TARGET=	all
 TEST_TARGET=	check
 
-post-patch:
-	(cd ${WRKSRC}; ${GMAKE} VERSION=${PKGVERSION} magit-version.el)
-
-.include "../../wip/mk/git-package.mk"
-.include "../../wip/git-modes-git/buildlink3.mk"
+.include "../../wip/dash-el/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/magit-git/TODO b/magit-git/TODO
index a5bebe84d8..0af88cc47c 100644
--- a/magit-git/TODO
+++ b/magit-git/TODO
@@ -1,6 +1,9 @@
--- In magit-version.el, the version string is empty now,
-   and also seeing folloiwing lines while byte-compiling:
-      ===> Building for magit-1.2.0.50nb20131107
-      Cannot determine Magit's version
-      Wrote /export/WRKOBJDIR/wip/magit-git/work/magit/magit.elc
-   While it is harmless for the moment, may be better off to fix.
+Now another package with-editor is necessary (magit/with-editor at github)
+
+In toplevel form:
+git-commit.el:109:2: Error: Cannot open load file: No such file or directory, with-editor
+gmake[1]: *** [Makefile:70: git-commit.elc] Error 1
+gmake[1]: Leaving directory '/tmp/wip/magit-git/work/magit-4.1.3/lisp'
+gmake: *** [Makefile:74: lisp] Error 2
+*** Error code 2
+
diff --git a/magit-git/distinfo b/magit-git/distinfo
index 570df62637..1e017950b4 100644
--- a/magit-git/distinfo
+++ b/magit-git/distinfo
@@ -1,3 +1,8 @@
-$NetBSD: distinfo,v 1.3 2014/01/24 00:22:27 makoto Exp $
+$NetBSD$
 
-SHA1 (patch-Makefile) = c65c2a677b311bbac56f5db21bd7b239b4c725a2
+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-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
deleted file mode 100644
index c80e43d506..0000000000
--- a/magit-git/patches/patch-Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-Makefile,v 1.2 2014/01/24 00:22:27 makoto Exp $
-
-(1) convert info directory
-(2) Add ${PREFIX}/share/emacs/site-lisp for magit.el when
-    byte compile
-
---- Makefile.orig	2013-11-07 09:19:23.000000000 +0900
-+++ Makefile	2013-11-07 11:59:12.000000000 +0900
-@@ -1,7 +1,7 @@
- PREFIX  ?= /usr/local
- datarootdir ?= $(PREFIX)/share
- lispdir ?= $(datarootdir)/emacs/site-lisp/magit
--infodir ?= $(datarootdir)/info
-+infodir ?= $(PREFIX)/info
- docdir  ?= $(datarootdir)/doc/magit
- execdir ?= $(PREFIX)/bin
- 
-@@ -27,7 +27,7 @@ INSTALL_INFO ?= install-info
- 
- EFLAGS ?= -L ../git-modes -L ../cl-lib
- EMACS  ?= emacs
--BATCH   = $(EMACS) $(EFLAGS) -batch -Q -L .
-+BATCH   = $(EMACS) $(EFLAGS) -batch -Q -L . -L @@BUILDLINK_DIR@@/share/emacs/site-lisp/git-modes
- BATCHE  = $(BATCH) -eval
- BATCHC  = $(BATCH) -f batch-byte-compile
-