From owner-freebsd-questions@FreeBSD.ORG Wed Oct 20 12:30:47 2004 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B387216A4CE for ; Wed, 20 Oct 2004 12:30:47 +0000 (GMT) Received: from smtp.rdsnet.ro (smtp.rdsnet.ro [62.231.74.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9EC543D1D for ; Wed, 20 Oct 2004 12:30:45 +0000 (GMT) (envelope-from itetcu@apropo.ro) Received: (qmail 25325 invoked by uid 89); 20 Oct 2004 12:30:45 -0000 Received: from unknown (HELO rdsnet.ro) (62.231.74.131) by 0 with SMTP; 20 Oct 2004 12:30:45 -0000 Received: (qmail 18906 invoked from network); 20 Oct 2004 12:30:45 -0000 Received: from unknown (HELO buh.cameradicommercio.ro) (82.76.1.117) by mail.rdsnet.ro with SMTP; 20 Oct 2004 12:30:44 -0000 Received: from it.buh.cameradicommercio.ro (it.buh.cameradicommercio.ro [192.168.0.10]) by buh.cameradicommercio.ro (Postfix) with ESMTP id E0B4E609A; Wed, 20 Oct 2004 15:30:43 +0300 (EEST) Received: from it.buh.cameradicommercio.ro (localhost.buh.tecnik93.com [127.0.0.1]) by it.buh.cameradicommercio.ro (Postfix) with SMTP id F24C1F8; Wed, 20 Oct 2004 15:30:45 +0300 (EEST) Date: Wed, 20 Oct 2004 15:30:45 +0300 From: Ion-Mihai Tetcu To: krinklyfig@spymac.com Message-ID: <20041020153045.1b8db4c3@it.buh.cameradicommercio.ro> In-Reply-To: <200410200445.51835.krinklyfig@spymac.com> References: <200410181506.55316.krinklyfig@spymac.com> <200410200247.03898.krinklyfig@spymac.com> <20041020141030.00b0ecaa@it.buh.cameradicommercio.ro> <200410200445.51835.krinklyfig@spymac.com> X-Mailer: Sylpheed-Claws 0.9.12a (GTK+ 1.2.10; i386-portbld-freebsd5.3) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit cc: freebsd-questions Subject: Re: How to remove a patch from a port? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Oct 2004 12:30:47 -0000 On Wed, 20 Oct 2004 04:45:51 -0700 Joshua Tinnin wrote: > On Wednesday 20 October 2004 04:10 am, Ion-Mihai Tetcu > wrote: [ ... ] > > > Sorry, let me explain a bit better. Someone posted a patch to > > > -ports to upgrade xfce4 to the latest version, and I was helping > > > test it. The patch covered several ports, and it had a few problems > > > and was updated by the patch author, but I wasn't quite sure how to > > > back out of it and retest an updated patch without having to cvsup > > > my ports tree and start over. But like I said, maybe there isn't > > > some other method I'm missing, and this is the way it's done ... > > > > Exactly where did you put this patch ? How did you applied it? it was > > a patch to the Makefile of the port or a patch for the source of the > > port ? > > It's a patch for the Makefiles of several ports in the xfce4 metaport, > so as to upgrade to the latest version. I patched it through > (essentially): > > cd /usr/ports && patch -E < /localpath/to/patch If you don't cvsup "quick" (cvsup -s) you shouldn't need to remove the Makefile, as cvsup will see the file has been changed; this is not true if you _add_ a file that is not in the cvs in a port_dir and it's not guaranteed to work if you use cvsup's -s switch. Usually when I have to test Makefile patches I: cp Makefile Makefile.cvs patch .. < /path/to/patch cp Makefile Makefile.patched Which enables me to restore the "official" Makefle or add my own diff's. -- IOnut Unregistered ;) FreeBSD "user"