git: 5fa49afb8d2f - main - textproc/kibana8: Port improvements that were made while creating ports of version 9.x

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Sun, 15 Mar 2026 01:51:38 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5fa49afb8d2febdc8d807029b9eaa6ff98bc30a5

commit 5fa49afb8d2febdc8d807029b9eaa6ff98bc30a5
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-03-15 00:55:21 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-03-15 01:48:14 +0000

    textproc/kibana8: Port improvements that were made while creating ports of version 9.x
    
    - Improved text in COMMENT, pkg-deinstall, pkg-message, pkg-descr.
    - Parametrize kibana with ${PORTNAME} in CONFLICTS.
    - Add possibility to run port with non-default user/group www.
    - Fix indents in post-patch.
    - Refresh patches.
    
    PR:             290979
    Approved by:    elastic (maintainer, implicit - inactive for more than 6 months)
---
 textproc/kibana8/Makefile                          | 27 +++++++++++++++-------
 textproc/kibana8/files/kibana.in                   |  4 ++--
 textproc/kibana8/files/patch-config_kibana.yml     |  4 ++--
 textproc/kibana8/files/patch-config_node.options   |  7 ++++--
 ..._kbn_setup-node-env_node__version__validator.js |  6 ++---
 textproc/kibana8/files/pkg-deinstall.in            |  4 ++--
 textproc/kibana8/files/pkg-message.in              |  3 +--
 textproc/kibana8/pkg-descr                         |  2 +-
 8 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/textproc/kibana8/Makefile b/textproc/kibana8/Makefile
index 8c3ff31ad4de..2ca998315e59 100644
--- a/textproc/kibana8/Makefile
+++ b/textproc/kibana8/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	kibana
 DISTVERSION=	8.19.12
 DISTVERSIONSUFFIX=	-linux-x86_64
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc www
 MASTER_SITES=	https://artifacts.elastic.co/downloads/kibana/ \
 		LOCAL/vvd/elastic
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	8
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	elastic@FreeBSD.org
-COMMENT=	Browser based analytics and search interface to Elasticsearch
+COMMENT=	Browser-based analytics and search interface to Elasticsearch (${DISTVERSION:R:R}.x version)
 WWW=		https://www.elastic.co/products/kibana
 
 LICENSE=	APACHE20
@@ -26,19 +26,30 @@ GH_TUPLE=	nodejs:nan:v${_NODE_NAN_VER}:node_nan \
 		uhop:node-re2:${_NODE_RE2_VER}:node_re2
 USE_RC_SUBR=	${PORTNAME}
 
-CONFLICTS=	kibana9*
+CONFLICTS=	${PORTNAME}9*
 
 WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
 
 PORTSCOUT=	limit:^8
 
 SUB_FILES=	pkg-deinstall pkg-message
-SUB_LIST+=	BINDIR=${PREFIX}/bin \
+SUB_LIST=	BINDIR=${PREFIX}/bin \
 		PKGNAMESUFFIX=${PKGNAMESUFFIX} \
-		PORTNAME=${PORTNAME}
+		PORTNAME=${PORTNAME} \
+		KIBANAUSER=${KIBANAUSER} \
+		KIBANAGROUP=${KIBANAGROUP}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
+KIBANAUSER?=	www
+KIBANAGROUP?=	${KIBANAUSER}
+.if ${KIBANAUSER} == www
+USERS=		${KIBANAUSER}
+.endif
+.if ${KIBANAGROUP} == www
+GROUPS=		${KIBANAGROUP}
+.endif
+
 BINS=	kibana-encryption-keys kibana-health-gateway kibana-keystore \
 	kibana-plugin kibana-setup kibana-verification-code
 
@@ -65,10 +76,10 @@ post-patch:
 	${FIND} -s ${WRKSRC}/${_dirdel} -type d -empty -delete
 .endfor
 	${REINPLACE_CMD} -e "s|%%WWWDIR%%|${WWWDIR}|g" \
