textproc/opensearch*: Update to 2.9.0

ChangeLog at:	https://github.com/opensearch-project/OpenSearch/releases/tag/2.9.0
		https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/release-notes/opensearch-dashboards.release-notes-2.9.0.md
With hat:	opensearch

5 files changed, 12 insertions, 54 deletions

diff --git a/textproc/opensearch-dashboards/Makefile b/textproc/opensearch-dashboards/Makefile
index 48b60be97c57..191b223b4deb 100644
--- a/textproc/opensearch-dashboards/Makefile
+++ b/textproc/opensearch-dashboards/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	opensearch-dashboards
-DISTVERSION=	2.8.0
+DISTVERSION=	2.9.0
 DISTVERSIONSUFFIX=	-linux-x64
-PORTREVISION=	1
 CATEGORIES=	textproc www
 MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
 
@@ -12,11 +11,12 @@ WWW=		https://opensearch.org
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	npm-node16>0:www/npm-node16
+BUILD_DEPENDS=	npm-node18>0:www/npm-node18
 
-USES=		nodejs:16,build,run python:build
+USES=		nodejs:18,build,run python:build
 USE_RC_SUBR=	${PORTNAME}
 
+NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	CHROME
@@ -24,45 +24,24 @@ OPTIONS_DEFINE=	CHROME
 CHROME_DESC=	Add dependency on www/chromium (required for PDF reports)
 CHROME_RUN_DEPENDS=chrome:www/chromium
 
-NODE_VER=	16.20.0
+NODE_VER=	18.16.1
 
 _DEVDIR=	${WRKDIR}/.devdir
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' -e 's|%%LOCALBASE%%|${LOCALBASE}|' -e 's|%%WRKSRC%%|${WRKSRC}|' \
-		${WRKSRC}/node_modules/re2/binding.gyp
 	@${REINPLACE_CMD} -e 's|14.20.1|${NODE_VER}|g' ${WRKSRC}/package.json
 	${RM} \
 		${WRKSRC}/bin/*.orig \
 		${WRKSRC}/bin/*.bak \
-		${WRKSRC}/node_modules/re2/binding.gyp.orig \
-		${WRKSRC}/node_modules/re2/binding.gyp.bak \
 		${WRKSRC}/package.json.bak
 	${RM} -r ${WRKSRC}/plugins/reportsDashboards/.chromium
 
-do-configure:
-	(cd ${WRKSRC}/node_modules/re2 && \
-		${SETENV} HOME=${WRKDIR} PYTHONDONTWRITEBYTECODE=1 \
-		${LOCALBASE}/lib/node_modules/npm/node_modules/.bin/node-gyp configure \
-		--python=${PYTHON_CMD} \
-		--nodedir ${LOCALBASE} \
-		--devdir=${_DEVDIR})
-
-do-build:
-	(cd ${WRKSRC}/node_modules/re2 && \
-		${SETENV} HOME=${WRKDIR} PYTHONDONTWRITEBYTECODE=1 \
-		${LOCALBASE}/lib/node_modules/npm/node_modules/.bin/node-gyp build \
-		--devdir=${_DEVDIR})
-	${RM} -r ${WRKSRC}/node_modules/re2/build/Release/.deps \
-		${WRKSRC}/node_modules/re2/build/Release/obj.target
-
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/config/opensearch_dashboards.yml ${STAGEDIR}${ETCDIR}/opensearch_dashboards.yml.sample
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} "data node_modules package.json plugins src" ${STAGEDIR}${WWWDIR} && \
 		${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR})
-	${STRIP_CMD} ${STAGEDIR}${WWWDIR}/node_modules/re2/build/Release/re2.node
 
 post-install:
 	${ECHO} "@sample ${ETCDIR}/opensearch_dashboards.yml.sample" >> ${TMPPLIST}
diff --git a/textproc/opensearch-dashboards/distinfo b/textproc/opensearch-dashboards/distinfo
index c66a9fd2433b..f3c801d2739e 100644
--- a/textproc/opensearch-dashboards/distinfo
+++ b/textproc/opensearch-dashboards/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687196391
-SHA256 (opensearch-dashboards-2.8.0-linux-x64.tar.gz) = 11a77a4ad7c574d97fbfbce619e3f285e0553ffc4a009de6a08eb3e99bc4370f
-SIZE (opensearch-dashboards-2.8.0-linux-x64.tar.gz) = 306279161
+TIMESTAMP = 1692173494
+SHA256 (opensearch-dashboards-2.9.0-linux-x64.tar.gz) = f8328b9c1156d254faa561c03cbc51159f5e335812c7b27a98bbe0556b9f030c
+SIZE (opensearch-dashboards-2.9.0-linux-x64.tar.gz) = 314585875
diff --git a/textproc/opensearch-dashboards/files/patch-node__modules_re2_binding.gyp b/textproc/opensearch-dashboards/files/patch-node__modules_re2_binding.gyp
deleted file mode 100644
index 0ab0b1f203c9..000000000000
--- a/textproc/opensearch-dashboards/files/patch-node__modules_re2_binding.gyp
+++ /dev/null
@@ -1,21 +0,0 @@
---- node_modules/re2/binding.gyp.orig	2021-07-02 23:30:56 UTC
-+++ node_modules/re2/binding.gyp
-@@ -45,7 +45,7 @@
-         "-Wno-sign-compare",
-         "-Wno-unused-parameter",
-         "-Wno-missing-field-initializers",
--        "-Wno-cast-function-type",
-+        "-Wno-bad-function-cast",
-         "-O3",
-         "-g"
-       ],
-@@ -54,7 +54,8 @@
-         "NOMINMAX"
-       ],
-       "include_dirs": [
--        "<!(node -e \"require('nan')\")",
-+        "%%WRKSRC%%/node_modules/nan",
-+        "%%LOCALBASE%%/include",
-         "vendor"
-       ],
-       "xcode_settings": {
diff --git a/textproc/opensearch/Makefile b/textproc/opensearch/Makefile
index 2157643f0ce9..54ef0c469887 100644
--- a/textproc/opensearch/Makefile
+++ b/textproc/opensearch/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	opensearch
-DISTVERSION=	2.8.0
+DISTVERSION=	2.9.0
 DISTVERSIONSUFFIX=	-linux-x64
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
diff --git a/textproc/opensearch/distinfo b/textproc/opensearch/distinfo
index 7aa5956794ea..841d72b7e893 100644
--- a/textproc/opensearch/distinfo
+++ b/textproc/opensearch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687196190
-SHA256 (opensearch-2.8.0-linux-x64.tar.gz) = eb8bd68acf9841f8cec3c79a622d67820abf43612baaa704b884973c644eca97
-SIZE (opensearch-2.8.0-linux-x64.tar.gz) = 744285401
+TIMESTAMP = 1692173654
+SHA256 (opensearch-2.9.0-linux-x64.tar.gz) = 03d623c2d99a7100c2f0faddc8ffda8ba27eae8aa63ff6f3f7dad2337be8b68c
+SIZE (opensearch-2.9.0-linux-x64.tar.gz) = 805162121