From owner-svn-ports-head@freebsd.org Mon Aug 31 16:35:12 2020 Return-Path: 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 BAE833C61F8; Mon, 31 Aug 2020 16:35:12 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgG5X4VySz3Wgq; Mon, 31 Aug 2020 16:35:12 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1598891712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YJn0Mn2ts2ljBJ1ZJkQSW/t3if/pNuGE34FItgGut7g=; b=qPoLFbLEbpn8qoVyfhW2gF7zAhtfhGLebJ1uML3tkHNJHTFmRMqbVLxQHNdGOx1ZGOEHlw 5YAKLyJJeR5LqQAq6gr7L4dV/bGILbjP+/jXYOGo+72H0S6mZbPoEeYgQD08VYiquABRGo L3xrprsswgNPJcdmu9eeQAomoW1IZRC0Sfz412l7B5gmqm0RuaOnHvIuYW8wH1dwaO323c omVbVx6EJO6153mbOesA9J3ZNUWvcM8KZiOMekolRNuIDlZRFHusQGnVRAOlg7jjhfq4oD yn+moRhXiJFndTx+pl+qJvu53iNLMbbh4XCXlSgunTHVqObDAefRv4hPPCIU8g== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 9278211A34; Mon, 31 Aug 2020 16:35:12 +0000 (UTC) Date: Mon, 31 Aug 2020 16:35:12 +0000 From: Alexey Dokuchaev To: Mathieu Arnold Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r547148 - in head/games: q2pro qstat quetoo/files r1q2/files Message-ID: <20200831163512.GA4459@FreeBSD.org> References: <202008310400.07V40LVQ085072@repo.freebsd.org> <20200831162321.67vsmybiqtr6tkyr@aching.in.mat.cc> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200831162321.67vsmybiqtr6tkyr@aching.in.mat.cc> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1598891712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YJn0Mn2ts2ljBJ1ZJkQSW/t3if/pNuGE34FItgGut7g=; b=ioXWKTrx8t9Tho2xKMWawiu9kH943Trsu3Ymsr7ddRUDHE46PxvS7tuzv2fV/3ipzoysAp Lk1gDBoXWFx7KztA0+LFfKsVKi2NoiOVpRWHL2j6TkNdw4031TXGfJDzCV2syFN8mmbPNh 9b3Ve6V9yu20/N4Xg6iWdFF4ggTtBgI9dd8kpHW4CdteHS3lQ29lQNX7SSiWK/nq9nmlld /RmlVJsymo8XWXzGd11k2rKZ+Ghfa6UhyuS3hAxk0EJ5wB2q7Ugfv+PpBLyciAKnbfX9fr Nev1v4Z8SeQWWK1gJYNaryHEZy+gM5z2460Ktqrb0N26Uu6gddIsY72n56Z5iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1598891712; a=rsa-sha256; cv=none; b=NhCmxGx2smMEOPxaZqy+3/rOBf3WEEVHwPfBt+Pj9URI37+2MelXcipQzydRraOGYjRmiE 8F0X89vCEeO9OAO4eUIuVAB9XYvMV2Zlsc0wgg/BDGSR4J5Lb09VYayL0YDCqpeKNex9+v /+GH3FdokGRmfigjQWawo/FjLUPmzdCyuVhnXingADnjdUpeVPpptvAryFutTdQhVKaEsC mT/o2+UW4bn8EsRkaHRFnBHeMdVdSOPs5pswBKrfSfuScS2JjPdu8eIBnOMvc20pmdTSDn gWmu42sbyrcC6NDwXYAAhbRhw3/C4vvZ7ulL7rSSNxksFKisAjSpNtNj6/mnkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 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: Mon, 31 Aug 2020 16:35:12 -0000 On Mon, Aug 31, 2020 at 06:23:21PM +0200, Mathieu Arnold wrote: > On Mon, Aug 31, 2020 at 04:00:21AM +0000, Alexey Dokuchaev wrote: > > +# Fix the build with -fno-common (for Clang 11 and GCC 10) > > + @${REINPLACE_CMD} -e '/^unsigned[[:blank:]]*d_8to24table/,+1d' \ > > + ${WRKSRC}/ref_soft/sw_main.c > > + @${REINPLACE_CMD} -e '/\*cl_paused/,+1d' \ > > + ${WRKSRC}/source/cl_null.c > > Just a reminder folkds, REINPLACE_CMD is to be used only when replacing > dynamic content, static replacements like this must go in patch files. True, but still being a general guidance (which I always keep in mind and often follow), not a hard rule that cannot be bent. > Especially as there is alreardy a patch file just for that: > > > Modified: head/games/quetoo/files/patch-clang-fixes This patch if for another port (and yes I've amended it in that case). The part you've quoted is for `games/q2pro' which 1) does not have a cumulative `patch-clang-fixes' like `games/quetoo' does, 2) already carries more than enough patches, 3) is planned to get updated to the latest version which would hopefully allow to retire most of them. ./danfe