net-mgmt/mysqld_exporter: update 0.12.1 -> 0.17.2

- Warning: several breaking changes included
  Please read the Changes

PR:		285966
Approved:	maintainer timeout
Changes:	https://github.com/prometheus/mysqld_exporter/releases

8 files changed, 52 insertions, 281 deletions

diff --git a/net-mgmt/mysqld_exporter/Makefile b/net-mgmt/mysqld_exporter/Makefile
index cb66e8e904be..1a6435ead5d8 100644
--- a/net-mgmt/mysqld_exporter/Makefile
+++ b/net-mgmt/mysqld_exporter/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	mysqld_exporter
-PORTVERSION=	0.12.1
-DISTVERSIONPREFIX=v
-PORTREVISION=	25
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.17.2
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	mr.deadlystorm@gmail.com
@@ -9,21 +8,13 @@ COMMENT=	Prometheus exporter for MySQL server metrics
 WWW=		https://github.com/prometheus/mysqld_exporter
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:modules
-USE_GITHUB=	yes
-
-GH_ACCOUNT=	prometheus
-GH_TUPLE=	golang:sys:v0.6.0:sys
-
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+USES=		go:1.23,modules
+GO_MODULE=	github.com/prometheus/mysqld_exporter
 
 PLIST_FILES=	bin/mysqld_exporter
-
 USE_RC_SUBR=	mysqld_exporter
-
-pre-patch:
-	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
-	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+SUB_FILES=	pkg-message
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/mysqld_exporter/distinfo b/net-mgmt/mysqld_exporter/distinfo
index 51d9709cc110..8e6fd9160f11 100644
--- a/net-mgmt/mysqld_exporter/distinfo
+++ b/net-mgmt/mysqld_exporter/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1679705787
-SHA256 (prometheus-mysqld_exporter-v0.12.1_GH0.tar.gz) = 8fdd21c629963f5275ac772f59e8d32bafc8aee1ae61cf8ae996f30c92cbc360
-SIZE (prometheus-mysqld_exporter-v0.12.1_GH0.tar.gz) = 1910780
-SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
-SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234
+TIMESTAMP = 1744045231
+SHA256 (go/net-mgmt_mysqld_exporter/mysqld_exporter-v0.17.2/v0.17.2.mod) = c3ba33fc11f23aab46bfb72efc4ac968c8ce8111a24922370d7ff95f20fd9a6f
+SIZE (go/net-mgmt_mysqld_exporter/mysqld_exporter-v0.17.2/v0.17.2.mod) = 1737
+SHA256 (go/net-mgmt_mysqld_exporter/mysqld_exporter-v0.17.2/v0.17.2.zip) = 798f38caf66342ac72a1b0984633ede719d9b8b35a8a480c8250e2cf37828480
+SIZE (go/net-mgmt_mysqld_exporter/mysqld_exporter-v0.17.2/v0.17.2.zip) = 191673
diff --git a/net-mgmt/mysqld_exporter/files/mysqld_exporter.in b/net-mgmt/mysqld_exporter/files/mysqld_exporter.in
index 32a517c10ccc..e411fbaf9668 100644
--- a/net-mgmt/mysqld_exporter/files/mysqld_exporter.in
+++ b/net-mgmt/mysqld_exporter/files/mysqld_exporter.in
@@ -16,13 +16,14 @@
 # mysqld_exporter_args (string):          Set extra arguments to pass to mysqld_exporter
 #               Default is "".
 # mysqld_exporter_listen_address (string):Set ip:port that mysqld_exporter will listen on
-#               Default is ":9100".
-# mysqld_exporter_conffile (string):      Set configuration file path for mysqld_exporter
-#               Default is "".
+#               Default is ":9104".
+# mysqld_exporter_config (string):        Set configuration file path for mysqld_exporter
+#               Default is "%%PREFIX%%/etc/my.cnf".
 
 . /etc/rc.subr
 
 name=mysqld_exporter
+desc="mysqld_exporter for use with Prometheus"
 rcvar=mysqld_exporter_enable
 
 load_rc_config $name
@@ -32,24 +33,17 @@ load_rc_config $name
 : ${mysqld_exporter_group:="nobody"}
 : ${mysqld_exporter_args:=""}
 : ${mysqld_exporter_listen_address:=":9104"}
