From owner-freebsd-ports@FreeBSD.ORG Thu Mar 8 13:15:25 2007 Return-Path: X-Original-To: freebsd-ports@freebsd.org Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CB3AE16A404 for ; Thu, 8 Mar 2007 13:15:25 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: from mail4out.barnet.com.au (mail4.barnet.com.au [202.83.178.125]) by mx1.freebsd.org (Postfix) with ESMTP id 8970913C48D for ; Thu, 8 Mar 2007 13:15:25 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: by mail4out.barnet.com.au (Postfix, from userid 1001) id AD1D137C9C3; Fri, 9 Mar 2007 00:15:24 +1100 (EST) X-Viruscan-Id: <45F00C6C00008FD11D424D@BarNet> Received: from mail4auth.barnet.com.au (mail4.barnet.com.au [202.83.178.125]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail4.barnet.com.au (Postfix) with ESMTP id 7B731422086; Fri, 9 Mar 2007 00:15:24 +1100 (EST) Received: from k7.mavetju (k7.mavetju.org [10.251.1.18]) by mail4auth.barnet.com.au (Postfix) with ESMTP id 30A6137B9F1; Fri, 9 Mar 2007 00:15:24 +1100 (EST) Received: by k7.mavetju (Postfix, from userid 1001) id EC305118; Fri, 9 Mar 2007 00:15:23 +1100 (EST) Date: Fri, 9 Mar 2007 00:15:23 +1100 From: Edwin Groothuis To: spil.oss@gmail.com Message-ID: <20070308131523.GT90162@k7.mavetju> References: <5fbf03c20703080443p1c8edca0p167b242a5b0969a2@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5fbf03c20703080443p1c8edca0p167b242a5b0969a2@mail.gmail.com> User-Agent: Mutt/1.4.2.1i Cc: freebsd-ports@freebsd.org Subject: Re: How to create a patch that removes a file X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Mar 2007 13:15:25 -0000 On Thu, Mar 08, 2007 at 01:43:41PM +0100, Spil Oss wrote: > Hi all, > > I've succesfully upgraded the port for an application that has an > older version in the ports collection. > I'd like to submit the patch in a PR, but I don't know (yet :D) how to > include the removal of a file from the port (that patch-file is now > already included in the distributed sources). http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#PORT-UPGRADING If the maintainer asks you to do the upgrade or there is no maintainer, then you have a chance to help out FreeBSD by preparing the update yourself! Please make the changes and save the result of the recursive diff output of the new and old ports directories (e.g., if your modified port directory is called superedit and the original is in our tree as superedit.bak, then save the result of diff -ruN superedit.bak superedit). Either unified or context diff is fine, but port committers generally prefer unified diffs. Note the use of the -N option--this is the accepted way to force diff to properly deal with the case of new files being added or old files being deleted. Before sending us the diff, please examine the output to make sure all the changes make sense. To simplify common operations with patch files, you can use /usr/ports/Tools/scripts/patchtool.py. Before using it, please read /usr/ports/Tools/scripts/README.patchtool. Also, state the removal of that file in the Fix part of the PR, that will give the commiter a heads up about the removal of it. Edwin -- Edwin Groothuis | Personal website: http://www.mavetju.org edwin@mavetju.org | Weblog: http://weblog.barnet.com.au/edwin/