Le Sun, Apr 14, 2024 at 01:25:47PM +0000, Lucas Gabriel Vuotto a écrit :
> Hey Denis, ports@,
> 
> Sorry it took me so long to get back at this.
> 
> I've revisited VictoriaMetrics versioning and they seem to no longer
> make LTS releases for non-enterprise clients, so lets jump straight to
> 1.100.1. The changes are extensive and split between [0] and [1].
> 
> Portwise, had to add MODGO_GO111MODULE (thanks for the issue in GitHub;
> otherwise I don't I'd have been able to fix it myself), removed the 
> built date from the version string, replaced the multiple utils Makefile
> targets with vmutils-pure (which now also builds and installs
> vmalert-tool), sorted the utils install step and removed some Excalidraw
> files that now would get installed while copying the docs over. There is
> some PLIST churn as upstream switched from PNG images to WebP. Of notice
> in PLIST, I did the following change to better align with most of the
> installs in other places:
> 
> 	-@sample ${SYSCONFDIR}/vmetrics/
> 	+@sample ${SYSCONFDIR}/victoriametrics/
> 
> I don't know how disruptive this can be to the port consumers. I guess
> it's little tho, as it doesn't read any config file by default.
> 
> Been running it for a couple of ours in arm64 without any issue so far.
> 

Thank you, it's OK for me.

