pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
(devel/magit) +.include "../../wip/transient/buildlink3.mk"
Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By: mef
Date: Mon Dec 30 14:02:05 2024 +0900
Changeset: cbaf95adf601170b8406598a517c165795bea08f
Modified Files:
magit-git/Makefile
magit-git/distinfo
magit-git/patches/patch-default.mk
Log Message:
(devel/magit) +.include "../../wip/transient/buildlink3.mk"
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cbaf95adf601170b8406598a517c165795bea08f
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
magit-git/Makefile | 3 ++-
magit-git/distinfo | 2 +-
magit-git/patches/patch-default.mk | 12 ++++++++++--
3 files changed, 13 insertions(+), 4 deletions(-)
diffs:
diff --git a/magit-git/Makefile b/magit-git/Makefile
index e88a794421..a14fb29e0d 100644
--- a/magit-git/Makefile
+++ b/magit-git/Makefile
@@ -36,7 +36,8 @@ MAKE_JOBS_SAFE= no
#UILD_TARGET= lisp
TEST_TARGET= check
-.include "../../wip/emacs-compat/buildlink3.mk"
.include "../../wip/dash-el/buildlink3.mk"
+.include "../../wip/emacs-compat/buildlink3.mk"
+.include "../../wip/transient/buildlink3.mk"
.include "../../wip/with-editor/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/magit-git/distinfo b/magit-git/distinfo
index 0a06bedd1f..f1e26d5d22 100644
--- a/magit-git/distinfo
+++ b/magit-git/distinfo
@@ -4,4 +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) = 2a2ebceb835a1aaa2974b60ad3fba460be5939af
+SHA1 (patch-default.mk) = 26b19fb25656d1c471f347502640f76327a5a220
diff --git a/magit-git/patches/patch-default.mk b/magit-git/patches/patch-default.mk
index a11f86d8ef..8038c8a092 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 10:40:17.647071777 +0900
++++ default.mk 2024-12-30 13:59:47.275422244 +0900
@@ -34,8 +34,10 @@ BATCH = $(EMACS) -Q --batch $(EMAC
LISP_EXTRA_TARGETS ?= check-declare
@@ -35,7 +35,15 @@ $NetBSD$
SEQ_DIR ?= $(shell \
find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/seq-[.0-9]*' 2> /dev/null | \
-@@ -172,6 +176,7 @@ WITH_EDITOR_DIR ?= $(shell \
+@@ -165,6 +169,7 @@ TRANSIENT_DIR ?= $(shell \
+ ifeq "$(TRANSIENT_DIR)" ""
+ TRANSIENT_DIR = $(TOP)../transient/lisp
+ endif
++TRANSIENT_DIR = @@PREFIX@@/share/emacs/site-lisp/transient
+
+ WITH_EDITOR_DIR ?= $(shell \
+ find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/with-editor-[.0-9]*' 2> /dev/null | \
+@@ -172,6 +177,7 @@ WITH_EDITOR_DIR ?= $(shell \
ifeq "$(WITH_EDITOR_DIR)" ""
WITH_EDITOR_DIR = $(TOP)../with-editor/lisp
endif
Home |
Main Index |
Thread Index |
Old Index