Date: Thu, 21 Nov 2019 16:01:26 -0800 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Mathieu Arnold <mat@FreeBSD.org> Cc: Tobias Kortkamp <tobik@freebsd.org>, Cy Schubert <cy@freebsd.org>, 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: <C20CCC2A-198A-4120-A038-C485B636C8BE@cschubert.com> In-Reply-To: <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> <20191121225855.uyprd43efnzj4b7a@atuin.in.mat.cc>
next in thread | previous in thread | raw e-mail | index | archive | help
On November 21, 2019 2:58:55 PM PST, Mathieu Arnold <mat@FreeBSD=2Eorg> wro= te: >On Thu, Nov 21, 2019 at 05:23:33AM -0800, Cy Schubert wrote: >> In message <20191121071847=2E6564ybobj4ennhcy@atuin=2Ein=2Emat=2Ecc>, M= athieu > >> 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=2Efreebsd=2Eorg/changeset/ports/518052 >> > > >=3D20 >> > > > Log: >> > > > Make the installation of the rc script conditional to avoid >conflict >> > > > with base=2E >> > > > =3D20 >> > > > MFH: 2019Q4 >> > > > [=2E=2E=2E] >> > > > -USE_RC_SUBR=3D3D amd >> > > > +RC_USE_RC_SUBR=3D3D amd >> > >=3D20 >> > > There is no such options helper=2E 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=2E >> > >> > 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, >which is >> > probably not what is wanted here=2E >>=20 >> It does install correctly=2E A partial list of sysutils/ ports, >including=20 >> some of mine=2E >>=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=2E HEAD as of >r354902=20 >> disables amd by default=2E The intention is to remove it by 13=2E0=2E T= here >is a=20 >> subsequent (yesterday) update to param=2Eh that would allow me to test= =20 >> OSVERSION=2E Additionally people can still build and install world >WITH_AMD,=20 >> the option gives us greater flexibility=2E This of course will change >when=20 >> amd is eventually removed from HEAD=2E > >Mmm, no, if you want to make it work correctly, do something like this: > >=2Eif !exists(/etc/rc=2Ed/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=2E > >--=20 >Mathieu Arnold Already did nine hours ago in r518101=2E --=20 Pardon the typos and autocorrect, small keyboard in use=2E=20 Cy Schubert <Cy=2ESchubert@cschubert=2Ecom> FreeBSD UNIX: <cy@FreeBSD=2Eorg> Web: https://www=2EFreeBSD=2Eorg The need of the many outweighs the greed of the few=2E Sent from my Android device with K-9 Mail=2E Please excuse my brevity=2E From owner-svn-ports-head@freebsd.org Fri Nov 22 00:39:23 2019 Return-Path: <owner-svn-ports-head@freebsd.org> Delivered-To: svn-ports-head@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 3B9CD1CF794; Fri, 22 Nov 2019 00:39:23 +0000 (UTC) (envelope-from osa@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 47JyHH0672z48xl; Fri, 22 Nov 2019 00:39:23 +0000 (UTC) (envelope-from osa@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 DAFD61BA02; Fri, 22 Nov 2019 00:39:22 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAM0dMmG019668; Fri, 22 Nov 2019 00:39:22 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAM0dM7T019667; Fri, 22 Nov 2019 00:39:22 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201911220039.xAM0dM7T019667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" <osa@FreeBSD.org> Date: Fri, 22 Nov 2019 00:39:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518119 - in head/databases/redis: . files X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: in head/databases/redis: . files X-SVN-Commit-Revision: 518119 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 <svn-ports-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>; List-Post: <mailto:svn-ports-head@freebsd.org> List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>, <mailto:svn-ports-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 22 Nov 2019 00:39:23 -0000 Author: osa Date: Fri Nov 22 00:39:22 2019 New Revision: 518119 URL: https://svnweb.freebsd.org/changeset/ports/518119 Log: Fix the build with external lua, forgotten to add the patch. Bump PORTREVISION. Reported by: olgeni Added: head/databases/redis/files/patch-deps_lua_src_lua__cjson.c (contents, props changed) Modified: head/databases/redis/Makefile Modified: head/databases/redis/Makefile ============================================================================== --- head/databases/redis/Makefile Thu Nov 21 23:42:26 2019 (r518118) +++ head/databases/redis/Makefile Fri Nov 22 00:39:22 2019 (r518119) @@ -3,6 +3,7 @@ PORTNAME= redis PORTVERSION= 5.0.7 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ Added: head/databases/redis/files/patch-deps_lua_src_lua__cjson.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/redis/files/patch-deps_lua_src_lua__cjson.c Fri Nov 22 00:39:22 2019 (r518119) @@ -0,0 +1,12 @@ +--- deps/lua/src/lua_cjson.c.orig 2019-09-25 10:40:18 UTC ++++ deps/lua/src/lua_cjson.c +@@ -46,7 +46,9 @@ + #include "strbuf.h" + #include "fpconv.h" + ++#if defined(__sun) + #include "../../../src/solarisfixes.h" ++#endif + + #ifndef CJSON_MODNAME + #define CJSON_MODNAME "cjson"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?C20CCC2A-198A-4120-A038-C485B636C8BE>