From owner-cvs-ports@FreeBSD.ORG Mon Oct 10 23:40:48 2005 Return-Path: X-Original-To: cvs-ports@FreeBSD.org Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 297D016A41F; Mon, 10 Oct 2005 23:40:48 +0000 (GMT) (envelope-from edwin@mavetju.org) Received: from mail3out.barnet.com.au (mail3out.barnet.com.au [202.83.176.17]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84B6E43D48; Mon, 10 Oct 2005 23:40:47 +0000 (GMT) (envelope-from edwin@mavetju.org) Received: by mail3out.barnet.com.au (Postfix, from userid 27) id AFFAB877C2E; Tue, 11 Oct 2005 09:40:46 +1000 (EST) X-Viruscan-Id: <434AFBFE000156D84FBADF@BarNet> Received: from mail3-auth.barnet.com.au (mail3.barnet.com.au [202.83.176.16]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.barnet.com.au", Issuer "BarNet Root Certificate Authority" (verified OK)) by mail3.barnet.com.au (Postfix) with ESMTP id 886C5877C26; Tue, 11 Oct 2005 09:40:46 +1000 (EST) Received: from k7.mavetju (edwin-3.int.barnet.com.au [10.10.12.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "edwin.adsl.barnet.com.au", Issuer "BarNet Root Certificate Authority" (not verified)) by mail3-auth.barnet.com.au (Postfix) with ESMTP id 16576877C20; Tue, 11 Oct 2005 09:40:46 +1000 (EST) Received: by k7.mavetju (Postfix, from userid 1001) id C07FB614D; Tue, 11 Oct 2005 09:40:44 +1000 (EST) Date: Tue, 11 Oct 2005 09:40:44 +1000 From: Edwin Groothuis To: Alexey Dokuchaev Message-ID: <20051010234044.GB1239@k7.mavetju> References: <200510101133.j9ABXWg4000289@repoman.freebsd.org> <20051010125906.GA3640@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20051010125906.GA3640@FreeBSD.org> User-Agent: Mutt/1.5.9i Cc: cvs-ports@FreeBSD.org, Jean-Marc Zucconi , cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/games/doom Makefile ports/games/doom/files patch-ag patch-sndserv__soundsrv.c patch-sndserv__wadread.c X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Oct 2005 23:40:48 -0000 On Mon, Oct 10, 2005 at 12:59:06PM +0000, Alexey Dokuchaev wrote: > On Mon, Oct 10, 2005 at 11:33:31AM +0000, Jean-Marc Zucconi wrote: > > jmz 2005-10-10 11:33:30 UTC > > > > FreeBSD ports repository > > > > Modified files: > > games/doom Makefile > > games/doom/files patch-ag > > Added files: > > games/doom/files patch-sndserv__soundsrv.c > > patch-sndserv__wadread.c > > Log: > > ... > > > Replace post-patch with real patch files. > > I've always been under impression that we try to avoid creating trivial > patches when desired functionality can be implemented using some > inplace-editing tools. Could you elaborate on what you've done here? Inplace patches used for other things besides replacing FreeBSD specific variables (X11BASE, PREFIX etc) are a bad habbit because they obscure what is actually being replaced: #include #ifdef LINUX /* Linux: We need malloc.h for malloc() and friends */ #include #endif Now get your s/malloc.h/stdlib.h/ over it: #include #ifdef LINUX /* Linux: We need stdlib.h for malloc() and friends */ #include #endif I admit, it doesn't matter, but when you are looking through the code (*waves at the maintainer who has to fix a problem*) this piece of code actually looks silly. Hello FreeBSD ports collection! Second reason: Using pre-patch inplace patches and patch-files on the same file is a recipe for disaster for the maintainer when you do the inplace first and the patch-files next (imagine having a line within the patches file comparing range changed) and using post-patch inplace patches leaves you with an invalid .orig file to compare the patched file to. So don't worry about the inodes, worry about the quality. Edwin -- Edwin Groothuis | Personal website: http://www.mavetju.org edwin@mavetju.org | Weblog: http://weblog.barnet.com.au/edwin/