diff --git a/textproc/opensearch-dashboards/Makefile b/textproc/opensearch-dashboards/Makefile index 44f82e60a66b..706beb573562 100644 --- a/textproc/opensearch-dashboards/Makefile +++ b/textproc/opensearch-dashboards/Makefile @@ -1,83 +1,79 @@ PORTNAME= opensearch-dashboards -DISTVERSION= 2.6.0 +DISTVERSION= 2.7.0 DISTVERSIONSUFFIX= -linux-x64 -PORTREVISION= 2 CATEGORIES= textproc www MASTER_SITES= https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/ MAINTAINER= opensearch@FreeBSD.org COMMENT= Visualization dashboards for OpenSearch WWW= https://opensearch.org LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= npm-node16>0:www/npm-node16 CONFLICTS= opensearch-dashboard13 USES= nodejs:16,build,run python:build USE_RC_SUBR= ${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} 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 _DEVDIR= ${WRKDIR}/.devdir post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' -e 's|%%LOCALBASE%%|${LOCALBASE}|' -e 's|%%WRKSRC%%|${WRKSRC}|' \ - ${WRKSRC}/bin/opensearch-dashboards \ - ${WRKSRC}/bin/opensearch-dashboards-keystore \ - ${WRKSRC}/bin/opensearch-dashboards-plugin \ ${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/bin/node-gyp-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/bin/node-gyp-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} ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/test/resources/legacy" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/test/resources/fixed" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/test/resources/dynamic" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/examples/fixed" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/examples/dynamic" >> ${TMPPLIST} .include diff --git a/textproc/opensearch-dashboards/distinfo b/textproc/opensearch-dashboards/distinfo index cadd2680319d..964db868155b 100644 --- a/textproc/opensearch-dashboards/distinfo +++ b/textproc/opensearch-dashboards/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681491572 -SHA256 (opensearch-dashboards-2.6.0-linux-x64.tar.gz) = d54f41131661fe1a092a43c2d3ca04b3753a29666feb1bc7066f07118b2bd8bb -SIZE (opensearch-dashboards-2.6.0-linux-x64.tar.gz) = 217298981 +TIMESTAMP = 1684548918 +SHA256 (opensearch-dashboards-2.7.0-linux-x64.tar.gz) = a93665de8035ef616c1d4fcfaffc0cfc63a590b3852cd9f54a0009823b03328a +SIZE (opensearch-dashboards-2.7.0-linux-x64.tar.gz) = 275618492 diff --git a/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-keystore b/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-keystore deleted file mode 100644 index bf943cba637b..000000000000 --- a/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-keystore +++ /dev/null @@ -1,13 +0,0 @@ ---- bin/opensearch-dashboards-keystore.orig 2022-06-30 21:38:00 UTC -+++ bin/opensearch-dashboards-keystore -@@ -26,8 +26,8 @@ while [ -h "$SCRIPT" ] ; do - done - - DIR="$(dirname "${SCRIPT}")/.." --CONFIG_DIR=${OSD_PATH_CONF:-"$DIR/config"} --NODE="${DIR}/node/bin/node" -+CONFIG_DIR="%%PREFIX%%/etc/opensearch-dashboards" -+NODE="%%LOCALBASE%%/bin/node" - test -x "$NODE" - if [ ! -x "$NODE" ]; then - echo "unable to find usable node.js executable." diff --git a/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-plugin b/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-plugin deleted file mode 100644 index 1a3cff5bef3f..000000000000 --- a/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-plugin +++ /dev/null @@ -1,13 +0,0 @@ ---- bin/opensearch-dashboards-plugin.orig 2022-06-30 21:38:00 UTC -+++ bin/opensearch-dashboards-plugin -@@ -26,8 +26,8 @@ while [ -h "$SCRIPT" ] ; do - done - - DIR="$(dirname "${SCRIPT}")/.." --CONFIG_DIR=${OSD_PATH_CONF:-"$DIR/config"} --NODE="${DIR}/node/bin/node" -+CONFIG_DIR="%%PREFIX%%/etc/opensearch-dashboards" -+NODE="%%LOCALBASE%%/bin/node" - test -x "$NODE" - if [ ! -x "$NODE" ]; then - echo "unable to find usable node.js executable."