View | Details | Raw Unified | Return to bug 281851 | Differences between
and this patch

Collapse All | Expand All

(-)b/www/grafana/Makefile (-8 / +21 lines)
Lines 1-13 Link Here
1
PORTNAME=	grafana
1
PORTNAME=	grafana
2
DISTVERSIONPREFIX=	v
2
DISTVERSIONPREFIX=	v
3
DISTVERSION=	10.4.5
3
DISTVERSION=	11.2.2
4
PORTREVISION=	1
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
		https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
6
		https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
8
DISTFILES=	grafana-${DISTVERSION}.linux-amd64${EXTRACT_SUFX}:public \
7
DISTFILES=	grafana-${DISTVERSION}.linux-amd64${EXTRACT_SUFX}:public \
9
		go.mod:gomod \
8
		go.mod:gomod \
9
		go.work:gomod \
10
		pkg/apimachinery/go.mod:gomod \
11
		pkg/apiserver/go.mod:gomod \
12
		pkg/build/go.mod:gomod \
13
		pkg/build/wire/go.mod:gomod \
14
		pkg/promlib/go.mod:gomod \
15
		pkg/semconv/go.mod:gomod \
16
		pkg/storage/unified/resource/go.mod:gomod \
10
		pkg/util/xorm/go.mod:gomod
17
		pkg/util/xorm/go.mod:gomod
18
EXTRACT_ONLY=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//:Ngo.work}
11
19
12
MAINTAINER=	drtr0jan@yandex.ru
20
MAINTAINER=	drtr0jan@yandex.ru
13
COMMENT=	Dashboard and graph editor for multiple data stores
21
COMMENT=	Dashboard and graph editor for multiple data stores
Lines 22-33 ONLY_FOR_ARCHS= aarch64 amd64 i386 riscv64 Link Here
22
BUILD_DEPENDS=	wire:devel/go-wire
30
BUILD_DEPENDS=	wire:devel/go-wire
23
RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
31
RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
24
32
25
USES=		cpe go:1.21,modules
33
USES=		cpe go:1.22,modules
26
34
27
USE_GITHUB=	yes
35
USE_GITHUB=	yes
28
36
29
USE_RC_SUBR=	grafana
37
USE_RC_SUBR=	grafana
30
TAG=		17cbd42
38
TAG=		086b47f
31
39
32
GO_MODULE=	github.com/grafana/grafana
40
GO_MODULE=	github.com/grafana/grafana
33
GO_TARGET=	./pkg/cmd/grafana \
41
GO_TARGET=	./pkg/cmd/grafana \
Lines 59-64 GRAFANA_LOGDIR?= /var/log/${PORTNAME} Link Here
59
GRAFANA_PLUGINDIR?=		${GRAFANA_DATADIR}/plugins
67
GRAFANA_PLUGINDIR?=		${GRAFANA_DATADIR}/plugins
60
GRAFANA_PROVISIONINGDIR?=	${ETCDIR}/provisioning
68
GRAFANA_PROVISIONINGDIR?=	${ETCDIR}/provisioning
61
69
70
# Disable some master port targets
71
TARGET_ORDER_OVERRIDE=	-1:go-post-extract
72
73
post-extract:
74
	@${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies";
75
	@(cd ${GO_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e)
76
	@${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies";
77
	@(cd ${GO_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} work vendor -e)
78
62
post-patch:
79
post-patch:
63
	@${REINPLACE_CMD} \
80
	@${REINPLACE_CMD} \
64
		-e 's|;data = /var/lib/grafana|data = ${GRAFANA_DATADIR}|g' \
81
		-e 's|;data = /var/lib/grafana|data = ${GRAFANA_DATADIR}|g' \
Lines 82-91 post-install: Link Here
82
.endfor
99
.endfor
83
	${MKDIR} ${STAGEDIR}${GRAFANA_LOGDIR}
100
	${MKDIR} ${STAGEDIR}${GRAFANA_LOGDIR}
84
	( cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} && ${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR} )
101
	( cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} && ${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR} )
85
.for dir in input-datasource
86
	${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}/plugins-bundled/internal/${dir}
87
	( cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}/plugins-bundled/internal/${dir}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${GRAFANA_HOMEDIR}/plugins-bundled/internal/${dir} )
