git: 89b8dcd9b008 - main - textproc/opensearch-dashboards: Update to 2.0.0

From: Romain Tartière <romain_at_FreeBSD.org>
Date: Tue, 31 May 2022 04:28:33 UTC
The branch main has been updated by romain:

URL: https://cgit.FreeBSD.org/ports/commit/?id=89b8dcd9b00814ce55e335e4cd575c70d6e322e5

commit 89b8dcd9b00814ce55e335e4cd575c70d6e322e5
Author:     Romain Tartière <romain@FreeBSD.org>
AuthorDate: 2022-05-31 04:12:48 +0000
Commit:     Romain Tartière <romain@FreeBSD.org>
CommitDate: 2022-05-31 04:27:35 +0000

    textproc/opensearch-dashboards: Update to 2.0.0
    
    Announcement:
    https://opensearch.org/blog/releases/2022/05/opensearch-2-0-is-now-available/
    
    Release notes:
    https://github.com/opensearch-project/opensearch-build/blob/main/release-notes/opensearch-release-notes-2.0.0.md
    
    With hat:       opensearch
---
 textproc/opensearch-dashboards/Makefile            |  6 +++---
 textproc/opensearch-dashboards/distinfo            |  6 +++---
 textproc/opensearch/files/patch-bin_opensearch-env | 17 -----------------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/textproc/opensearch-dashboards/Makefile b/textproc/opensearch-dashboards/Makefile
index c1e79b28273d..3728c93683e2 100644
--- a/textproc/opensearch-dashboards/Makefile
+++ b/textproc/opensearch-dashboards/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	opensearch-dashboards
-DISTVERSION=	1.3.0
+DISTVERSION=	2.0.0
 DISTVERSIONSUFFIX=	-linux-x64
 CATEGORIES=	textproc www
 MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
@@ -42,7 +42,7 @@ post-patch:
 
 do-configure:
 	(cd ${WRKSRC}/node_modules/re2 && \
-		${SETENV} HOME=${WRKDIR} \
+		${SETENV} HOME=${WRKDIR} PYTHONDONTWRITEBYTECODE=1 \
 		${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp configure \
 		--python=${PYTHON_CMD} \
 		--nodedir ${LOCALBASE} \
@@ -50,7 +50,7 @@ do-configure:
 
 do-build:
 	(cd ${WRKSRC}/node_modules/re2 && \
-		${SETENV} HOME=${WRKDIR} \
+		${SETENV} HOME=${WRKDIR} PYTHONDONTWRITEBYTECODE=1 \
 		${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp build \
 		--devdir=${_DEVDIR})
 	${RM} -r ${WRKSRC}/node_modules/re2/build/Release/.deps \
diff --git a/textproc/opensearch-dashboards/distinfo b/textproc/opensearch-dashboards/distinfo
index 00a4f2b16ebc..7752662b83bd 100644
--- a/textproc/opensearch-dashboards/distinfo
+++ b/textproc/opensearch-dashboards/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1647637494
-SHA256 (opensearch-dashboards-1.3.0-linux-x64.tar.gz) = b73e7862fe560125a96a82b91098cab1702d8519f61a301cd3cd936a6b51328e
-SIZE (opensearch-dashboards-1.3.0-linux-x64.tar.gz) = 208745115
+TIMESTAMP = 1653931629
+SHA256 (opensearch-dashboards-2.0.0-linux-x64.tar.gz) = e2434659b02d9ee4502523198ac51f42f7b09845b0950986f4c2ff9e347fe474
+SIZE (opensearch-dashboards-2.0.0-linux-x64.tar.gz) = 227494898
diff --git a/textproc/opensearch/files/patch-bin_opensearch-env b/textproc/opensearch/files/patch-bin_opensearch-env
deleted file mode 100644
index dfb091fdce48..000000000000
--- a/textproc/opensearch/files/patch-bin_opensearch-env
+++ /dev/null
@@ -1,17 +0,0 @@
---- bin/opensearch-env.orig	2021-07-30 13:39:40 UTC
-+++ bin/opensearch-env
-@@ -40,13 +40,7 @@ if [ ! -z "$JAVA_HOME" ]; then
-   JAVA="$JAVA_HOME/bin/java"
-   JAVA_TYPE="JAVA_HOME"
- else
--  if [ "$(uname -s)" = "Darwin" ]; then
--    # macOS has a different structure
--    JAVA="$OPENSEARCH_HOME/jdk.app/Contents/Home/bin/java"
--  else
--    JAVA="$OPENSEARCH_HOME/jdk/bin/java"
--  fi
--  JAVA_TYPE="bundled jdk"
-+  JAVA="/usr/local/bin/java"
- fi
- 
- if [ ! -x "$JAVA" ]; then