Index: head/net-mgmt/prometheus2/Makefile =================================================================== --- head/net-mgmt/prometheus2/Makefile (revision 506699) +++ head/net-mgmt/prometheus2/Makefile (revision 506700) @@ -1,85 +1,84 @@ # $FreeBSD$ PORTNAME= prometheus DISTVERSIONPREFIX= v -DISTVERSION= 2.10.0 +DISTVERSION= 2.11.0 CATEGORIES= net-mgmt MAINTAINER= dor.bsd@xm0.uk COMMENT= Systems monitoring and alerting toolkit LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go gmake +USES= go:modules gmake USE_GITHUB= yes USE_RC_SUBR= prometheus GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} +OPTIONS_DEFINE= DOCS + PROMETHEUS_USER?= prometheus PROMETHEUS_GROUP?= prometheus USERS= ${PROMETHEUS_USER} GROUPS= ${PROMETHEUS_GROUP} PROMETHEUS_BINARIES= prometheus promtool 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 ${GO_PKGNAME}/vendor/${GO_PKGNAME:H}/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} + GO_BUILDFLAGS= -v -ldflags "${LD_FLAG_STRING}" +GO_TARGET= ${PROMETHEUS_BINARIES:S/^/.\/cmd\//} -do-build: -.for bin in ${PROMETHEUS_BINARIES} - ( cd ${GO_WRKSRC}/cmd/${bin} ; \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} \ - ${GO_CMD} install ${GO_BUILDFLAGS} ) -.endfor - -do-install: -.for bin in ${PROMETHEUS_BINARIES} - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${bin} ${STAGEDIR}${PREFIX}/bin -.endfor +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 Index: head/net-mgmt/prometheus2/distinfo =================================================================== --- head/net-mgmt/prometheus2/distinfo (revision 506699) +++ head/net-mgmt/prometheus2/distinfo (revision 506700) @@ -1,3 +1,3 @@ -TIMESTAMP = 1558923211 -SHA256 (prometheus-prometheus-v2.10.0_GH0.tar.gz) = 0362f4aa2fb44cc2c572df140da742bdf99fe9f338157a83f6634694fd693000 -SIZE (prometheus-prometheus-v2.10.0_GH0.tar.gz) = 11752395 +TIMESTAMP = 1562676113 +SHA256 (prometheus-prometheus-v2.11.0_GH0.tar.gz) = b83f490a59292f00ab9679b008e2876ccc3a0c153916e2c141566395c7dcc7ee +SIZE (prometheus-prometheus-v2.11.0_GH0.tar.gz) = 12133603 Index: head/net-mgmt/prometheus2/pkg-message =================================================================== --- head/net-mgmt/prometheus2/pkg-message (revision 506699) +++ head/net-mgmt/prometheus2/pkg-message (revision 506700) @@ -1,3 +1,44 @@ +[ +{ + message: <