-	${WRKSRC}/config/kibana.yml
+		${WRKSRC}/config/kibana.yml
 	cd ${_RE2DIR} && ${PATCH} -p0 < ${_RE2PATCHES}
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
-	-e "s|%%DEVDIR%%|${_DEVDIR}|g" ${_RE2DIR}/binding.gyp
+		-e "s|%%DEVDIR%%|${_DEVDIR}|g" ${_RE2DIR}/binding.gyp
 
 pre-configure:
 	( \
@@ -121,7 +132,7 @@ post-install:
 	${ECHO} "@sample ${ETCDIR}/node.options.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(${KIBANAUSER},${KIBANAGROUP}) ${WWWDIR}/data" >> ${TMPPLIST}
 	${ECHO} "@dir ${WWWDIR}/plugins" >> ${TMPPLIST}
 	${ECHO} "@dir ${WWWDIR}/logs" >> ${TMPPLIST}
 	${ECHO} "@dir ${WWWDIR}/src/platform/packages/private/analytics" >> ${TMPPLIST}
diff --git a/textproc/kibana8/files/kibana.in b/textproc/kibana8/files/kibana.in
index 5e9700143016..f62ffa8bf9d9 100644
--- a/textproc/kibana8/files/kibana.in
+++ b/textproc/kibana8/files/kibana.in
@@ -14,8 +14,8 @@ load_rc_config $name
 
 : ${kibana_enable:="NO"}
 : ${kibana_config:="%%ETCDIR%%/kibana.yml"}
-: ${kibana_user:="www"}
-: ${kibana_group:="www"}
+: ${kibana_user:="%%KIBANAUSER%%"}
+: ${kibana_group:="%%KIBANAGROUP%%"}
 : ${kibana_log:="/var/log/kibana.log"}
 : ${kibana_syslog_output_enable:="NO"}
 : ${kibana_chdir:="%%WWWDIR%%/data"}
diff --git a/textproc/kibana8/files/patch-config_kibana.yml b/textproc/kibana8/files/patch-config_kibana.yml
index 4fd4d0a02634..cb9644cbe50d 100644
--- a/textproc/kibana8/files/patch-config_kibana.yml
+++ b/textproc/kibana8/files/patch-config_kibana.yml
@@ -1,6 +1,6 @@
---- config/kibana.yml.orig	2023-12-25 14:26:21 UTC
+--- config/kibana.yml.orig	2026-02-24 03:27:05 UTC
 +++ config/kibana.yml
-@@ -122,10 +122,10 @@
+@@ -139,10 +139,10 @@
  
  # =================== System: Other ===================
  # The path where Kibana stores persistent data not saved in Elasticsearch. Defaults to data
diff --git a/textproc/kibana8/files/patch-config_node.options b/textproc/kibana8/files/patch-config_node.options
index 051087956ccb..33a1ce36a0f2 100644
--- a/textproc/kibana8/files/patch-config_node.options
+++ b/textproc/kibana8/files/patch-config_node.options
@@ -1,6 +1,6 @@
---- config/node.options.orig	2023-12-25 14:25:19 UTC
+--- config/node.options.orig	2026-02-24 03:27:05 UTC
 +++ config/node.options
-@@ -6,10 +6,7 @@
+@@ -6,13 +6,10 @@
  #--max-old-space-size=4096
  
  ## do not terminate process on unhandled promise rejection
@@ -12,3 +12,6 @@
 -
 -## enable OpenSSL 3 legacy provider
 ---openssl-legacy-provider
+ 
+ ## disable ES modules until stable
+ --no-experimental-require-module
diff --git a/textproc/kibana8/files/patch-node__modules__kbn_setup-node-env_node__version__validator.js b/textproc/kibana8/files/patch-node__modules__kbn_setup-node-env_node__version__validator.js
index 16b6faf3b5c9..11ff8ab0e843 100644
--- a/textproc/kibana8/files/patch-node__modules__kbn_setup-node-env_node__version__validator.js
+++ b/textproc/kibana8/files/patch-node__modules__kbn_setup-node-env_node__version__validator.js
@@ -1,6 +1,6 @@
---- node_modules/@kbn/setup-node-env/node_version_validator.js.orig	2025-12-30 21:41:35 UTC
+--- node_modules/@kbn/setup-node-env/node_version_validator.js.orig	2026-02-24 03:27:07 UTC
 +++ node_modules/@kbn/setup-node-env/node_version_validator.js
-@@ -21,13 +21,13 @@ var requiredVersion = rawRequiredVersion ? 'v' + rawRe
+@@ -21,11 +21,11 @@ var requiredVersion = rawRequiredVersion ? 'v' + rawRe
  var currentVersion = process && process.version || null;
  var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null;
  var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion;
@@ -14,5 +14,3 @@
  
    // Actions to apply when validation fails: error report + exit.
    console.error(errorMessage);
-   process.exit(1);
-
diff --git a/textproc/kibana8/files/pkg-deinstall.in b/textproc/kibana8/files/pkg-deinstall.in
index 0699ab559805..e921ed650bfd 100644
--- a/textproc/kibana8/files/pkg-deinstall.in
+++ b/textproc/kibana8/files/pkg-deinstall.in
@@ -10,11 +10,11 @@ POST-DEINSTALL)
 
 If %%PORTNAME%%%%PKGNAMESUFFIX%% is being deleted permanently, and you do not wish to keep any
 data that was in the cluster, then you may wish to delete the
-%%WWWDIR%% directory.  This can be done by with the command:
+%%WWWDIR%% directory. This can be done with the command:
 
 	# rm -rf %%WWWDIR%%
 
-Please ignore this if %%PORTNAME%%%%PKGNAMESUFFIX%% is being upgraded
+Please ignore this if %%PORTNAME%%%%PKGNAMESUFFIX%% is being upgraded.
 EOMSG
     ;;
 esac
diff --git a/textproc/kibana8/files/pkg-message.in b/textproc/kibana8/files/pkg-message.in
index 1bd352072314..3c0f248d8900 100644
--- a/textproc/kibana8/files/pkg-message.in
+++ b/textproc/kibana8/files/pkg-message.in
@@ -1,9 +1,8 @@
 [
 { type: install
   message: <<EOM
-NOTICE: This port now installs Kibana-specific utilities
+NOTICE: This port installs Kibana-specific utilities
 as symbolic links into %%BINDIR%%.
 EOM
 }
 ]
-
diff --git a/textproc/kibana8/pkg-descr b/textproc/kibana8/pkg-descr
index 74d77bf3984f..ce4c53bd1781 100644
--- a/textproc/kibana8/pkg-descr
+++ b/textproc/kibana8/pkg-descr
@@ -1,4 +1,4 @@
-Kibana is an open source (Apache Licensed), browser based analytics and search
+Kibana is an open source (Apache Licensed) browser-based analytics and search
 dashboard for Elasticsearch. Kibana is a snap to setup and start using. Kibana
 strives to be easy to get started with, while also being flexible and powerful,
 just like Elasticsearch.