> 	Lucas
> 
> [0]: https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/docs/CHANGELOG.md
> [1]: https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/docs/CHANGELOG_2023.md
> 
> 
> diff 2cd9db2cf47edccc9b995543c2251ae75f97ca74 a04dc5822ec6b9f87c5ba957dcd62c3f8e0ced2d
> commit - 2cd9db2cf47edccc9b995543c2251ae75f97ca74
> commit + a04dc5822ec6b9f87c5ba957dcd62c3f8e0ced2d
> blob - a4c03f11455585ec042c26924f276d67114cc03c
> blob + e1fd56d5ae3ffa4b5606a8fd97b4d03c174755e1
> --- databases/victoriametrics/Makefile
> +++ databases/victoriametrics/Makefile
> @@ -1,6 +1,6 @@
>  COMMENT =		fast, cost-effective and scalable time series database
>  
> -V =			1.93.10
> +V =			1.100.1
>  
>  DIST_TUPLE +=		github VictoriaMetrics VictoriaMetrics v${V} . # Apache License 2.0
>  
> @@ -21,34 +21,37 @@ USE_GMAKE =		Yes
>  
>  MODULES =		lang/go
>  MODGO_GOPATH =		${MODGO_WORKSPACE}
> +MODGO_GO111MODULE =	auto
>  SUBST_VARS =		LOCALSTATEDIR
>  NO_TEST =		Yes
>  
> -MAKE_ENV =		BUILDINFO_TAG=tags-v${V} PKG_TAG=tags-v${V}
> +# Only used for "make release" target, not consumed by ports. Shuts up
> +# getconf: _NPROCESSORS_ONLN: unknown variable
> +MAKE_ENV +=		MAKE_CONCURRENCY=1
> +MAKE_ENV +=		BUILDINFO_TAG=tags-v${V} \
> +			DATEINFO_TAG= \
> +			PKG_TAG=tags-v${V}
>  
>  ALL_TARGET =		github.com/VictoriaMetrics/VictoriaMetrics
>  
>  do-build:
> -	cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} victoria-metrics-pure
> -	cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmbackup-pure
> -	cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmrestore-pure
> -	cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmagent-pure
> -	cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmauth-pure
> -	cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmalert-pure
> -	cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmctl-pure
> +	cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} \
> +	    victoria-metrics-pure vmutils-pure
>  
>  do-install:
>  	${INSTALL_PROGRAM} ${WRKSRC}/bin/victoria-metrics-pure ${PREFIX}/bin/vmetrics
>  	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmagent-pure ${PREFIX}/bin/vmagent
> +	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmalert-pure ${PREFIX}/bin/vmetricsalert
> +	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmalert-tool-pure ${PREFIX}/bin/vmetricsalert-tool
> +	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmauth-pure ${PREFIX}/bin/vmetricsauth
>  	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmbackup-pure ${PREFIX}/bin/vmetricsbackup
>  	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmrestore-pure ${PREFIX}/bin/vmetricsrestore
> -	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmauth-pure ${PREFIX}/bin/vmetricsauth
> -	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmalert-pure ${PREFIX}/bin/vmetricsalert
>  	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmctl-pure ${PREFIX}/bin/vmetricsctl
>  	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vmetrics/
>  	${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/vmetrics/
>  	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/vmetrics/
> -	${INSTALL_DATA} ${WRKSRC}/docs/vm* ${PREFIX}/share/doc/vmetrics/
> +	(cd ${WRKSRC}/docs && pax -w vm*) | \
> +	    (cd ${PREFIX}/share/doc/vmetrics/ && pax -r -c '*.excalidraw')
>  	${INSTALL_DATA} ${WRKSRC}/app/vmauth/example_config.yml \
>  	    ${PREFIX}/share/doc/vmetrics/vmauth_example_config.yml
>  	${INSTALL_DATA} ${WRKSRC}/deployment/docker/alerts.yml \
> blob - 80adccc8809934bcde660ee6d5652b7a6896a582
> blob + 6b23c970b0819352adb8b912c60f835f1b64987e
> --- databases/victoriametrics/distinfo
> +++ databases/victoriametrics/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (VictoriaMetrics-VictoriaMetrics-v1.93.10.tar.gz) = cEdMu0IOYVelz0y/8NCS8fT7qIkGTXamWUuZksAM448=
> -SIZE (VictoriaMetrics-VictoriaMetrics-v1.93.10.tar.gz) = 59976987
> +SHA256 (VictoriaMetrics-VictoriaMetrics-v1.100.1.tar.gz) = BRzw+p6G95V80VUuBviZvG0+qzqM/+nkH0IfWk4bA48=
> +SIZE (VictoriaMetrics-VictoriaMetrics-v1.100.1.tar.gz) = 37373984
> blob - 57011c285dff4f6e2a2c8880b27b2a453998ea23
> blob + c1f9399f176ab7038421bb4ee2f4229de3481ef4
> --- databases/victoriametrics/pkg/PLIST
> +++ databases/victoriametrics/pkg/PLIST
> @@ -1,10 +1,11 @@
>  @newgroup _vmetrics:872
>  @newuser _vmetrics:872:_vmetrics::VictoriaMetrics:${LOCALSTATEDIR}/db/vmetrics:/sbin/nologin
> -@sample ${SYSCONFDIR}/vmetrics/
> +@sample ${SYSCONFDIR}/victoriametrics/
>  @rcscript ${RCDIR}/vmetrics
>  @bin bin/vmagent
>  @bin bin/vmetrics
>  @bin bin/vmetricsalert
> +@bin bin/vmetricsalert-tool
>  @bin bin/vmetricsauth
>  @bin bin/vmetricsbackup
>  @bin bin/vmetricsctl
> @@ -13,33 +14,33 @@ share/doc/vmetrics/
>  share/doc/vmetrics/LICENSE
>  share/doc/vmetrics/README.md
>  share/doc/vmetrics/vmagent.md
> -share/doc/vmetrics/vmagent.png
> +share/doc/vmetrics/vmagent.webp
> +share/doc/vmetrics/vmalert-tool.md
>  share/doc/vmetrics/vmalert.md
> -share/doc/vmetrics/vmalert_cluster.png
> -share/doc/vmetrics/vmalert_ha.png
> -share/doc/vmetrics/vmalert_multicluster.png
> -share/doc/vmetrics/vmalert_multiple_rw.png
> -share/doc/vmetrics/vmalert_single.png
> -share/doc/vmetrics/vmalert_state.png
> +share/doc/vmetrics/vmalert_cluster.webp
> +share/doc/vmetrics/vmalert_ha.webp
> +share/doc/vmetrics/vmalert_multicluster.webp
> +share/doc/vmetrics/vmalert_multiple_rw.webp
> +share/doc/vmetrics/vmalert_single.webp
> +share/doc/vmetrics/vmalert_state.webp
>  share/doc/vmetrics/vmalert_ts_data_delay.gif
>  share/doc/vmetrics/vmalert_ts_normal.gif
> -share/doc/vmetrics/vmanomaly-holtwinters-example.png
> -share/doc/vmetrics/vmanomaly-prophet-example.png
> -share/doc/vmetrics/vmanomaly.md
> +share/doc/vmetrics/vmanomaly-holtwinters-example.webp
> +share/doc/vmetrics/vmanomaly-prophet-example.webp
>  share/doc/vmetrics/vmauth.md
>  share/doc/vmetrics/vmauth_example_config.yml
>  share/doc/vmetrics/vmbackup.md
>  share/doc/vmetrics/vmbackupmanager.md
> -share/doc/vmetrics/vmbackupmanager_latest_folder.png
> -share/doc/vmetrics/vmbackupmanager_root_folder.png
> -share/doc/vmetrics/vmbackupmanager_rp_daily_1.png
> -share/doc/vmetrics/vmbackupmanager_rp_daily_2.png
> +share/doc/vmetrics/vmbackupmanager_latest_folder.webp
> +share/doc/vmetrics/vmbackupmanager_root_folder.webp
> +share/doc/vmetrics/vmbackupmanager_rp_daily_1.webp
> +share/doc/vmetrics/vmbackupmanager_rp_daily_2.webp
>  share/doc/vmetrics/vmctl.md
>  share/doc/vmetrics/vmetrics_example_config.yml
>  share/doc/vmetrics/vmetricsalert_example_config.yml
> -share/doc/vmetrics/vmgateway-access-control.jpg
> -share/doc/vmetrics/vmgateway-overview.jpeg
> -share/doc/vmetrics/vmgateway-rate-limiting.jpg
> +share/doc/vmetrics/vmgateway-access-control.webp
> +share/doc/vmetrics/vmgateway-overview.webp
> +share/doc/vmetrics/vmgateway-rate-limiting.webp
>  share/doc/vmetrics/vmgateway.md
>  share/doc/vmetrics/vmrestore.md
>  @mode 0755