git: 301332e1b52a - main - textproc/kibana7: Update to 7.17.8

From: Juraj Lutter <otis_at_FreeBSD.org>
Date: Tue, 13 Dec 2022 17:00:43 UTC
The branch main has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=301332e1b52af930dac2aaa4d5a09e7b4b7ee9db

commit 301332e1b52af930dac2aaa4d5a09e7b4b7ee9db
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2022-12-12 21:50:28 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2022-12-13 16:59:57 +0000

    textproc/kibana7: Update to 7.17.8
    
    Release notes:
    https://www.elastic.co/guide/en/kibana/7.17/release-notes-7.17.8.html
---
 textproc/kibana7/Makefile        |  7 +++++--
 textproc/kibana7/distinfo        | 10 +++++-----
 textproc/kibana7/files/kibana.in |  9 +++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/textproc/kibana7/Makefile b/textproc/kibana7/Makefile
index b9ffdbe7e759..bd470e4e8818 100644
--- a/textproc/kibana7/Makefile
+++ b/textproc/kibana7/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	kibana
-PORTVERSION=	7.17.7
+PORTVERSION=	7.17.8
 DISTVERSIONSUFFIX=	-darwin-x86_64
 CATEGORIES=	textproc www
 MASTER_SITES=	https://artifacts.elastic.co/downloads/kibana/ \
@@ -36,7 +36,7 @@ SUB_LIST+=	PKGNAMESUFFIX=${PKGNAMESUFFIX} \
 # Set node-nan version here
 _NODE_NAN_VER=	2.17.0
 # Set node-re version here
-_NODE_RE2_VER=	1.17.7
+_NODE_RE2_VER=	1.18.0
 #######################################################################
 
 _NODECMD=	${LOCALBASE}/bin/node --version
@@ -47,6 +47,9 @@ _RE2DIR=	${WRKDIR}/node-re2-${_NODE_RE2_VER}
 # Extra patch files must be updated whenever node-re2 changes
 _RE2PATCHES=	${PATCHDIR}/extra-node-re2-binding-gyp.patch
 
+post-extract:
+	${RM} -rf ${WRKSRC}/node
+
 post-patch:
 	${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete
 	cd ${_RE2DIR} && ${PATCH} -p0 < ${_RE2PATCHES}
diff --git a/textproc/kibana7/distinfo b/textproc/kibana7/distinfo
index 52f9dc88d084..560d6447128f 100644
--- a/textproc/kibana7/distinfo
+++ b/textproc/kibana7/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1668117034
-SHA256 (kibana-7.17.7-darwin-x86_64.tar.gz) = eafe0123014fcbab6b3a18281d71bce1fa180c8006a87905c29d429b6cf40558
-SIZE (kibana-7.17.7-darwin-x86_64.tar.gz) = 260242059
+TIMESTAMP = 1670881207
+SHA256 (kibana-7.17.8-darwin-x86_64.tar.gz) = 7c799dccf02448f6578197839d5b08e848a76110f90c0023f3da66ebb52239d3
+SIZE (kibana-7.17.8-darwin-x86_64.tar.gz) = 311223820
 SHA256 (nodejs-nan-v2.17.0_GH0.tar.gz) = bcf5dfe59c26377b2096d903ecf6c2dbdae92528b1373a0565c40fe07537610d
 SIZE (nodejs-nan-v2.17.0_GH0.tar.gz) = 179443
-SHA256 (uhop-node-re2-1.17.7_GH0.tar.gz) = f25be0935e763a1263264929a3e1ce1abfb55559b669ce5b633ec9604ce243d7
-SIZE (uhop-node-re2-1.17.7_GH0.tar.gz) = 50166
+SHA256 (uhop-node-re2-1.18.0_GH0.tar.gz) = 1a756518dc35ee07318e414338afaa8186c03d5929a609c51259d978359ee6b8
+SIZE (uhop-node-re2-1.18.0_GH0.tar.gz) = 51921
diff --git a/textproc/kibana7/files/kibana.in b/textproc/kibana7/files/kibana.in
index 4b64a40c487a..101be36fbb34 100644
--- a/textproc/kibana7/files/kibana.in
+++ b/textproc/kibana7/files/kibana.in
@@ -40,11 +40,11 @@ fi
 NODE="%%LOCALBASE%%/bin/node"
 
 required_files="${kibana_config}"
-pidfile="/var/run/${name}-daemon.pid"
-_kpidfile="/var/run/${name}.pid"
+pidfile="/var/run/${name}.pid"
+procname="${NODE}"
 
 command="/usr/sbin/daemon"
-command_args="-f ${kibana_syslog_output_flags} -P ${pidfile} -t ${name} \
+command_args="-f ${kibana_syslog_output_flags} -p ${pidfile} -t ${name} \
 	/usr/bin/env BABEL_DISABLE_CACHE=1 NODE_ENV=production ${kibana_env} \
 	${NODE} --no-warnings --max-http-header-size=65536 \
 	%%WWWDIR%%/src/cli/dist serve \
@@ -56,9 +56,6 @@ kibana_start_precmd()
 	if [ ! -e "${pidfile}" ]; then
 		install -m 0600 -o ${kibana_user} -g ${kibana_group} /dev/null ${pidfile}
 	fi
-	if [ ! -e "${_kpidfile}" ]; then
-		install -m 0600 -o ${kibana_user} -g ${kibana_group} /dev/null ${_kpidfile}
-	fi
 	if [ ! -f ${kibana_log} ]; then
 		install -o ${kibana_user} -g ${kibana_group} -m 640 /dev/null ${kibana_log}
 	fi