git: 09519506e8e4 - main - textproc/opensearch-dashboards: Fix build after of npm update

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Tue, 04 Jul 2023 05:47:23 UTC

The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=09519506e8e4ebd07da383dc79d0237f62786c62

commit 09519506e8e4ebd07da383dc79d0237f62786c62
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2023-07-04 05:44:06 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2023-07-04 05:47:14 +0000

    textproc/opensearch-dashboards: Fix build after of npm update
    
    With hat:       opensearch
    Reported by:    pkg-fallout
---
 textproc/opensearch-dashboards/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/textproc/opensearch-dashboards/Makefile b/textproc/opensearch-dashboards/Makefile
index 14e2255ba645..48b60be97c57 100644
--- a/textproc/opensearch-dashboards/Makefile
+++ b/textproc/opensearch-dashboards/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	opensearch-dashboards
 DISTVERSION=	2.8.0
 DISTVERSIONSUFFIX=	-linux-x64
+PORTREVISION=	1
 CATEGORIES=	textproc www
 MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
 
@@ -42,7 +43,7 @@ post-patch:
 do-configure:
 	(cd ${WRKSRC}/node_modules/re2 && \
 		${SETENV} HOME=${WRKDIR} PYTHONDONTWRITEBYTECODE=1 \
-		${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})
@@ -50,7 +51,7 @@ do-configure:
 do-build:
 	(cd ${WRKSRC}/node_modules/re2 && \
 		${SETENV} HOME=${WRKDIR} PYTHONDONTWRITEBYTECODE=1 \
-		${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})
 	${RM} -r ${WRKSRC}/node_modules/re2/build/Release/.deps \
 		${WRKSRC}/node_modules/re2/build/Release/obj.target