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

Collapse All | Expand All

(-)Makefile (-20 / +18 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	prometheus
3
PORTNAME=	prometheus
4
DISTVERSIONPREFIX=	v
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	2.21.0
5
DISTVERSION=	2.22.0
6
CATEGORIES=	net-mgmt
6
CATEGORIES=	net-mgmt
7
7
8
MAINTAINER=	dor.bsd@xm0.uk
8
MAINTAINER=	dor.bsd@xm0.uk
Lines 15-38 Link Here
15
15
16
USE_GITHUB=	yes
16
USE_GITHUB=	yes
17
GH_TUPLE=	ports-assets:net-mgmt_prometheus2:${DISTVERSIONFULL}:assets
17
GH_TUPLE=	ports-assets:net-mgmt_prometheus2:${DISTVERSIONFULL}:assets
18
19
USE_RC_SUBR=	prometheus
18
USE_RC_SUBR=	prometheus
20
19
21
OPTIONS_DEFINE=	DOCS
20
GO_BUILDFLAGS=	-v -ldflags "${LD_FLAG_STRING}" -tags netgo,builtinassets
21
GO_TARGET=	./cmd/prometheus \
22
		./cmd/promtool
22
23
23
PROMETHEUS_USER?=	prometheus
24
PROMETHEUS_GROUP?=	prometheus
25
26
USERS=		${PROMETHEUS_USER}
27
GROUPS=		${PROMETHEUS_GROUP}
28
29
PROMETHEUS_SHARE_DIR=			${DATADIR}
30
PROMETHEUS_CONSOLES_DIR=		${PROMETHEUS_SHARE_DIR}/consoles
31
PROMETHEUS_CONSOLE_LIBRARIES_DIR=	${PROMETHEUS_SHARE_DIR}/console_libraries
32
PROMETHEUS_DB_DIR=			/var/db/${PORTNAME}
33
PROMETHEUS_LOG_DIR=			/var/log/prometheus
34
PROMETHEUS_LOG_FILE=			${PROMETHEUS_LOG_DIR}/prometheus.log
35
36
SUB_FILES=	prometheus
24
SUB_FILES=	prometheus
37
25
38
SUB_LIST+=	PROMETHEUS_USER=${PROMETHEUS_USER} \
26
SUB_LIST+=	PROMETHEUS_USER=${PROMETHEUS_USER} \
Lines 44-49 Link Here
44
		PROMETHEUS_LOG_FILE=${PROMETHEUS_LOG_FILE} \
32
		PROMETHEUS_LOG_FILE=${PROMETHEUS_LOG_FILE} \
45
		PROMETHEUS_SHARE_DIR=${PROMETHEUS_SHARE_DIR}
33
		PROMETHEUS_SHARE_DIR=${PROMETHEUS_SHARE_DIR}
46
34
35
USERS=		${PROMETHEUS_USER}
36
GROUPS=		${PROMETHEUS_GROUP}
37
47
PLIST_SUB+=	PORTNAME=${PORTNAME} \
38
PLIST_SUB+=	PORTNAME=${PORTNAME} \
48
		PROMETHEUS_CONSOLE_LIBRARIES_DIR=${PROMETHEUS_CONSOLE_LIBRARIES_DIR} \
39
		PROMETHEUS_CONSOLE_LIBRARIES_DIR=${PROMETHEUS_CONSOLE_LIBRARIES_DIR} \
49
		PROMETHEUS_CONSOLES_DIR=${PROMETHEUS_CONSOLES_DIR} \
40
		PROMETHEUS_CONSOLES_DIR=${PROMETHEUS_CONSOLES_DIR} \
Lines 50-57 Link Here
50
		PROMETHEUS_DB_DIR=${PROMETHEUS_DB_DIR} \
41
		PROMETHEUS_DB_DIR=${PROMETHEUS_DB_DIR} \
51
		PROMETHEUS_LOG_DIR=${PROMETHEUS_LOG_DIR}
42
		PROMETHEUS_LOG_DIR=${PROMETHEUS_LOG_DIR}
52
43
44
OPTIONS_DEFINE=	DOCS
45
53
BUILD_USER?=	${USER}
46
BUILD_USER?=	${USER}
54
LD_FLAG_X_PREFIX=	-X github.com/prometheus/common/version
55
LD_FLAG_STRING=		-s \
47
LD_FLAG_STRING=		-s \
56
		${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \
48
		${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \
57
		${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \
49
		${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \
Lines 58-68 Link Here
58
		${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \
50
		${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \
59
		${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER} \
51
		${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER} \
60
		${LD_FLAG_X_PREFIX}.BuildDate=${SOURCE_DATE_EPOCH:U${SOURCE_DATE_EPOCH_CMD:sh}}
52
		${LD_FLAG_X_PREFIX}.BuildDate=${SOURCE_DATE_EPOCH:U${SOURCE_DATE_EPOCH_CMD:sh}}
53
LD_FLAG_X_PREFIX=	-X github.com/prometheus/common/version
61
54
62
GO_BUILDFLAGS=	-v -ldflags "${LD_FLAG_STRING}" -tags netgo,builtinassets
55
PROMETHEUS_USER?=	prometheus
56
PROMETHEUS_GROUP?=	prometheus
63
57
64
GO_TARGET=	./cmd/prometheus \
58
PROMETHEUS_CONSOLES_DIR=		${PROMETHEUS_SHARE_DIR}/consoles
65
		./cmd/promtool
59
PROMETHEUS_CONSOLE_LIBRARIES_DIR=	${PROMETHEUS_SHARE_DIR}/console_libraries
60
PROMETHEUS_DB_DIR=			/var/db/${PORTNAME}
61
PROMETHEUS_LOG_DIR=			/var/log/prometheus
62
PROMETHEUS_LOG_FILE=			${PROMETHEUS_LOG_DIR}/prometheus.log
63
PROMETHEUS_SHARE_DIR=			${DATADIR}
66
64
67
# Bring DISTINFO_FILE into scope so we can get the timestamp.
65
# Bring DISTINFO_FILE into scope so we can get the timestamp.
68
.include <bsd.port.pre.mk>
66
.include <bsd.port.pre.mk>
(-)distinfo (-5 / +5 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1599842589
1
TIMESTAMP = 1603707479
2
SHA256 (prometheus-prometheus-v2.21.0_GH0.tar.gz) = afafed1be631a53ada60e2b2f12cfdb51dcaee5e539fb65e9983f3276c99f5af
2
SHA256 (prometheus-prometheus-v2.22.0_GH0.tar.gz) = 9390cbd338d253956184d0f0a6719d21cb5719f0319fc48ee08d5bd48fc87cc2
3
SIZE (prometheus-prometheus-v2.21.0_GH0.tar.gz) = 13971178
3
SIZE (prometheus-prometheus-v2.22.0_GH0.tar.gz) = 14140650
4
SHA256 (ports-assets-net-mgmt_prometheus2-v2.21.0_GH0.tar.gz) = 76541ed9d617053599f1dfddc1330f4a65dcdee5a9e0f722a820eeb0d1b44f2c
4
SHA256 (ports-assets-net-mgmt_prometheus2-v2.22.0_GH0.tar.gz) = 3afe554702ff6375dfa10fa047e0e0a02449215dbd9ac42162a5a6b4c23122f3
5
SIZE (ports-assets-net-mgmt_prometheus2-v2.21.0_GH0.tar.gz) = 5062460
5
SIZE (ports-assets-net-mgmt_prometheus2-v2.22.0_GH0.tar.gz) = 5063407

Return to bug 250630