Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Aug 2023 19:14:59 GMT
From:      Ashish SHUKLA <ashish@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 5d0a2e9fe204 - main - editors/kakoune: Fix building on 13.2-STABLE
Message-ID:  <202308061914.376JEx2K008693@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by ashish:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5d0a2e9fe2049332f3a0d84e751f00db9be5c1ce

commit 5d0a2e9fe2049332f3a0d84e751f00db9be5c1ce
Author:     Ashish SHUKLA <ashish@FreeBSD.org>
AuthorDate: 2023-08-06 13:15:49 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2023-08-06 19:12:06 +0000

    editors/kakoune: Fix building on 13.2-STABLE
    
    PR:             272968
    Reported by:    Oleh Hushchenkov <o dot hushchenkov at gmail dot com>
---
 editors/kakoune/Makefile | 10 +++++++++-
 editors/kakoune/distinfo |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/editors/kakoune/Makefile b/editors/kakoune/Makefile
index c4efadb0890a..9cbffb90a4fb 100644
--- a/editors/kakoune/Makefile
+++ b/editors/kakoune/Makefile
@@ -23,6 +23,14 @@ OPTIONS_DEFINE=	DEBUG DOCS
 DEBUG_MAKE_ARGS=	debug=yes
 DEBUG_MAKE_ARGS_OFF=	debug=no
 
+.include <bsd.port.pre.mk>
+
+.if (${OSVERSION} > 1302506 && ${OSVERSION} < 1400000)
+PATCHFILES=	344d31f42b8ced12626d4f87a22ffa5a671668fd.patch
+PATCH_SITES=	https://github.com/mawww/kakoune/commit/
+PATCH_DIST_STRIP=	-p1
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/-O3/d' \
 		${WRKSRC}/Makefile
@@ -33,4 +41,4 @@ post-install:
 do-test:
 	@cd ${WRKSRC:H}/test && ${SETENV} LC_ALL=en_US.UTF-8 ./run
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/kakoune/distinfo b/editors/kakoune/distinfo
index 237cd605ebe3..31c96a83dcb0 100644
--- a/editors/kakoune/distinfo
+++ b/editors/kakoune/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1691268391
+TIMESTAMP = 1691324812
 SHA256 (kakoune-2023.08.05.tar.bz2) = 3e45151e0addd3500de2d6a29b5aacf2267c42bb256d44a782e73defb29cda5c
 SIZE (kakoune-2023.08.05.tar.bz2) = 568612
+SHA256 (344d31f42b8ced12626d4f87a22ffa5a671668fd.patch) = a0add30e525bef6d5f07d1a55a57287ccb59f54af411308e111c01d247e73842
+SIZE (344d31f42b8ced12626d4f87a22ffa5a671668fd.patch) = 3237



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308061914.376JEx2K008693>