Date: Thu, 28 Mar 2019 15:27:26 +0100 From: Mathieu Arnold <mat@FreeBSD.org> To: Cy Schubert <cy@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r497023 - head/sysutils/nut Message-ID: <20190328142726.e2t557pghrlbb7ll@ogg.in.absolight.net> In-Reply-To: <201903281417.x2SEH6vP077025@repo.freebsd.org> References: <201903281417.x2SEH6vP077025@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--l674tijsbfpssvh7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Mar 28, 2019 at 02:17:06PM +0000, Cy Schubert wrote: > Author: cy > Date: Thu Mar 28 14:17:06 2019 > New Revision: 497023 > URL: https://svnweb.freebsd.org/changeset/ports/497023 >=20 > Log: > Really fix where samples go. >=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 14:07:25 2019 (r497022) > +++ head/sysutils/nut/Makefile Thu Mar 28 14:17:06 2019 (r497023) > @@ -3,7 +3,7 @@ > =20 > PORTNAME=3D nut > PORTVERSION=3D 2.7.4 > -PORTREVISION=3D 11 > +PORTREVISION=3D 12 > CATEGORIES=3D sysutils > MASTER_SITES=3D http://www.networkupstools.org/source/${PORTVERSION:R}/ > DISTFILES=3D ${DISTNAME}${EXTRACT_SUFX} > @@ -188,10 +188,9 @@ post-install: > ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} > .endfor > .endif > - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d > - ${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.sample > + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > + ${INSTALL_DATA} ${PATCHDIR}/nut.syslog ${STAGEDIR}${EXAMPLESDIR}/syslog= =2Esample > + ${INSTALL_DATA} ${PATCHDIR}/nut.newsyslog ${STAGEDIR}${EXAMPLESDIR}/new= syslog.sample > ${MKDIR} ${STAGEDIR}/var/log/nut > =20 > .include <bsd.port.mk> >=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 14:07:25 2019 (r497022) > +++ head/sysutils/nut/pkg-plist Thu Mar 28 14:17:06 2019 (r497023) > @@ -17,8 +17,8 @@ > @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 > +@sample %%EXAMPLESDIR%%/newsyslog.sample > +@sample %%EXAMPLESDIR%%/syslog.sample Ok, but now, the non .sample files do not end up where they should. This is the correct way to do it: @sample %%EXAMPLESDIR%%/newsyslog.sample etc/newsyslog.conf.d/nut.conf @sample %%EXAMPLESDIR%%/syslog.sample etc/syslog.d/nut --=20 Mathieu Arnold --l674tijsbfpssvh7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAlyc2c5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zki0gw//TlB7mUhNUXVLSWoy88u7LM+mjg9pMZMMRksOkTcvH41xcftvTEAL4aJI h8GsJW0ADusHVGJKIx159h8T81wc8zY9+AiTC0qtuCFmt7UVlQfzdUnzY4+REfe0 1q9RYC5kf/7nnOJYzu/DEQfvtTrAKuzvdoAapYS2kvtQ69oLdDA/cMgO1XHOTw1f U6Iq5UX188niy3KzmZ8V7VMZ1cF/RUMy0I1u21M2W8PSCD6MF987vZgl1EdLhXl9 j27JCQ1y269TrEOMzAWKFcsoRPCMBG40/foKelW+9IE5zJ5WW8SrdKLeQWtGDFr9 kayZtep6gFfYYmw6ceG7bAJauTdquUtQJtbMhcT2TzJ9Dis8lRVCrNKmoBB2QT7o Us6xKlJG6tinqvGtYIKbZhPU4yvrtta7WbUVU/CqibzgQXkaJHdawxDhmW7gUXFr yJTs90iy8z9dRc0+lGfiHFMNiznSV6vk/4WyvgOUGSot60n80LsB5ltHJyIyTjLw s1593TzxXkYqe6UwpghEs9T/AJWXwsG0syGYEvjbfgKFwJn/aWODKxGH3wx+hcrs /dh5eXoIH0XBF/0SqsJwCgQm4ZC70Fm1AI5Sp54HVccMegGl3gP9asq/ODWZEx0s Z7nSrY3AGXqG22XpQDthJXzMAnJDIdjuJM/JQ+zQnn5nQrRCMAY= =ngPe -----END PGP SIGNATURE----- --l674tijsbfpssvh7--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190328142726.e2t557pghrlbb7ll>