Index: branches/2020Q4/net-mgmt/prometheus2/Makefile
===================================================================
--- branches/2020Q4/net-mgmt/prometheus2/Makefile	(revision 553418)
+++ branches/2020Q4/net-mgmt/prometheus2/Makefile	(revision 553419)
@@ -1,96 +1,94 @@
 # $FreeBSD$
 
 PORTNAME=	prometheus
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.21.0
+DISTVERSION=	2.22.0
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	dor.bsd@xm0.uk
 COMMENT=	Systems monitoring and alerting toolkit
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules gmake
 
 USE_GITHUB=	yes
 GH_TUPLE=	ports-assets:net-mgmt_prometheus2:${DISTVERSIONFULL}:assets
-
 USE_RC_SUBR=	prometheus
 
-OPTIONS_DEFINE=	DOCS
+GO_BUILDFLAGS=	-v -ldflags "${LD_FLAG_STRING}" -tags netgo,builtinassets
+GO_TARGET=	./cmd/prometheus \
+		./cmd/promtool
 
-PROMETHEUS_USER?=	prometheus
-PROMETHEUS_GROUP?=	prometheus
-
-USERS=		${PROMETHEUS_USER}
-GROUPS=		${PROMETHEUS_GROUP}
-
-PROMETHEUS_SHARE_DIR=			${DATADIR}
-PROMETHEUS_CONSOLES_DIR=		${PROMETHEUS_SHARE_DIR}/consoles
-PROMETHEUS_CONSOLE_LIBRARIES_DIR=	${PROMETHEUS_SHARE_DIR}/console_libraries
-PROMETHEUS_DB_DIR=			/var/db/${PORTNAME}
-PROMETHEUS_LOG_DIR=			/var/log/prometheus
-PROMETHEUS_LOG_FILE=			${PROMETHEUS_LOG_DIR}/prometheus.log
-
 SUB_FILES=	prometheus
 
 SUB_LIST+=	PROMETHEUS_USER=${PROMETHEUS_USER} \
 		PROMETHEUS_GROUP=${PROMETHEUS_GROUP} \
 		PROMETHEUS_CONSOLE_LIBRARIES_DIR=${PROMETHEUS_CONSOLE_LIBRARIES_DIR} \
 		PROMETHEUS_CONSOLES_DIR=${PROMETHEUS_CONSOLES_DIR} \
 		PROMETHEUS_DB_DIR=${PROMETHEUS_DB_DIR} \
 		PROMETHEUS_LOG_DIR=${PROMETHEUS_LOG_DIR} \
 		PROMETHEUS_LOG_FILE=${PROMETHEUS_LOG_FILE} \
 		PROMETHEUS_SHARE_DIR=${PROMETHEUS_SHARE_DIR}
 
+USERS=		${PROMETHEUS_USER}
+GROUPS=		${PROMETHEUS_GROUP}
+
 PLIST_SUB+=	PORTNAME=${PORTNAME} \
 		PROMETHEUS_CONSOLE_LIBRARIES_DIR=${PROMETHEUS_CONSOLE_LIBRARIES_DIR} \
 		PROMETHEUS_CONSOLES_DIR=${PROMETHEUS_CONSOLES_DIR} \
 		PROMETHEUS_DB_DIR=${PROMETHEUS_DB_DIR} \
 		PROMETHEUS_LOG_DIR=${PROMETHEUS_LOG_DIR}
 
+OPTIONS_DEFINE=	DOCS
+
 BUILD_USER?=	${USER}
