Attachment #235377 for bug #265330




PORTNAME=	grafana
DISTVERSIONPREFIX=	v
DISTVERSION=	8.5.9
PORTREVISION=	2
CATEGORIES=	www
MASTER_SITES=	https://dl.grafana.com/oss/release/:public
PKGNAMESUFFIX=	${DISTVERSION:C/([0-9]).*/\1/1}

USE_GITHUB=	yes

USE_RC_SUBR=	grafana
TAG=		2955d0b

GO_TARGET=	./pkg/cmd/grafana-server \
		./pkg/cmd/grafana-cli

		GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
		GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
		GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \
		GRAFANA_BUILDHASH=5bd4adfaadc76d1f26f7

GRAFANA_USER?=	grafana
GRAFANA_GROUP?=	grafana




TIMESTAMP = 1657871367
SHA256 (grafana-8.5.9.linux-amd64.tar.gz) = a37b1a788fd9853053101f77741611c82a8429146187ef8e35e90cf7c351d4ba
SIZE (grafana-8.5.9.linux-amd64.tar.gz) = 77789937
SHA256 (v0.3.6.tar.gz) = af49dbe70ab6b0eb31d69afd89c3260b82cb662607b66eac41b65d642faee6bb
SIZE (v0.3.6.tar.gz) = 22747
SHA256 (v0.7.3.tar.gz) = 9709c0e8eec3045832f9da81c7bcacf1a32774cb674efcd5662dd8b4d82f70c1
SIZE (v0.7.3.tar.gz) = 21163
SHA256 (v0.8.2.tar.gz) = 871cec6861f88b22fe36879e854872f960fae58a4e87d93c6c43d90558c8fc84
SIZE (v0.8.2.tar.gz) = 413897
SHA256 (grafana-grafana-v8.5.9_GH0.tar.gz) = 112d146f233e4c6c1813c2e30391148f6e8bf1fbe0b8c64f4338ed3b8549faa5
SIZE (grafana-grafana-v8.5.9_GH0.tar.gz) = 18801871
SHA256 (Azure-azure-sdk-for-go-v59.3.0_GH0.tar.gz) = 219e6cdb7b26dcb4bdac35de2f06abf9caa71810fe88395e692f42729c8e55f5
SIZE (Azure-azure-sdk-for-go-v59.3.0_GH0.tar.gz) = 46199521
SHA256 (Azure-azure-sdk-for-go-sdk-azcore-v0.22.0_GH0.tar.gz) = 7375ac472dc4a19c5ce4eb9e646c20d97a9802e68790dc968b49c7874177b331

Return to bug 265330

Lines 1-7 Link Here

(-)b/www/grafana8/Makefile (-4 / +3 lines)
1	PORTNAME= grafana	1	PORTNAME= grafana
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 8.5.4	3	DISTVERSION= 8.5.9
4	PORTREVISION= 2
5	CATEGORIES= www	4	CATEGORIES= www
6	MASTER_SITES= https://dl.grafana.com/oss/release/:public	5	MASTER_SITES= https://dl.grafana.com/oss/release/:public
7	PKGNAMESUFFIX= ${DISTVERSION:C/([0-9]).*/\1/1}	6	PKGNAMESUFFIX= ${DISTVERSION:C/([0-9]).*/\1/1}
Lines 23-29 USES= cpe go:modules Link Here
23	USE_GITHUB= yes	22	USE_GITHUB= yes
24		23
25	USE_RC_SUBR= grafana	24	USE_RC_SUBR= grafana
26	TAG= 78ee958	25	TAG= 2955d0b
27		26
28	GO_TARGET= ./pkg/cmd/grafana-server \	27	GO_TARGET= ./pkg/cmd/grafana-server \
29	./pkg/cmd/grafana-cli	28	./pkg/cmd/grafana-cli
Lines 38-44 SUB_LIST= GRAFANA_USER=${GRAFANA_USER} \ Link Here
38	GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \	37	GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
39	GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \	38	GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
40	GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \	39	GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \
41	GRAFANA_BUILDHASH=af8f3a231daca19ff375	40	GRAFANA_BUILDHASH=5bd4adfaadc76d1f26f7
42		41
43	GRAFANA_USER?= grafana	42	GRAFANA_USER?= grafana
44	GRAFANA_GROUP?= grafana	43	GRAFANA_GROUP?= grafana

Lines 1-14 Link Here