88
.endfor
89
	${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${STAGEDIR}${GRAFANA_HOMEDIR}/conf/defaults.ini
102
	${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${STAGEDIR}${GRAFANA_HOMEDIR}/conf/defaults.ini
90
	${INSTALL_DATA} ${WRKSRC}/conf/sample.ini ${STAGEDIR}${ETCDIR}/grafana.ini.sample
103
	${INSTALL_DATA} ${WRKSRC}/conf/sample.ini ${STAGEDIR}${ETCDIR}/grafana.ini.sample
91
	${INSTALL_DATA} ${WRKSRC}/conf/ldap.toml ${STAGEDIR}${ETCDIR}/ldap.toml.sample
104
	${INSTALL_DATA} ${WRKSRC}/conf/ldap.toml ${STAGEDIR}${ETCDIR}/ldap.toml.sample
(-)b/www/grafana/distinfo (-9 / +25 lines)
Lines 1-9 Link Here
1
TIMESTAMP = 1720812688
1
TIMESTAMP = 1728051469
2
SHA256 (go/www_grafana/grafana-grafana-v10.4.5_GH0/grafana-10.4.5.linux-amd64.tar.gz) = 20089e2fb313df92249c6892d00577318e00defd43a31e5ddcefda9f02b4914e
2
SHA256 (go/www_grafana/grafana-grafana-v11.2.2_GH0/grafana-11.2.2.linux-amd64.tar.gz) = 860197db2000579589b02fbce724af5d008289efd208637f56ea311bdb726cfa
3
SIZE (go/www_grafana/grafana-grafana-v10.4.5_GH0/grafana-10.4.5.linux-amd64.tar.gz) = 119510444
3
SIZE (go/www_grafana/grafana-grafana-v11.2.2_GH0/grafana-11.2.2.linux-amd64.tar.gz) = 128879414
4
SHA256 (go/www_grafana/grafana-grafana-v10.4.5_GH0/go.mod) = 4f295efaef23d3e1d3e72fce4f826bf1f7cafca84d82778d05f99c179ae9714c
4
SHA256 (go/www_grafana/grafana-grafana-v11.2.2_GH0/go.mod) = a2a7162df2898cde2b53f63c3a6f0b572f44d18f2c787ff4c0597340435e551b
5
SIZE (go/www_grafana/grafana-grafana-v10.4.5_GH0/go.mod) = 30926
5
SIZE (go/www_grafana/grafana-grafana-v11.2.2_GH0/go.mod) = 31234
6
SHA256 (go/www_grafana/grafana-grafana-v10.4.5_GH0/pkg/util/xorm/go.mod) = 3d10f62daeec5bdd173ecade9841919787ff706fb8f286c90a423cd82a44ac5f
6
SHA256 (go/www_grafana/grafana-grafana-v11.2.2_GH0/go.work) = b35039a196acd5334edb1bfefa6530b400de54ca52e11a8f21927d5e596ef56a
7
SIZE (go/www_grafana/grafana-grafana-v10.4.5_GH0/pkg/util/xorm/go.mod) = 184
7
SIZE (go/www_grafana/grafana-grafana-v11.2.2_GH0/go.work) = 710
8
SHA256 (go/www_grafana/grafana-grafana-v10.4.5_GH0/grafana-grafana-v10.4.5_GH0.tar.gz) = 864ca27ccf7c2fcd19a9cc5f6eafa32a44df9cf54b50046c4a1306884d4b9196
8
SHA256 (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/apimachinery/go.mod) = c0b1f23e03932d4651ea92d67688090e74e07e5d5001b46900fc180690db4a7f
9
SIZE (go/www_grafana/grafana-grafana-v10.4.5_GH0/grafana-grafana-v10.4.5_GH0.tar.gz) = 29162880
9
SIZE (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/apimachinery/go.mod) = 2100
10
SHA256 (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/apiserver/go.mod) = 590203f0dda50a27a3b37bd89f7a596c913e7d917b17b2877e70a31c064af139
11
SIZE (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/apiserver/go.mod) = 3716
12
SHA256 (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/build/go.mod) = 9522562cb9528a661701644b852a424eec6ee336a9388e79cc6a812bff5c397b
13
SIZE (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/build/go.mod) = 7687
14
SHA256 (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/build/wire/go.mod) = 058be5d6b6e8ed9e7fa1e1d2ca15993c43f4f07123389c1ed95904b174035daf
15
SIZE (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/build/wire/go.mod) = 329
16
SHA256 (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/promlib/go.mod) = bc69e2100ee45c05ad1c79db0b51df63166ea193b12d0fade34410578c2dd9e8
17
SIZE (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/promlib/go.mod) = 6814
18
SHA256 (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/semconv/go.mod) = 103f891d36b1ab0605701accfd6d1777dbf938fdb5cd58e76485b337531c3931
19
SIZE (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/semconv/go.mod) = 269
20
SHA256 (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/storage/unified/resource/go.mod) = 60715b2775e893c3066a7552329626248b713ce619afdb2fc09b872ecc17b2d5
21
SIZE (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/storage/unified/resource/go.mod) = 2933
22
SHA256 (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/util/xorm/go.mod) = 4f68d456ac4893fd6111b282fbc59a677b22574df085a797dedb37b475f7aa92
23
SIZE (go/www_grafana/grafana-grafana-v11.2.2_GH0/pkg/util/xorm/go.mod) = 610
24
SHA256 (go/www_grafana/grafana-grafana-v11.2.2_GH0/grafana-grafana-v11.2.2_GH0.tar.gz) = 223dc284b8fa03641154aaee3b35f77515b04b3b076a0db887e0b0498b1be7d9
25
SIZE (go/www_grafana/grafana-grafana-v11.2.2_GH0/grafana-grafana-v11.2.2_GH0.tar.gz) = 33767356
(-)b/www/grafana/pkg-plist (-6 lines)
Lines 4-14 bin/grafana-server Link Here
4
@sample %%ETCDIR%%/grafana.ini.sample
4
@sample %%ETCDIR%%/grafana.ini.sample
5
@sample %%ETCDIR%%/ldap.toml.sample
5
@sample %%ETCDIR%%/ldap.toml.sample
6
%%DATADIR%%/conf/defaults.ini
6
%%DATADIR%%/conf/defaults.ini
7
%%DATADIR%%/plugins-bundled/internal/input-datasource/README.md
8
%%DATADIR%%/plugins-bundled/internal/input-datasource/img/input.svg
9
%%DATADIR%%/plugins-bundled/internal/input-datasource/module.js
10
%%DATADIR%%/plugins-bundled/internal/input-datasource/module.js.map
11
%%DATADIR%%/plugins-bundled/internal/input-datasource/plugin.json
12
@owner %%GRAFANA_USER%%
7
@owner %%GRAFANA_USER%%
13
@group %%GRAFANA_GROUP%%
8
@group %%GRAFANA_GROUP%%
14
@mode 750
9
@mode 750
15
- 

Return to bug 281851