Date: Mon, 27 Apr 2026 00:13:03 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Cc: Kirill <kirill@varnakov.com> Subject: git: 74c826b07d85 - 2026Q2 - net-mgmt/check_mysql_health: fix awk pipeline Message-ID: <69eeaa0f.1e1e7.267c3774@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2026Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=74c826b07d858c6c53d370f6aea121e1b66d5871 commit 74c826b07d858c6c53d370f6aea121e1b66d5871 Author: Kirill <kirill@varnakov.com> AuthorDate: 2026-04-24 17:08:20 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-04-27 00:11:58 +0000 net-mgmt/check_mysql_health: fix awk pipeline PR: 285486 Reported by: Dave Hayes <dave@jetcafe.org> MFH: 2026Q2 Event: Wiesbaden Hackathon 202604 (cherry picked from commit ec78a0daf64cf1764be2906237ef21cf88124b3e) --- net-mgmt/check_mysql_health/Makefile | 9 ++++++++- .../files/extra-patch-plugins-scripts_subst.in | 11 +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/net-mgmt/check_mysql_health/Makefile b/net-mgmt/check_mysql_health/Makefile index 6cbb22ccdcb3..3d7e25248969 100644 --- a/net-mgmt/check_mysql_health/Makefile +++ b/net-mgmt/check_mysql_health/Makefile @@ -1,6 +1,6 @@ PORTNAME= check_mysql_health DISTVERSION= 3.0.0.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MASTER_SITES= https://labs.consol.de/assets/downloads/nagios/ @@ -32,4 +32,11 @@ NAGIOSDIR?= /var/spool/nagios PLIST_FILES= libexec/nagios/check_mysql_health +.include <bsd.port.options.mk> + +# Change regexp for older awk +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400000 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-plugins-scripts_subst.in +.endif + .include <bsd.port.mk> diff --git a/net-mgmt/check_mysql_health/files/extra-patch-plugins-scripts_subst.in b/net-mgmt/check_mysql_health/files/extra-patch-plugins-scripts_subst.in new file mode 100644 index 000000000000..22497c07c761 --- /dev/null +++ b/net-mgmt/check_mysql_health/files/extra-patch-plugins-scripts_subst.in @@ -0,0 +1,11 @@ +--- plugins-scripts/subst.in.orig 2016-08-01 16:28:29.583644100 +0000 ++++ plugins-scripts/subst.in 2025-05-12 18:58:53.592280000 +0000 +@@ -41,7 +41,7 @@ + + /^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");} + /^#! ?\/.*\/perl/ {sub(/^#! ?\/.*\/perl/,"#! @PERL@");} +-/^#! ?\/.*\/[a-z]{0,2}awk/ {sub(/^#! ?\/.*\/[a-z]{0,2}awk/,"#! @AWK@");} ++/^#! ?\/.*\/[a-z]?[a-z]?awk/ {sub(/^#! ?\/.*\/[a-z]?[a-z]?awk/,"#! @AWK@");} + /^#! ?\/.*\/sh/ {sub(/^#! ?\/.*\/sh/,"#! @SHELL@");} + + # add to libexecdir to INC for perl utils.pmhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69eeaa0f.1e1e7.267c3774>