From owner-svn-ports-all@freebsd.org Thu Mar 28 01:00:51 2019 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 2705915608ED; Thu, 28 Mar 2019 01:00:51 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BA240711BF; Thu, 28 Mar 2019 01:00:50 +0000 (UTC) (envelope-from cy@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 7CC8EF4E3; Thu, 28 Mar 2019 01:00:50 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2S10oKN061131; Thu, 28 Mar 2019 01:00:50 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2S10ot0061130; Thu, 28 Mar 2019 01:00:50 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201903280100.x2S10ot0061130@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Thu, 28 Mar 2019 01:00:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r497002 - head/sysutils/nut X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/sysutils/nut X-SVN-Commit-Revision: 497002 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BA240711BF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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: Thu, 28 Mar 2019 01:00:51 -0000 Author: cy Date: Thu Mar 28 01:00:49 2019 New Revision: 497002 URL: https://svnweb.freebsd.org/changeset/ports/497002 Log: Make the two new sample files actually samples. While here mark all sample files as samples. Reported by: mat@ Modified: head/sysutils/nut/Makefile head/sysutils/nut/pkg-plist Modified: head/sysutils/nut/Makefile ============================================================================== --- head/sysutils/nut/Makefile Thu Mar 28 00:40:37 2019 (r497001) +++ head/sysutils/nut/Makefile Thu Mar 28 01:00:49 2019 (r497002) @@ -3,7 +3,7 @@ PORTNAME= nut PORTVERSION= 2.7.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -189,9 +189,9 @@ post-install: .endfor .endif @${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d - ${INSTALL_DATA} ${PATCHDIR}/nut.syslog ${STAGEDIR}${PREFIX}/etc/syslog.d/nut + ${INSTALL_DATA} ${PATCHDIR}/nut.syslog ${STAGEDIR}${PREFIX}/etc/syslog.d/nut.sample @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d - ${INSTALL_DATA} ${PATCHDIR}/nut.newsyslog ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/nut.conf + ${INSTALL_DATA} ${PATCHDIR}/nut.newsyslog ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/nut.conf.sample ${MKDIR} ${STAGEDIR}/var/log/nut .include Modified: head/sysutils/nut/pkg-plist ============================================================================== --- head/sysutils/nut/pkg-plist Thu Mar 28 00:40:37 2019 (r497001) +++ head/sysutils/nut/pkg-plist Thu Mar 28 01:00:49 2019 (r497002) @@ -1,24 +1,24 @@ %%NUT_CGI%%%%CGIDIR%%/upsimage.cgi %%NUT_CGI%%%%CGIDIR%%/upsset.cgi %%NUT_CGI%%%%CGIDIR%%/upsstats.cgi -%%NUT_CGI%%%%CGIETCDIR%%hosts.conf.sample -%%NUT_CGI%%%%CGIETCDIR%%upsset.conf.sample -%%NUT_CGI%%%%CGIETCDIR%%upsstats.html.sample -%%NUT_CGI%%%%CGIETCDIR%%upsstats-single.html.sample +%%NUT_CGI%%@sample %%CGIETCDIR%%hosts.conf.sample +%%NUT_CGI%%@sample %%CGIETCDIR%%upsset.conf.sample +%%NUT_CGI%%@sample %%CGIETCDIR%%upsstats.html.sample +%%NUT_CGI%%@sample %%CGIETCDIR%%upsstats-single.html.sample %%NUT_CGI%%%%WWWDIR%%/bottom.html %%NUT_CGI%%%%WWWDIR%%/header.html %%NUT_CGI%%%%WWWDIR%%/index.html %%NUT_CGI%%%%WWWDIR%%/nut-banner.png %%ETCDIR%%/cmdvartab %%ETCDIR%%/driver.list -%%ETCDIR%%/nut.conf.sample -%%ETCDIR%%/ups.conf.sample -%%ETCDIR%%/upsd.conf.sample -%%ETCDIR%%/upsd.users.sample -%%ETCDIR%%/upsmon.conf.sample -%%ETCDIR%%/upssched.conf.sample -etc/newsyslog.conf.d/nut.conf -etc/syslog.d/nut +@sample %%ETCDIR%%/nut.conf.sample +@sample %%ETCDIR%%/ups.conf.sample +@sample %%ETCDIR%%/upsd.conf.sample +@sample %%ETCDIR%%/upsd.users.sample +@sample %%ETCDIR%%/upsmon.conf.sample +@sample %%ETCDIR%%/upssched.conf.sample +@sample etc/newsyslog.conf.d/nut.conf.sample +@sample etc/syslog.d/nut.sample %%NUT_USB%%etc/devd/nut-usb.conf @stopdaemon nut_upsmon @stopdaemon nut_upslog