(-)b/www/grafana8/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1654067985	1	TIMESTAMP = 1657871367
2	SHA256 (grafana-8.5.4.linux-amd64.tar.gz) = 062abce1489c68c950476d8e3e92481f8ab51f43fa63814daadbc2f94bcfc57b	2	SHA256 (grafana-8.5.9.linux-amd64.tar.gz) = a37b1a788fd9853053101f77741611c82a8429146187ef8e35e90cf7c351d4ba
3	SIZE (grafana-8.5.4.linux-amd64.tar.gz) = 77784707	3	SIZE (grafana-8.5.9.linux-amd64.tar.gz) = 77789937
4	SHA256 (v0.3.6.tar.gz) = af49dbe70ab6b0eb31d69afd89c3260b82cb662607b66eac41b65d642faee6bb	4	SHA256 (v0.3.6.tar.gz) = af49dbe70ab6b0eb31d69afd89c3260b82cb662607b66eac41b65d642faee6bb
5	SIZE (v0.3.6.tar.gz) = 22747	5	SIZE (v0.3.6.tar.gz) = 22747
6	SHA256 (v0.7.3.tar.gz) = 9709c0e8eec3045832f9da81c7bcacf1a32774cb674efcd5662dd8b4d82f70c1	6	SHA256 (v0.7.3.tar.gz) = 9709c0e8eec3045832f9da81c7bcacf1a32774cb674efcd5662dd8b4d82f70c1
7	SIZE (v0.7.3.tar.gz) = 21163	7	SIZE (v0.7.3.tar.gz) = 21163
8	SHA256 (v0.8.2.tar.gz) = 871cec6861f88b22fe36879e854872f960fae58a4e87d93c6c43d90558c8fc84	8	SHA256 (v0.8.2.tar.gz) = 871cec6861f88b22fe36879e854872f960fae58a4e87d93c6c43d90558c8fc84
9	SIZE (v0.8.2.tar.gz) = 413897	9	SIZE (v0.8.2.tar.gz) = 413897
10	SHA256 (grafana-grafana-v8.5.4_GH0.tar.gz) = cdcfe87834a6fd4bdaab73ada4765b1ee80fc8bf157321ae90ce9bc23c15642b	10	SHA256 (grafana-grafana-v8.5.9_GH0.tar.gz) = 112d146f233e4c6c1813c2e30391148f6e8bf1fbe0b8c64f4338ed3b8549faa5
11	SIZE (grafana-grafana-v8.5.4_GH0.tar.gz) = 18790859	11	SIZE (grafana-grafana-v8.5.9_GH0.tar.gz) = 18801871
12	SHA256 (Azure-azure-sdk-for-go-v59.3.0_GH0.tar.gz) = 219e6cdb7b26dcb4bdac35de2f06abf9caa71810fe88395e692f42729c8e55f5	12	SHA256 (Azure-azure-sdk-for-go-v59.3.0_GH0.tar.gz) = 219e6cdb7b26dcb4bdac35de2f06abf9caa71810fe88395e692f42729c8e55f5
13	SIZE (Azure-azure-sdk-for-go-v59.3.0_GH0.tar.gz) = 46199521	13	SIZE (Azure-azure-sdk-for-go-v59.3.0_GH0.tar.gz) = 46199521
14	SHA256 (Azure-azure-sdk-for-go-sdk-azcore-v0.22.0_GH0.tar.gz) = 7375ac472dc4a19c5ce4eb9e646c20d97a9802e68790dc968b49c7874177b331	14	SHA256 (Azure-azure-sdk-for-go-sdk-azcore-v0.22.0_GH0.tar.gz) = 7375ac472dc4a19c5ce4eb9e646c20d97a9802e68790dc968b49c7874177b331

Lines 546-551 bin/grafana-server Link Here

(-)b/www/grafana8/pkg-plist (+2 lines)
546	%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.tsx	546	%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.tsx
547	%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/CloudConditionsStep.tsx	547	%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/CloudConditionsStep.tsx
548	%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/CloudRulesSourcePicker.tsx	548	%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/CloudRulesSourcePicker.tsx
		549	%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/ConditionField.test.tsx
549	%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/ConditionField.tsx	550	%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/ConditionField.tsx
550	%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx	551	%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
551	%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/ExpressionEditor.tsx	552	%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/ExpressionEditor.tsx
Lines 2209-2214 bin/grafana-server Link Here
2209	%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/v1Alerts.json	2210	%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/v1Alerts.json
2210	%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/vMInsightsRG.json	2211	%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/vMInsightsRG.json
2211	%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/vMInsightsWorkspace.json	2212	%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/vMInsightsWorkspace.json
		2213	%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.test.ts
2212	%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts	2214	%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts
2213	%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/grafanaTemplateVariableFns.ts	2215	%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/grafanaTemplateVariableFns.ts
2214	%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/grafanaTemplateVariables.test.ts	2216	%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/grafanaTemplateVariables.test.ts