From owner-svn-ports-all@freebsd.org Thu Nov 21 22:58:59 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 56E1C1CD3E5; Thu, 21 Nov 2019 22:58:59 +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 47Jw3R1Xzmz43hg; Thu, 21 Nov 2019 22:58:59 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mail.j.mat.cc (owncloud.cube.mat.cc [IPv6:2a01:678:4:1::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 D96A1BDAB; Thu, 21 Nov 2019 22:58:58 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from atuin.in.mat.cc (110.40.91.92.rev.sfr.net [92.91.40.110]) (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 07BB7942F8F; Thu, 21 Nov 2019 22:58:55 +0000 (UTC) Date: Thu, 21 Nov 2019 23:58:55 +0100 From: Mathieu Arnold To: Cy Schubert Cc: Tobias Kortkamp , Cy Schubert , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r518052 - head/sysutils/am-utils Message-ID: <20191121225855.uyprd43efnzj4b7a@atuin.in.mat.cc> References: <201911202129.xAKLTikX056001@repo.freebsd.org> <20191121070924.GA50105@urd.tobik.me> <20191121071847.6564ybobj4ennhcy@atuin.in.mat.cc> <201911211323.xALDNXHe010589@slippy.cwsent.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="5edtd5iafeai2ijm" Content-Disposition: inline In-Reply-To: <201911211323.xALDNXHe010589@slippy.cwsent.com> User-Agent: NeoMutt/20180716 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, 21 Nov 2019 22:58:59 -0000 --5edtd5iafeai2ijm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Nov 21, 2019 at 05:23:33AM -0800, Cy Schubert wrote: > In message <20191121071847.6564ybobj4ennhcy@atuin.in.mat.cc>, Mathieu=20 > Arnold wr > ites: > >=20 > > > > --wcbpoteyztvskbdz > > Content-Type: text/plain; charset=3Dus-ascii > > Content-Disposition: inline > > Content-Transfer-Encoding: quoted-printable > > > > On Thu, Nov 21, 2019 at 08:09:24AM +0100, Tobias Kortkamp wrote: > > > On Wed, Nov 20, 2019 at 09:29:44PM +0000, Cy Schubert wrote: > > > > Author: cy > > > > Date: Wed Nov 20 21:29:44 2019 > > > > New Revision: 518052 > > > > URL: https://svnweb.freebsd.org/changeset/ports/518052 > > > >=3D20 > > > > Log: > > > > Make the installation of the rc script conditional to avoid confl= ict > > > > with base. > > > > =3D20 > > > > MFH: 2019Q4 > > > > [...] > > > > -USE_RC_SUBR=3D3D amd > > > > +RC_USE_RC_SUBR=3D3D amd > > >=3D20 > > > There is no such options helper. It should be > > >=3D20 > > > RC_USE=3D3D RC_SUBR=3D3Damd > > >=3D20 > > > Also the rc script seems to still use /usr/sbin/amd instead of > > > %%PREFIX%%/sbin/amd which should probably be fixed too. > > > > Also, I am unsure of the use of this rc script, if it has the same name > > as the base system one, they will have the same variables controlling > > them, and both will be started at boot time if amd_enable=3D3Dyes, whic= h is > > probably not what is wanted here. >=20 > It does install correctly. A partial list of sysutils/ ports, including= =20 > some of mine. >=20 > /opt/src/new-ports/sysutils/nut/Makefile > 44:USE_RC_SUBR=3D nut nut_upsmon nut_upslog >=20 > /opt/src/new-ports/sysutils/openupsd/Makefile > 13:USE_RC_SUBR=3D ${PORTNAME} >=20 > /opt/src/new-ports/sysutils/afbinit/Makefile > 24:USE_RC_SUBR=3D afbinit >=20 > /opt/src/new-ports/sysutils/graylog/Makefile > 25:USE_RC_SUBR=3D graylog >=20 > /opt/src/new-ports/sysutils/bacula9-client/Makefile > 9:USE_RC_SUBR=3D bacula-fd >=20 > /opt/src/new-ports/sysutils/fcron/Makefile > 31:USE_RC_SUBR=3D fcron >=20 > /opt/src/new-ports/sysutils/linux-crashplan/Makefile > 21:USE_RC_SUBR=3D crashplan >=20 > /opt/src/new-ports/sysutils/riak-cs/Makefile > 22:USE_RC_SUBR=3D riak_cs >=20 > /opt/src/new-ports/sysutils/cpupdate/Makefile > 22:USE_RC_SUBR=3D ${PORTNAME} >=20 > /opt/src/new-ports/sysutils/syslog-ng321/Makefile > 51:USE_RC_SUBR=3D syslog-ng >=20 > /opt/src/new-ports/sysutils/fluent-bit/Makefile > 20:USE_RC_SUBR=3D ${PORTNAME} >=20 > /opt/src/new-ports/sysutils/consul-alerts/Makefile > 26:USE_RC_SUBR=3D ${PORTNAME} >=20 > /opt/src/new-ports/sysutils/diskcheckd/Makefile > 16:USE_RC_SUBR=3D diskcheckd >=20 > /opt/src/new-ports/sysutils/asusoled/Makefile > 17:USE_RC_SUBR=3D asusoled oled_clock >=20 > /opt/src/new-ports/sysutils/pprotectd/Makefile > 12:USE_RC_SUBR=3D ${PORTNAME} >=20 > /opt/src/new-ports/sysutils/runit/Makefile > 20:USE_RC_SUBR=3D runsvdir >=20 > /opt/src/new-ports/sysutils/monitord/Makefile > 13:USE_RC_SUBR=3D monitord >=20 > /opt/src/new-ports/sysutils/sec/Makefile > 15:USE_RC_SUBR=3D sec >=20 > /opt/src/new-ports/sysutils/firstboot-growfs/Makefile > 18:USE_RC_SUBR=3D firstboot_growfs >=20 > /opt/src/new-ports/sysutils/syslog-ng319/Makefile > 49:USE_RC_SUBR=3D syslog-ng >=20 > /opt/src/new-ports/sysutils/rundeck/Makefile > 22:USE_RC_SUBR=3D rundeck >=20 > The reason for the option is to avoid the conflict. HEAD as of r354902=20 > disables amd by default. The intention is to remove it by 13.0. There is = a=20 > subsequent (yesterday) update to param.h that would allow me to test=20 > OSVERSION. Additionally people can still build and install world WITH_AMD= ,=20 > the option gives us greater flexibility. This of course will change when= =20 > amd is eventually removed from HEAD. Mmm, no, if you want to make it work correctly, do something like this: =2Eif !exists(/etc/rc.d/amd) USE_RC_SUBR=3D amd =2Eendif Or use OSVERSION to determine if the file is needed or not, but an options is really, really not the correct way to do it. --=20 Mathieu Arnold --5edtd5iafeai2ijm Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAl3XFq5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zkiA5BAApirJ68dLQ+50hXRDPrBpXYHJccdgxh8MHTSYDllDc22ePEpChLeUNLx8 uDrMX1DNDue1Uy2eGt4K3F69V70syJFT1LLW+9CRyBVIX5PmkvkAOzjlnvBfhqBi ig3B+YzNlRzhnGf8wY0lWcRr9FPFPqIbFvH8aydA2YR7GIKTUpre2uZ+a3MUQjQC R6UJ1c1Z8o/+Y7DATXY3hEl42Vapmp3hgVPOGZkyOUaDUjYVxHhuzOZX0oahANhN 9izWXqUq7Iw6mUsr6Ur7sDQM3PTs6wdQDpXK5n9Zryd4VTfECqSYEo/gSFoWk2GW q6rqqKoLPZ2zC8WP/Ps1teP8lHwwQkUfEMZ1/ZjJw7Qs47ujw6zLEDtavKAAzSzv ESh+n8DdgbrCviIgSM0vyuhl1jR9ojJsybKQG2onfVAs7suXMi8ltRNVo4pmpSjy R2TVEy7BYaOMtRbj+9UgTlS2ktCIE5hpyfC4nHyO6QJ5M/OZdCnPuyZAq5ijKS+3 ORXaEO/aLfN/BcWILwKREXdwqpbwu7pSP4Tyy7uHMxNwHwWTAofJTmWyGi0xej/L GmwYyut185tiltrqjHWUjFk/U1wzCB3R5w+IbYJn98hVx/G0qnAYn80yo/UrQdB3 CUHvknWqlz+W63u6/dH6cJwRGos5gQ/k2lUgLLz3hiEm72W7n+Q= =IALt -----END PGP SIGNATURE----- --5edtd5iafeai2ijm--