From owner-freebsd-questions@FreeBSD.ORG Wed Oct 20 11:10:35 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 79C6416A4CE for ; Wed, 20 Oct 2004 11:10:35 +0000 (GMT) Received: from smtp.rdsnet.ro (smtp.rdsnet.ro [62.231.74.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDDF943D1D for ; Wed, 20 Oct 2004 11:10:33 +0000 (GMT) (envelope-from itetcu@apropo.ro) Received: (qmail 24529 invoked by uid 89); 20 Oct 2004 11:10:32 -0000 Received: from unknown (HELO rdsnet.ro) (62.231.74.131) by 0 with SMTP; 20 Oct 2004 11:10:32 -0000 Received: (qmail 16622 invoked from network); 20 Oct 2004 11:10:32 -0000 Received: from unknown (HELO buh.cameradicommercio.ro) (82.76.1.117) by mail.rdsnet.ro with SMTP; 20 Oct 2004 11:10:32 -0000 Received: from it.buh.cameradicommercio.ro (it.buh.cameradicommercio.ro [192.168.0.10]) by buh.cameradicommercio.ro (Postfix) with ESMTP id 0237060FA; Wed, 20 Oct 2004 14:10:31 +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 25F1AF8; Wed, 20 Oct 2004 14:10:33 +0300 (EEST) Date: Wed, 20 Oct 2004 14:10:30 +0300 From: Ion-Mihai Tetcu To: krinklyfig@spymac.com Message-ID: <20041020141030.00b0ecaa@it.buh.cameradicommercio.ro> In-Reply-To: <200410200247.03898.krinklyfig@spymac.com> References: <200410181506.55316.krinklyfig@spymac.com> <20041019214330.5ea1de30@it.buh.cameradicommercio.ro> <200410200241.31182.krinklyfig@spymac.com> <200410200247.03898.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 11:10:35 -0000 On Wed, 20 Oct 2004 02:47:03 -0700 Joshua Tinnin wrote: > On Wednesday 20 October 2004 02:41 am, Joshua Tinnin > wrote: > > On Tuesday 19 October 2004 11:43 am, Ion-Mihai Tetcu > > wrote: > > > On Mon, 18 Oct 2004 15:06:55 -0700 > > > Joshua Tinnin wrote: > > > > I'm wondering how to remove a custom patch for a port. I am sort > > > > of new at this, but I've managed to learn how to patch a port and > > > > upgrade it for testing. But I'm not at all sure how to remove > > > > that patch if need be. What I've been doing is removing a chunk > > > > of the ports tree with cd /usr/ports && rm -rf */*portname* and > > > > then cvsup'ping again, but this doesn't seem right or very > > > > efficient. I've read the man page for patch, but the only thing I > > > > can come up with is the reverse option, which I must admit I > > > > don't totally understand. Can anyone explain this in a way that > > > > makes sense? > > > > > > If I understand what you want correctly, all you have to do is to > > > rename the patch from: > > > > > > /usr/ports/cat/your_port/files/patch-you_want_not_applied to > > > something that does not begin with 'patch'. > > > > OK, and thanks by the way, but let's say it's a patch which involves > > several ports as part of a metaport, like xcfe4? Someone else > > recommended just rm -rf all the affected branches and then > > cvsup'ping, which I had been doing, more or less, but it seemed to me > > like that was sort of sloppy (but maybe there isn't a graceful way to > > do this). I was just wondering if there was anything that was the > > equivalent of "unpatch." > > 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 ? -- IOnut Unregistered ;) FreeBSD "user"