Index: head/net-mgmt/prometheus2/Makefile =================================================================== --- head/net-mgmt/prometheus2/Makefile (revision 480309) +++ head/net-mgmt/prometheus2/Makefile (revision 480310) @@ -1,99 +1,100 @@ # $FreeBSD$ PORTNAME= prometheus DISTVERSIONPREFIX= v DISTVERSION= 2.3.2 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= dor.bsd@xm0.uk COMMENT= Systems monitoring and alerting toolkit LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go gmake GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} USE_GITHUB= yes USE_RC_SUBR= prometheus OPTIONS_DEFINE= USE_SYSLOG OPTIONS_DEFAULT= USE_SYSLOG USE_SYSLOG_DESC= Install configuration files for syslog and newsyslog OPTIONS_SUB= yes 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 \ newsyslog.conf \ syslog.d.conf 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} do-build: .for bin in ${PROMETHEUS_BINARIES} ( cd ${GO_WRKSRC}/cmd/${bin} ; \ ${SETENV} ${MAKE_ENV} ${GO_ENV} \ ${GO_CMD} install -v -ldflags "${LD_FLAG_STRING}" ) .endfor do-install: .for bin in ${PROMETHEUS_BINARIES} ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${bin} ${STAGEDIR}${PREFIX}/bin .endfor ${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-USE_SYSLOG-on: @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} \ ${WRKDIR}/syslog.d.conf \ ${STAGEDIR}${ETCDIR}/syslog.d.conf.sample ${INSTALL_DATA} \ ${WRKDIR}/newsyslog.conf \ ${STAGEDIR}${ETCDIR}/newsyslog.conf.sample .include Index: head/net-mgmt/prometheus2/pkg-plist =================================================================== --- head/net-mgmt/prometheus2/pkg-plist (revision 480309) +++ head/net-mgmt/prometheus2/pkg-plist (revision 480310) @@ -1,16 +1,16 @@ bin/prometheus bin/promtool -%%USE_SYSLOG%%@sample %%ETCDIR%%/newsyslog.conf.sample etc/newsyslog.conf.d/%%PORTNAME%%.conf +%%USE_SYSLOG%%@sample %%ETCDIR%%/newsyslog.conf.sample /etc/newsyslog.conf.d/%%PORTNAME%%.conf %%USE_SYSLOG%%@sample %%ETCDIR%%/syslog.d.conf.sample /etc/syslog.d/%%PORTNAME%%.conf %%PROMETHEUS_CONSOLE_LIBRARIES_DIR%%/menu.lib %%PROMETHEUS_CONSOLE_LIBRARIES_DIR%%/prom.lib %%PROMETHEUS_CONSOLES_DIR%%/index.html.example %%PROMETHEUS_CONSOLES_DIR%%/node-cpu.html %%PROMETHEUS_CONSOLES_DIR%%/node-disk.html %%PROMETHEUS_CONSOLES_DIR%%/node-overview.html %%PROMETHEUS_CONSOLES_DIR%%/node.html %%PROMETHEUS_CONSOLES_DIR%%/prometheus-overview.html %%PROMETHEUS_CONSOLES_DIR%%/prometheus.html @sample etc/prometheus.yml.sample @dir(prometheus,prometheus) %%PROMETHEUS_DB_DIR%% @dir(root,root) %%PROMETHEUS_LOG_DIR%%