www/grafana9: update to 9.5.15

Changelog: * https://github.com/grafana/grafana/releases/tag/v9.5.15 * https://github.com/grafana/grafana/releases/tag/v9.5.14 * https://github.com/grafana/grafana/releases/tag/v9.5.13 * https://github.com/grafana/grafana/releases/tag/v9.5.12 * https://github.com/grafana/grafana/releases/tag/v9.5.10 * https://github.com/grafana/grafana/releases/tag/v9.5.9 * https://github.com/grafana/grafana/releases/tag/v9.5.8 PR: 275433
freebsd · Dec 21, 2023 · 082efed · 082efed
1 parent 3bc70fc
commit 082efed
Show file tree

Hide file tree

Showing 3 changed files with 516 additions and 517 deletions.
diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	grafana
 DISTVERSIONPREFIX=	v
-DISTVERSION=	9.5.7
-PORTREVISION=	3
+DISTVERSION=	9.5.15
 CATEGORIES=	www
 MASTER_SITES=	https://dl.grafana.com/oss/release/:public \
 		https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
@@ -26,7 +25,7 @@ USES=		cpe go:modules
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	grafana
-TAG=		d2bfe3c
+TAG=		5f5a096
 
 GO_MODULE=	github.com/grafana/grafana
 GO_TARGET=	./pkg/cmd/grafana \
@@ -65,8 +64,6 @@ do-extract: ${EXTRACT_WRKDIR}
 		${ECHO_MSG} "===>  Failed to extract \"${_DISTDIR}/${GRAFANA_SOURCES}\"."; \
 		exit 1; \
 	fi;
-	@${RM} -r ${WRKSRC}/public
-	@${RM} -r ${WRKSRC}/plugins-bundled
 	@if ! (cd ${EXTRACT_WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${GRAFANA_PREBUILT} ${EXTRACT_AFTER_ARGS});\
 	then \
 		${ECHO_MSG} "===>  Failed to extract \"${_DISTDIR}/${GRAFANA_PREBUILT}\"."; \
@@ -99,8 +96,11 @@ post-install:
 	${MKDIR} ${STAGEDIR}${GRAFANA_PROVISIONINGDIR}/${dir}
 .endfor
 	${MKDIR} ${STAGEDIR}${GRAFANA_LOGDIR}
-	( cd ${WRKSRC} && ${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR} )
-	( cd ${WRKSRC} && ${COPYTREE_SHARE} plugins-bundled/internal ${STAGEDIR}${GRAFANA_HOMEDIR} )
+	( cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} && ${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR} )
+.for dir in input-datasource
+	${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}/plugins-bundled/internal/${dir}
+	( cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}/plugins-bundled/internal/${dir}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${GRAFANA_HOMEDIR}/plugins-bundled/internal/${dir} )
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${STAGEDIR}${GRAFANA_HOMEDIR}/conf/defaults.ini
 	${INSTALL_DATA} ${WRKSRC}/conf/sample.ini ${STAGEDIR}${ETCDIR}/grafana.ini.sample
 

diff --git a/www/grafana9/distinfo b/www/grafana9/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1690362581
-SHA256 (go/www_grafana9/grafana-grafana-v9.5.7_GH0/grafana-9.5.7.linux-amd64.tar.gz) = 06fdaf6e3bb754a5c94d3ce38570b36209e0f22d519d0c8cef7b3e5dc2409a9f
-SIZE (go/www_grafana9/grafana-grafana-v9.5.7_GH0/grafana-9.5.7.linux-amd64.tar.gz) = 78953472
-SHA256 (go/www_grafana9/grafana-grafana-v9.5.7_GH0/go.mod) = b4083a56af482e5aec121b1c1b2088aeccf247b064177bb90216484c41fa6300
-SIZE (go/www_grafana9/grafana-grafana-v9.5.7_GH0/go.mod) = 20707
-SHA256 (go/www_grafana9/grafana-grafana-v9.5.7_GH0/grafana-grafana-v9.5.7_GH0.tar.gz) = c34e2f33fe78b3ea04e3eff55d5d8bf2dbac4e20f8b796e5879c24c7c0da2e3d
-SIZE (go/www_grafana9/grafana-grafana-v9.5.7_GH0/grafana-grafana-v9.5.7_GH0.tar.gz) = 26471953
+TIMESTAMP = 1703010153
+SHA256 (go/www_grafana9/grafana-grafana-v9.5.15_GH0/grafana-9.5.15.linux-amd64.tar.gz) = 0fff72266a0e26592c8213de549c3d6db7238076f7915ff2d774d6b8acaa987b
+SIZE (go/www_grafana9/grafana-grafana-v9.5.15_GH0/grafana-9.5.15.linux-amd64.tar.gz) = 87141838
+SHA256 (go/www_grafana9/grafana-grafana-v9.5.15_GH0/go.mod) = 222dfa53c805ec58092bccfe23adc6f74117ccb3b382b43f466cd7f4e979266d
+SIZE (go/www_grafana9/grafana-grafana-v9.5.15_GH0/go.mod) = 20476
+SHA256 (go/www_grafana9/grafana-grafana-v9.5.15_GH0/grafana-grafana-v9.5.15_GH0.tar.gz) = 98f2503bbfc11701fac1bb2c9161f79a8ec034cba534afb98cb438bbbb0570cc
+SIZE (go/www_grafana9/grafana-grafana-v9.5.15_GH0/grafana-grafana-v9.5.15_GH0.tar.gz) = 26347164