textproc/kibana8: Update to 8.8.2

- Update to 8.8.2 - Regen patches Release notes: https://www.elastic.co/guide/en/kibana/8.8/release-notes-8.8.2.html
freebsd · Jul 9, 2023 · 4e184db · 4e184db
1 parent 6ab3b77
commit 4e184db
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/textproc/kibana8/Makefile b/textproc/kibana8/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	kibana
-DISTVERSION=	8.7.0
+DISTVERSION=	8.8.2
 DISTVERSIONSUFFIX=	-darwin-x86_64
-PORTREVISION=	1
 CATEGORIES=	textproc www
 MASTER_SITES=	https://artifacts.elastic.co/downloads/kibana/ \
 		http://artifacts.elastic.co/downloads/kibana/
@@ -48,7 +47,7 @@ BINS=		kibana-encryption-keys kibana-keystore kibana-plugin \
 # Set node-nan version here
 _NODE_NAN_VER=	2.17.0
 # Set node-re version here
-_NODE_RE2_VER=	1.18.0
+_NODE_RE2_VER=	1.19.1
 #######################################################################
 
 _NODECMD=	${LOCALBASE}/bin/node --version
@@ -59,11 +58,16 @@ _RE2DIR=	${WRKDIR}/node-re2-${_NODE_RE2_VER}
 # Extra patch files must be updated whenever node-re2 changes
 _RE2PATCHES=	${PATCHDIR}/extra-node-re2-binding-gyp.patch
 
+# Directory to prune
+_DIR2DEL=	node_modules packages src/plugins x-pack/packages
+
 post-patch:
-	${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete
+.for _dirdel in ${_DIR2DEL}
+	${FIND} -s ${WRKSRC}/${_dirdel} -type d -empty -delete
+.endfor
 	cd ${_RE2DIR} && ${PATCH} -p0 < ${_RE2PATCHES}
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
-	-e "s|%%DEVDIR%%|${_DEVDIR}|g" ${_RE2DIR}/binding.gyp \
+	-e "s|%%DEVDIR%%|${_DEVDIR}|g" ${_RE2DIR}/binding.gyp
 
 pre-configure:
 	( \
@@ -80,14 +84,15 @@ do-configure:
 		"! ( -name \.* -or -path *\/test\/* -or -name test )")
 	(cd ${_RE2DIR} && \
 		${SETENV} HOME=${WRKDIR} \
-		${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp configure \
+		${LOCALBASE}/lib/node_modules/npm/node_modules/.bin/node-gyp configure \
 		--python=${PYTHON_CMD} \
+		--nodedir=${LOCALBASE} \
 		--devdir=${_DEVDIR})
 
 do-build:
 	(cd ${_RE2DIR} && \
 		${SETENV} HOME=${WRKDIR} \
-		${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp build \
+		${LOCALBASE}/lib/node_modules/npm/node_modules/.bin/node-gyp build \
 		--devdir=${_DEVDIR})
 
 do-install:

diff --git a/textproc/kibana8/distinfo b/textproc/kibana8/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1682975789
-SHA256 (kibana-8.7.0-darwin-x86_64.tar.gz) = 199868855307ddb3cab0c5a27f0102754310b98146111e83954c82c7907be82a
-SIZE (kibana-8.7.0-darwin-x86_64.tar.gz) = 163476595
+TIMESTAMP = 1688336020
+SHA256 (kibana-8.8.2-darwin-x86_64.tar.gz) = 97ba437a828b9a8e427efd4c28c86d06e1dbcdd33fabf609c316eb279a205033
+SIZE (kibana-8.8.2-darwin-x86_64.tar.gz) = 191503680
 SHA256 (nodejs-nan-v2.17.0_GH0.tar.gz) = bcf5dfe59c26377b2096d903ecf6c2dbdae92528b1373a0565c40fe07537610d
 SIZE (nodejs-nan-v2.17.0_GH0.tar.gz) = 179443
-SHA256 (uhop-node-re2-1.18.0_GH0.tar.gz) = 1a756518dc35ee07318e414338afaa8186c03d5929a609c51259d978359ee6b8
-SIZE (uhop-node-re2-1.18.0_GH0.tar.gz) = 51921
+SHA256 (uhop-node-re2-1.19.1_GH0.tar.gz) = 414a77a9690b074f88803b8d680684895ce470957b2b0af2008199df20c4a244
+SIZE (uhop-node-re2-1.19.1_GH0.tar.gz) = 47211
diff --git a/textproc/kibana8/files/extra-node-re2-binding-gyp.patch b/textproc/kibana8/files/extra-node-re2-binding-gyp.patch
@@ -1,9 +1,10 @@
---- binding.gyp.orig	2021-05-10 04:34:55.000000000 +0200
-+++ binding.gyp	2021-07-05 19:22:23.670716000 +0200
-@@ -14,29 +14,6 @@
+--- binding.gyp.orig	2023-06-15 22:48:53.000000000 +0200
++++ binding.gyp	2023-07-03 08:23:44.841710000 +0200
+@@ -14,30 +14,6 @@
          "lib/to_string.cc",
          "lib/accessors.cc",
          "lib/util.cc",
+-        "vendor/re2/bitmap256.cc",
 -        "vendor/re2/bitstate.cc",
 -        "vendor/re2/compile.cc",
 -        "vendor/re2/dfa.cc",
@@ -29,8 +30,8 @@
 -        "vendor/util/strutil.cc"
        ],
        "cflags": [
-         "-std=c++14",
-@@ -45,7 +22,7 @@
+         "-std=c++2a",
+@@ -46,7 +22,7 @@
          "-Wno-sign-compare",
          "-Wno-unused-parameter",
          "-Wno-missing-field-initializers",
@@ -39,7 +40,7 @@
          "-O3",
          "-g"
        ],
-@@ -54,7 +31,8 @@
+@@ -55,7 +31,8 @@
          "NOMINMAX"
        ],
        "include_dirs": [