Index: branches/2020Q3/net-mgmt/prometheus2/Makefile =================================================================== --- branches/2020Q3/net-mgmt/prometheus2/Makefile (revision 542135) +++ branches/2020Q3/net-mgmt/prometheus2/Makefile (revision 542136) @@ -1,93 +1,99 @@ # $FreeBSD$ PORTNAME= prometheus DISTVERSIONPREFIX= v -DISTVERSION= 2.19.1 +DISTVERSION= 2.19.2 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 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} 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} 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}.BuildUser=${BUILD_USER} \ + ${LD_FLAG_X_PREFIX}.BuildDate=${SOURCE_DATE_EPOCH:U${SOURCE_DATE_EPOCH_CMD:sh}} GO_BUILDFLAGS= -v -ldflags "${LD_FLAG_STRING}" -tags netgo,builtinassets # A tsdb binary already exists in databases/opentsdb. Rename ours to # avoid issues. GO_TARGET= ./cmd/prometheus \ ./cmd/promtool \ ./tsdb/cmd/tsdb:promtsdb +# Bring DISTINFO_FILE into scope so we can get the timestamp. +.include + +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 +.include Index: branches/2020Q3/net-mgmt/prometheus2/distinfo =================================================================== --- branches/2020Q3/net-mgmt/prometheus2/distinfo (revision 542135) +++ branches/2020Q3/net-mgmt/prometheus2/distinfo (revision 542136) @@ -1,5 +1,5 @@ -TIMESTAMP = 1592772011 -SHA256 (prometheus-prometheus-v2.19.1_GH0.tar.gz) = b72b9b6bdbae246dcc29ef354d429425eb3c0a6e1596fc8b29b502578a4ce045 -SIZE (prometheus-prometheus-v2.19.1_GH0.tar.gz) = 13343138 -SHA256 (ports-assets-net-mgmt_prometheus2-v2.19.1_GH0.tar.gz) = d4a688dae5116d4df8d4c98d7c193faacde70b9f4055e8ed9cefb7f6aac0639f -SIZE (ports-assets-net-mgmt_prometheus2-v2.19.1_GH0.tar.gz) = 5034530 +TIMESTAMP = 1594572798 +SHA256 (prometheus-prometheus-v2.19.2_GH0.tar.gz) = d4e84cae2fed6761bb8a80fcc69b6e0e9f274d19dffc0f38fb5845f11da1bbc3 +SIZE (prometheus-prometheus-v2.19.2_GH0.tar.gz) = 13338606 +SHA256 (ports-assets-net-mgmt_prometheus2-v2.19.2_GH0.tar.gz) = c95b017152c74d489b608a4689493ebd66b18ad3d1c5451310c2773c18a3bc10 +SIZE (ports-assets-net-mgmt_prometheus2-v2.19.2_GH0.tar.gz) = 5034529 Index: branches/2020Q3 =================================================================== --- branches/2020Q3 (revision 542135) +++ branches/2020Q3 (revision 542136) Property changes on: branches/2020Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r542135