-if [ -f "%%ETCDIR%%/my.cnf" ]; then
-: ${mysqld_exporter_conffile:="%%ETCDIR%%/my.cnf"}
-else
-: ${mysqld_exporter_conffile:=""}
-fi
+: ${mysqld_exporter_config:="%%PREFIX%%/etc/my.cnf"}
 
-if [ -z ${mysqld_exporter_conffile} ]; then
-conf_arg=""
-else
-conf_arg="--config.my-cnf=${mysqld_exporter_conffile}"
-fi
+conf_file="--config.my-cnf=${mysqld_exporter_config}"
 
 pidfile=/var/run/mysqld_exporter.pid
 command="/usr/sbin/daemon"
 procname="%%PREFIX%%/bin/mysqld_exporter"
-command_args="-p ${pidfile} /usr/bin/env ${procname} \
+command_args="-f -p ${pidfile} -T ${name} \
+    /usr/bin/env ${procname} \
     --web.listen-address=${mysqld_exporter_listen_address} \
-    ${conf_arg} \
+    ${conf_file} \
     ${mysqld_exporter_args}"
 
 start_precmd=mysqld_exporter_startprecmd
@@ -58,8 +52,9 @@ mysqld_exporter_startprecmd()
 {
     if [ ! -e ${pidfile} ]; then
         install -o ${mysqld_exporter_user} -g ${mysqld_exporter_group} /dev/null ${pidfile};
+    else
+        chown ${mysqld_exporter_user}:${mysqld_exporter_group} ${pidfile};
     fi
 }
 
-load_rc_config $name
 run_rc_command "$1"
