From nobody Tue May 31 04:28:33 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8A3BD1B518EE; Tue, 31 May 2022 04:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LBzmd6xMcz3s6m; Tue, 31 May 2022 04:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653971314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ph7VsLaI/+zw7OEcB6NSW6W7BOtT9PBgv7A+VG93d8=; b=AHMdp0KqmXnArwmY3ZyE0OAo5A5C29ghx7YnIWp9I8LRqRF9fpZYoD78fXnOK03Av/kRIH YxYJnwtzvP1Fo0fojEfrmrJ/fH/b4N1IWVFbEoQsxPfnjzKNjmn4kaEa+8z/Id/rJBtw+O +Xiihp6stPJ2te6Q165nr6synNQW7nAey1dJjN7kg+ZZ2aPQPvjTuIdzVUSTx/B+eD7klL tQdqwDdlO99EAnG8l2rKe7ffRzmhXHKXuGg2s2tuXqlu+T2rc5hi1VwV9TGBGcn/5oDqAd vlaJFMyMeiC2fcHbjgHwRHAzlCBX1DRX+kaM6o209EDAs2k2lCk1cYoiHYKdXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD9E624C1A; Tue, 31 May 2022 04:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24V4SXRg085340; Tue, 31 May 2022 04:28:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24V4SXB5085339; Tue, 31 May 2022 04:28:33 GMT (envelope-from git) Date: Tue, 31 May 2022 04:28:33 GMT Message-Id: <202205310428.24V4SXB5085339@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Romain Tarti=C3=A8re?= Subject: git: 89b8dcd9b008 - main - textproc/opensearch-dashboards: Update to 2.0.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89b8dcd9b00814ce55e335e4cd575c70d6e322e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653971314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ph7VsLaI/+zw7OEcB6NSW6W7BOtT9PBgv7A+VG93d8=; b=hRg9NHpi5KTZqkOwZzyCiotBD1YpDNBH0t2Jt7P1jPi1oapLoXdFR9ahWJyp6Bviu0Np3W HSLgrM/jA4ZjJ1JMsZ6G2BtLtYRmJQgFvC3Jc8MbZ+f1PqqyPPrgnQGRo5PBYfOdKsweNV f9lVIUhVxGvLSlQVfPFhKit8mC5e8EdV7rJGTeapoz3CyllEcObauYQI38jk5+O5v8F5YD DE3UIWl47JTrLCfdgdPW2rXQ/P7cfEh5eevo1AWdsWayy2OEzRZ8fLUdCJodSgF7CRBhXt UbetDZ+R6liYeiHenfTK8RZlGMmpfDuFpGPWdtOGuu78ooU62+IWo56ujB8efQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653971314; a=rsa-sha256; cv=none; b=GnL9JtUmv2tNhlAmV33GpXEIIQsUcTKK0xnXr3NC0MsyDD32empNE7Ce8mNXfHCPTGLuiW YfCSHmovoJFRqET82Xjw+pVtulBj0rHQzuvpzc3tYU/3DQ7ARyn+PLP4X818dZSy5cVQdh +b8ZXYgx+02SffCalY3cWCu6stQjk53g65DtYWotu2c+LnmiZocq7rDilW3wSo4YE7SycW TKohYwqDITCw56CLSxkEz9CQNubnPuoB6Oa0VpquUpxfLXH+k+Dlk4S4l3GFvpbpC0ZpP9 MLfxfRyNOS4NAZrCckEEB4WZtpDsJkjOvTU10y6pIsrH8OjWK4A/IeShy/v76g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=89b8dcd9b00814ce55e335e4cd575c70d6e322e5 commit 89b8dcd9b00814ce55e335e4cd575c70d6e322e5 Author: Romain Tartière AuthorDate: 2022-05-31 04:12:48 +0000 Commit: Romain Tartière 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