From owner-svn-ports-head@freebsd.org Thu Mar 28 13:15:46 2019 Return-Path: Delivered-To: svn-ports-head@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 A2221155CEF0; Thu, 28 Mar 2019 13:15:46 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1C7E970593; Thu, 28 Mar 2019 13:15:46 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mail.j.mat.cc (owncloud.cube.mat.cc [79.143.240.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.mat.cc", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id B67FD1CBA7; Thu, 28 Mar 2019 13:15:45 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from ogg.in.absolight.net (ogg.in.absolight.net [IPv6:2a01:678:ab:50::42:42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 53852942DA6; Thu, 28 Mar 2019 13:15:44 +0000 (UTC) Date: Thu, 28 Mar 2019 14:15:44 +0100 From: Mathieu Arnold To: Cy Schubert Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r497002 - head/sysutils/nut Message-ID: <20190328131544.jhzpimdif66g7o5d@ogg.in.absolight.net> References: <201903280100.x2S10ot0061130@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="dtsb7xoy6ufbapgs" Content-Disposition: inline In-Reply-To: <201903280100.x2S10ot0061130@repo.freebsd.org> User-Agent: NeoMutt/20180622 X-Rspamd-Queue-Id: 1C7E970593 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-7.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-1.00)[-0.997,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2019 13:15:47 -0000 --dtsb7xoy6ufbapgs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Mar 28, 2019 at 01:00:50AM +0000, Cy Schubert wrote: > Author: cy > Date: Thu Mar 28 01:00:49 2019 > New Revision: 497002 > URL: https://svnweb.freebsd.org/changeset/ports/497002 >=20 > Log: > Make the two new sample files actually samples. While here mark all > sample files as samples. > =20 > Reported by: mat@ >=20 > Modified: > head/sysutils/nut/Makefile > head/sysutils/nut/pkg-plist >=20 > Modified: head/sysutils/nut/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 @@ > =20 > PORTNAME=3D nut > PORTVERSION=3D 2.7.4 > -PORTREVISION=3D 10 > +PORTREVISION=3D 11 > CATEGORIES=3D sysutils > MASTER_SITES=3D http://www.networkupstools.org/source/${PORTVERSION:R}/ > DISTFILES=3D ${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/news= yslog.conf.d/nut.conf > + ${INSTALL_DATA} ${PATCHDIR}/nut.newsyslog ${STAGEDIR}${PREFIX}/etc/news= yslog.conf.d/nut.conf.sample > ${MKDIR} ${STAGEDIR}/var/log/nut As I said in my previous email, you MUST NOT put the sample files in the ".d" directory as both syslogd and newsyslog grab all the files from the directory, you end up having the definitions twice. You MUST store the =2Esample files somewhere else. > .include >=20 > Modified: head/sysutils/nut/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 >=20 >=20 --=20 Mathieu Arnold --dtsb7xoy6ufbapgs Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAlycyP9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zkgp+Q//cQbOtyTLWQuR73kb6CgtPHZUp56ayst80mt1q9UYohvGK/57gi/pNxPt AdoFGyG7dVep3mnK/ahG5X2Fyh2jaS62R7cUQHyaUSksGbqL5c9xIPdXVlamw04r X6TV7DSOc5P0AnnQJDaHiBRyCPbKtey3bW7dvBBK1dG2w96pQzZXD/lMx/KHPTsy JYY8/gkch2stz3PV5zMqK4bGD7PzrHwX4UAX4y/NfiTdFW5c0+DOTvqu2qhXH3W+ vxO0Yukqt41vfCdaEZ4ea95jxzYHwrL5AJEqdcO7UbetvT0qPjQKkYytz0YciKqE mppZoENjQ4983AAfk83U3xeb8Wl/0cqslD2fSZrmPuB7eVgOXOYjVLaujuJfZWJp bO4ZVOnAt9FjWaZJ5U7b0eyvZ5Uiv8RcQ4n3COc75guVurtrFI9DeCej9q4j+GBa vyUh22VtFZuq61dHfG2KBhQSFDtrDWRbx0afgDUrO3jllr/Y/7Cu7GofZSjNm2w4 sbB5ZdhsFnRpg1rHMv59waxpqE//SiCoKmfjYrik4p9/x9yJnQ0fwNEMj36N+he/ MnZC50iAlLHBMPMcslfMF4pg8tF5oRu4ahgloJwx638K2w5UakkVcQeHjPd2EdYt TtxGe6RAgHx1U0LL2lFlXyLPVUbD8L9cspY93c/HlPtLECphypA= =2pbQ -----END PGP SIGNATURE----- --dtsb7xoy6ufbapgs--