diff --git a/net-mgmt/mysqld_exporter/files/patch-go.mod b/net-mgmt/mysqld_exporter/files/patch-go.mod
deleted file mode 100644
index 8972c6d4e4f1..000000000000
--- a/net-mgmt/mysqld_exporter/files/patch-go.mod
+++ /dev/null
@@ -1,45 +0,0 @@
---- go.mod.orig	2023-03-25 01:00:23 UTC
-+++ go.mod
-@@ -1,25 +1,33 @@
- module github.com/prometheus/mysqld_exporter
- 
-+go 1.17
-+
- require (
- 	github.com/DATA-DOG/go-sqlmock v1.3.3
-+	github.com/go-sql-driver/mysql v1.4.1
-+	github.com/prometheus/client_golang v1.0.0
-+	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
-+	github.com/prometheus/common v0.6.0
-+	github.com/satori/go.uuid v1.2.0
-+	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a
-+	gopkg.in/alecthomas/kingpin.v2 v2.2.6
-+	gopkg.in/ini.v1 v1.44.0
-+)
-+
-+require (
- 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
- 	github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 // indirect
--	github.com/go-sql-driver/mysql v1.4.1
-+	github.com/beorn7/perks v1.0.0 // indirect
- 	github.com/golang/protobuf v1.3.2 // indirect
- 	github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
-+	github.com/jtolds/gls v4.20.0+incompatible // indirect
- 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
- 	github.com/kr/pretty v0.1.0 // indirect
--	github.com/prometheus/client_golang v1.0.0
--	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
--	github.com/prometheus/common v0.6.0
-+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
- 	github.com/prometheus/procfs v0.0.3 // indirect
--	github.com/satori/go.uuid v1.2.0
- 	github.com/sirupsen/logrus v1.4.2 // indirect
- 	github.com/smartystreets/assertions v1.0.0 // indirect
--	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a
--	golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb // indirect
-+	golang.org/x/sys v0.6.0 // indirect
- 	google.golang.org/appengine v1.6.1 // indirect
--	gopkg.in/alecthomas/kingpin.v2 v2.2.6
- 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
--	gopkg.in/ini.v1 v1.44.0
- )
diff --git a/net-mgmt/mysqld_exporter/files/patch-go.sum b/net-mgmt/mysqld_exporter/files/patch-go.sum
deleted file mode 100644
index 87677ff57ed0..000000000000
--- a/net-mgmt/mysqld_exporter/files/patch-go.sum
+++ /dev/null
@@ -1,101 +0,0 @@
---- go.sum.orig	2023-03-25 01:00:26 UTC
-+++ go.sum
-@@ -1,10 +1,8 @@
- github.com/DATA-DOG/go-sqlmock v1.3.3 h1:CWUqKXe0s8A2z6qCgkP4Kru7wC11YoAnoupUKFDnH08=
- github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
--github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
- github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
- github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
- github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
--github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
- github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
- github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 h1:Hs82Z41s6SdL1CELW+XaDYmOH4hkBN4/N9og/AsOv7E=
- github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-@@ -20,11 +18,8 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7Fu
- github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
- github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
- github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
--github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo=
- github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
--github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
- github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
--github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
- github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
- github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
- github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-@@ -36,7 +31,6 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvty
- github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
- github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
- github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
--github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
- github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
- github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
- github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-@@ -54,26 +48,21 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-
- github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
- github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
- github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
--github.com/prometheus/client_golang v0.9.1 h1:K47Rk0v/fkEfwfQet2KWhscE0cJzjgCCDBG2KHZoVno=
- github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
- github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM=
- github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
--github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
- github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
- github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
- github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
--github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw=
- github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
- github.com/prometheus/common v0.6.0 h1:kRhiuYSXR3+uv2IbVbZhUxK5zVD/2pp3Gd2PpvPkpEo=
- github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
- github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
--github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs=
- github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
- github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE=
- github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
- github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
- github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
--github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo=
- github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
- github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
- github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-@@ -84,11 +73,9 @@ github.com/smartystreets/goconvey v0.0.0-2019033003261
- github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
- github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
- github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
--github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
- github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
- github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
- github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
--golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
- golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
- golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
- golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-@@ -97,20 +84,19 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go
- golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
- golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
- golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
--golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
- golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
--golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5 h1:mzjBh+S5frKOsOBobWIMAbXavqjmgO17k/2puhcFR94=
- golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
- golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
- golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
--golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
- golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb h1:fgwFCsaw9buMuxNd6+DQfAuSFqbNiQZpcgJQAgJsK6k=
- golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
-+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
- golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
- golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-@@ -125,5 +111,4 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h
- gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
- gopkg.in/ini.v1 v1.44.0 h1:YRJzTUp0kSYWUVFF5XAbDFfyiqwsl0Vb9R8TVP5eRi0=
- gopkg.in/ini.v1 v1.44.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
--gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
- gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/net-mgmt/mysqld_exporter/files/patch-vendor_modules.txt b/net-mgmt/mysqld_exporter/files/patch-vendor_modules.txt
deleted file mode 100644
index 2ef533f9a37d..000000000000
--- a/net-mgmt/mysqld_exporter/files/patch-vendor_modules.txt
+++ /dev/null
@@ -1,98 +0,0 @@
---- vendor/modules.txt.orig	2023-03-25 01:01:20 UTC
-+++ vendor/modules.txt
-@@ -1,60 +1,87 @@
- # github.com/DATA-DOG/go-sqlmock v1.3.3
-+## explicit
- github.com/DATA-DOG/go-sqlmock
- # github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
-+## explicit
- github.com/alecthomas/template
- github.com/alecthomas/template/parse
- # github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4
-+## explicit
- github.com/alecthomas/units
- # github.com/beorn7/perks v1.0.0
-+## explicit; go 1.12
- github.com/beorn7/perks/quantile
- # github.com/go-sql-driver/mysql v1.4.1
-+## explicit
- github.com/go-sql-driver/mysql
- # github.com/golang/protobuf v1.3.2
-+## explicit
- github.com/golang/protobuf/proto
- # github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c
-+## explicit
- github.com/gopherjs/gopherjs/js
- # github.com/jtolds/gls v4.20.0+incompatible
-+## explicit
- github.com/jtolds/gls
- # github.com/konsorten/go-windows-terminal-sequences v1.0.2
-+## explicit
- github.com/konsorten/go-windows-terminal-sequences
-+# github.com/kr/pretty v0.1.0
-+## explicit
- # github.com/matttproud/golang_protobuf_extensions v1.0.1
-+## explicit
- github.com/matttproud/golang_protobuf_extensions/pbutil
- # github.com/prometheus/client_golang v1.0.0
-+## explicit
- github.com/prometheus/client_golang/prometheus
--github.com/prometheus/client_golang/prometheus/promhttp
- github.com/prometheus/client_golang/prometheus/internal
-+github.com/prometheus/client_golang/prometheus/promhttp
- # github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
-+## explicit; go 1.9
- github.com/prometheus/client_model/go
- # github.com/prometheus/common v0.6.0
--github.com/prometheus/common/log
--github.com/prometheus/common/version
-+## explicit
- github.com/prometheus/common/expfmt
--github.com/prometheus/common/model
- github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
-+github.com/prometheus/common/log
-+github.com/prometheus/common/model
-+github.com/prometheus/common/version
- # github.com/prometheus/procfs v0.0.3
-+## explicit
- github.com/prometheus/procfs
- github.com/prometheus/procfs/internal/fs
- # github.com/satori/go.uuid v1.2.0
-+## explicit
- github.com/satori/go.uuid
- # github.com/sirupsen/logrus v1.4.2
-+## explicit
- github.com/sirupsen/logrus
- # github.com/smartystreets/assertions v1.0.0
-+## explicit; go 1.12
- github.com/smartystreets/assertions
- github.com/smartystreets/assertions/internal/go-diff/diffmatchpatch
- github.com/smartystreets/assertions/internal/go-render/render
- github.com/smartystreets/assertions/internal/oglematchers
- # github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a
-+## explicit
- github.com/smartystreets/goconvey/convey
--github.com/smartystreets/goconvey/convey/reporting
- github.com/smartystreets/goconvey/convey/gotest
--# golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb
--golang.org/x/sys/windows
--golang.org/x/sys/windows/svc/eventlog
-+github.com/smartystreets/goconvey/convey/reporting
-+# golang.org/x/sys v0.6.0
-+## explicit; go 1.17
-+golang.org/x/sys/internal/unsafeheader
- golang.org/x/sys/unix
-+golang.org/x/sys/windows
- golang.org/x/sys/windows/registry
-+golang.org/x/sys/windows/svc/eventlog
- # google.golang.org/appengine v1.6.1
-+## explicit
- google.golang.org/appengine/cloudsql
- # gopkg.in/alecthomas/kingpin.v2 v2.2.6
-+## explicit
- gopkg.in/alecthomas/kingpin.v2
-+# gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127
-+## explicit
- # gopkg.in/ini.v1 v1.44.0
-+## explicit
- gopkg.in/ini.v1
diff --git a/net-mgmt/mysqld_exporter/files/pkg-message.in b/net-mgmt/mysqld_exporter/files/pkg-message.in
new file mode 100644
index 000000000000..15d06e3cad2f
--- /dev/null
+++ b/net-mgmt/mysqld_exporter/files/pkg-message.in
@@ -0,0 +1,23 @@
+[
+{ type: install
+  message: <<EOM
+To start mysqld_exporter, create a configuration file at:
+
+  %%PREFIX%%/etc/my.cnf
+
+with default MySQL credentials, such as:
+
+  [client]
+  host = localhost
+  port = 3306
+  user = mysqld_exporter
+  password = foo123
+
+then run "sysrc mysqld_exporter_enable=yes" to enable.
+
+For more configuration options, visit:
+
+  https://github.com/prometheus/mysqld_exporter
+EOM
+}
+]
diff --git a/net-mgmt/mysqld_exporter/pkg-descr b/net-mgmt/mysqld_exporter/pkg-descr
index c4c77e9a314d..1e544b53415a 100644
--- a/net-mgmt/mysqld_exporter/pkg-descr
+++ b/net-mgmt/mysqld_exporter/pkg-descr
@@ -1 +1,7 @@
-node_exporter is a prometheus exporter for MySQL server metrics
+mysqld_exporter is a Prometheus exporter for MySQL server metrics.
+
+This exporter also supports Prometheus' multi-target scraping pattern, which
+enables a single running instance of the exporter to collect metrics from
+multiple MySQL targets. For more information see:
+
+  https://github.com/prometheus/mysqld_exporter