-LD_FLAG_X_PREFIX=	-X github.com/prometheus/common/version
 LD_FLAG_STRING=		-s \
 		${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \
 		${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \
 		${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \
 		${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER} \
 		${LD_FLAG_X_PREFIX}.BuildDate=${SOURCE_DATE_EPOCH:U${SOURCE_DATE_EPOCH_CMD:sh}}
+LD_FLAG_X_PREFIX=	-X github.com/prometheus/common/version
 
-GO_BUILDFLAGS=	-v -ldflags "${LD_FLAG_STRING}" -tags netgo,builtinassets
+PROMETHEUS_USER?=	prometheus
+PROMETHEUS_GROUP?=	prometheus
 
-GO_TARGET=	./cmd/prometheus \
-		./cmd/promtool
+PROMETHEUS_CONSOLES_DIR=		${PROMETHEUS_SHARE_DIR}/consoles
+PROMETHEUS_CONSOLE_LIBRARIES_DIR=	${PROMETHEUS_SHARE_DIR}/console_libraries
+PROMETHEUS_DB_DIR=			/var/db/${PORTNAME}
+PROMETHEUS_LOG_DIR=			/var/log/prometheus
+PROMETHEUS_LOG_FILE=			${PROMETHEUS_LOG_DIR}/prometheus.log
+PROMETHEUS_SHARE_DIR=			${DATADIR}
 
 # Bring DISTINFO_FILE into scope so we can get the timestamp.
 .include <bsd.port.pre.mk>
 
 SOURCE_DATE_EPOCH_CMD=	date -ur $$(${GREP} TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') '+%Y%m%d-%T'
 
 post-patch:
 	@${LN} -s ${WRKSRC_assets}/web/ui/assets_vfsdata.go \
 		${WRKSRC}/web/ui/assets_vfadata.go
 
 post-install:
 	${INSTALL_DATA} \
 		${WRKSRC}/documentation/examples/prometheus.yml \
 		${STAGEDIR}${LOCALBASE}/etc/prometheus.yml.sample
 	@${MKDIR} ${STAGEDIR}${DESTDIR}${PROMETHEUS_DB_DIR}
 	@${MKDIR} ${STAGEDIR}${DESTDIR}${PROMETHEUS_CONSOLES_DIR}
 	@${MKDIR} ${STAGEDIR}${DESTDIR}${PROMETHEUS_CONSOLE_LIBRARIES_DIR}
 	@${MKDIR} ${STAGEDIR}${PROMETHEUS_LOG_DIR}
 	( cd ${WRKSRC}/console_libraries \
 		&& ${COPYTREE_SHARE} . ${STAGEDIR}${PROMETHEUS_CONSOLE_LIBRARIES_DIR} \
 	)
 	( cd ${WRKSRC}/consoles \
 		&& ${COPYTREE_SHARE} . ${STAGEDIR}${PROMETHEUS_CONSOLES_DIR} \
 	)
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
Index: branches/2020Q4/net-mgmt/prometheus2/distinfo
===================================================================
--- branches/2020Q4/net-mgmt/prometheus2/distinfo	(revision 553418)
+++ branches/2020Q4/net-mgmt/prometheus2/distinfo	(revision 553419)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1599842589
-SHA256 (prometheus-prometheus-v2.21.0_GH0.tar.gz) = afafed1be631a53ada60e2b2f12cfdb51dcaee5e539fb65e9983f3276c99f5af
-SIZE (prometheus-prometheus-v2.21.0_GH0.tar.gz) = 13971178
-SHA256 (ports-assets-net-mgmt_prometheus2-v2.21.0_GH0.tar.gz) = 76541ed9d617053599f1dfddc1330f4a65dcdee5a9e0f722a820eeb0d1b44f2c
-SIZE (ports-assets-net-mgmt_prometheus2-v2.21.0_GH0.tar.gz) = 5062460
+TIMESTAMP = 1603707479
+SHA256 (prometheus-prometheus-v2.22.0_GH0.tar.gz) = 9390cbd338d253956184d0f0a6719d21cb5719f0319fc48ee08d5bd48fc87cc2
+SIZE (prometheus-prometheus-v2.22.0_GH0.tar.gz) = 14140650
+SHA256 (ports-assets-net-mgmt_prometheus2-v2.22.0_GH0.tar.gz) = 3afe554702ff6375dfa10fa047e0e0a02449215dbd9ac42162a5a6b4c23122f3
+SIZE (ports-assets-net-mgmt_prometheus2-v2.22.0_GH0.tar.gz) = 5063407
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 553418)
+++ branches/2020Q4	(revision 553419)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r553369