svn commit: r483541 - in head/net-mgmt/prometheus2: . files

[Steve Wills]

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 <dor.bsd at xm0.uk> (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 at 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 <bsd.port.mk>

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