From owner-freebsd-ports@FreeBSD.ORG Tue Dec 30 17:55:04 2008 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A3AE1065673 for ; Tue, 30 Dec 2008 17:55:03 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from smtp.timeweb.ru (smtp.timeweb.ru [217.170.79.85]) by mx1.freebsd.org (Postfix) with ESMTP id 3E97D8FC24 for ; Tue, 30 Dec 2008 17:55:03 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1LHio4-0003Fp-3d; Tue, 30 Dec 2008 20:55:04 +0300 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 91B3BD92F; Tue, 30 Dec 2008 20:53:06 +0300 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 9749517033; Tue, 30 Dec 2008 20:55:27 +0300 (MSK) Date: Tue, 30 Dec 2008 20:55:27 +0300 From: Dmitry Marakasov To: Torfinn Ingolfsen Message-ID: <20081230175527.GC81218@hades.panopticon> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) Cc: freebsd-ports@freebsd.org Subject: Re: aMule 22.3 porting - some questions 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: Tue, 30 Dec 2008 17:55:05 -0000 * Torfinn Ingolfsen (tingox@gmail.com) wrote: > Another question: how do I create a diff that removes one of the files > in amule2/files? > I tried > diff -u amule2.org/files/patch-amuleDlg.cpp /dev/null >> amule2.diff > > And the diff looks ok: > --- amule2.org/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.000000000 +0100 > +++ /dev/null 2008-12-29 23:22:00.000000000 +0100 Obviously this way diff will have no idea on what file to delete, as amule2.org/files/patch-amuleDlg.cpp path does not exist. This way it should work: --- amule2/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.000000000 +0100 +++ /dev/null 2008-12-29 23:22:00.000000000 +0100 or this way: --- amule2.orig/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.000000000 +0100 +++ amule2/files/patch-amuleDlg.cpp 2008-12-29 23:22:00.000000000 +0100 (only '-' lines follow, `patch` will remove resulting empty file) But I assume what you need is -r option for diff - it compares 2 directories recursively, processing all changes as well as new and removed files correctly. % diff -ruN /usr/ports/net-p2p/amule amule where amule is your modified port. -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru