From owner-svn-ports-all@freebsd.org Wed Oct 31 01:44:05 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55529107204C; Wed, 31 Oct 2018 01:44:05 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0701F845FB; Wed, 31 Oct 2018 01:44:05 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C223B25AA3; Wed, 31 Oct 2018 01:44:04 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9V1i4Pd035553; Wed, 31 Oct 2018 01:44:04 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9V1i4pO035552; Wed, 31 Oct 2018 01:44:04 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201810310144.w9V1i4pO035552@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 31 Oct 2018 01:44:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483541 - in head/net-mgmt/prometheus2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/net-mgmt/prometheus2: . files X-SVN-Commit-Revision: 483541 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2018 01:44:05 -0000 Author: swills Date: Wed Oct 31 01:44:04 2018 New Revision: 483541 URL: https://svnweb.freebsd.org/changeset/ports/483541 Log: net-mgmt/prometheus2: Remove syslog and newsyslog config files While here, pet portlint PR: 232813 Submitted by: David O'Rourke (maintainer) Deleted: head/net-mgmt/prometheus2/files/newsyslog.conf.in head/net-mgmt/prometheus2/files/syslog.d.conf.in Modified: head/net-mgmt/prometheus2/Makefile (contents, props changed) head/net-mgmt/prometheus2/pkg-plist (contents, props changed) Modified: head/net-mgmt/prometheus2/Makefile ============================================================================== --- head/net-mgmt/prometheus2/Makefile Wed Oct 31 01:22:03 2018 (r483540) +++ head/net-mgmt/prometheus2/Makefile Wed Oct 31 01:44:04 2018 (r483541) @@ -3,6 +3,7 @@ PORTNAME= prometheus DISTVERSIONPREFIX= v DISTVERSION= 2.4.3 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= dor.bsd@xm0.uk @@ -12,14 +13,10 @@ 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 +GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} PROMETHEUS_USER?= prometheus PROMETHEUS_GROUP?= prometheus @@ -35,9 +32,7 @@ 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_FILES= prometheus SUB_LIST+= PROMETHEUS_USER=${PROMETHEUS_USER} \ PROMETHEUS_GROUP=${PROMETHEUS_GROUP} \ @@ -87,14 +82,5 @@ do-install: ( 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 Modified: head/net-mgmt/prometheus2/pkg-plist ============================================================================== --- head/net-mgmt/prometheus2/pkg-plist Wed Oct 31 01:22:03 2018 (r483540) +++ head/net-mgmt/prometheus2/pkg-plist Wed Oct 31 01:44:04 2018 (r483541) @@ -1,7 +1,5 @@ bin/prometheus bin/promtool -%%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