--- b/textproc/kibana7/Makefile +++ b/textproc/kibana7/Makefile @@ -1,47 +1,47 @@ # Created by: Tom Judge # $FreeBSD$ PORTNAME= kibana -PORTVERSION= 7.9.3 +PORTVERSION= 7.10.0 DISTVERSIONSUFFIX= -darwin-x86_64 CATEGORIES= textproc www MASTER_SITES= https://artifacts.elastic.co/downloads/kibana/ \ http://artifacts.elastic.co/downloads/kibana/ PKGNAMESUFFIX?= 7 MAINTAINER= elastic@FreeBSD.org COMMENT= Browser based analytics and search interface to ElasticSearch LICENSE= APACHE20 RUN_DEPENDS= node10>=10.21.0:www/node10 CONFLICTS= kibana[6]* NO_BUILD= yes WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX} USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-deinstall SUB_LIST+= PORTNAME=${PORTNAME} PKGNAMESUFFIX=${PKGNAMESUFFIX} post-patch: ${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample (cd ${WRKSRC} && \ ${RM} -r config node optimize && \ ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} && \ ${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR}) ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${WWWDIR}/config post-install: ${ECHO} "@sample ${ETCDIR}/kibana.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" >> ${TMPPLIST} .include --- b/textproc/kibana7/distinfo +++ b/textproc/kibana7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1603571985 -SHA256 (kibana-7.9.3-darwin-x86_64.tar.gz) = 44c94470012580e0f29a4291d2c2210acaf4090d618db777e3ab079012948961 -SIZE (kibana-7.9.3-darwin-x86_64.tar.gz) = 304299677 +TIMESTAMP = 1605452222 +SHA256 (kibana-7.10.0-darwin-x86_64.tar.gz) = 9241d69f4543ed3837e2d53c37db8d45aa1b6df8d08f7cf6509c061f4b8f24fc +SIZE (kibana-7.10.0-darwin-x86_64.tar.gz) = 260667041 --- b/textproc/kibana7/files/patch-src_setup__node__env_node__version__validator.js +++ b/textproc/kibana7/files/patch-src_setup__node__env_node__version__validator.js @@ -1,18 +1,18 @@ ---- src/setup_node_env/node_version_validator.js.orig 2020-04-25 11:11:41.868361000 -0700 -+++ src/setup_node_env/node_version_validator.js 2020-04-25 11:13:08.195399000 -0700 -@@ -25,11 +25,11 @@ +--- src/setup_node_env/node_version_validator.js.orig 2020-11-15 15:12:50 UTC ++++ src/setup_node_env/node_version_validator.js +@@ -25,11 +25,11 @@ var pkg = require('../../package.json'); // Note: This var currentVersion = process && process.version || null; var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null; var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion; -var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts. +var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion >= requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts. if (!isVersionValid) { - var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit. + var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js >= ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit. console.error(errorMessage); process.exit(1); -} \ No newline at end of file +} --- a/textproc/kibana7/files/patch-src_setup__node__env_prebuilt__dev__only__entry.js +++ /dev/null @@ -1,9 +0,0 @@ ---- src/setup_node_env/prebuilt_dev_only_entry.js.orig 2020-08-22 12:22:07 UTC -+++ src/setup_node_env/prebuilt_dev_only_entry.js -@@ -28,4 +28,4 @@ require('symbol-observable'); - - require('./root'); - --require('./node_version_validator'); -\ No newline at end of file -+//require('./node_version_validator');