From owner-freebsd-ports@FreeBSD.ORG Mon Sep 18 22:36:41 2006 Return-Path: X-Original-To: freebsd-ports@freebsd.org Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0EA3216A40F for ; Mon, 18 Sep 2006 22:36:41 +0000 (UTC) (envelope-from jdc@koitsu.dyndns.org) Received: from rwcrmhc11.comcast.net (rwcrmhc11.comcast.net [216.148.227.151]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9220743D46 for ; Mon, 18 Sep 2006 22:36:40 +0000 (GMT) (envelope-from jdc@koitsu.dyndns.org) Received: from icarus.home.lan (c-24-6-181-195.hsd1.ca.comcast.net[24.6.181.195]) by comcast.net (rwcrmhc11) with ESMTP id <20060918223640m11009n74ve>; Mon, 18 Sep 2006 22:36:40 +0000 Received: by icarus.home.lan (Postfix, from userid 1000) id CC6401FA035; Mon, 18 Sep 2006 15:36:39 -0700 (PDT) Date: Mon, 18 Sep 2006 15:36:39 -0700 From: Jeremy Chadwick To: freebsd-ports@freebsd.org Message-ID: <20060918223639.GA1946@icarus.home.lan> Mail-Followup-To: freebsd-ports@freebsd.org References: <28a99ba50609181526s6a3ab59btfca1d6517b89c951@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <28a99ba50609181526s6a3ab59btfca1d6517b89c951@mail.gmail.com> X-PGP-Key: http://jdc.parodius.com/pubkey.asc User-Agent: Mutt/1.5.13 (2006-08-11) Subject: Re: Basic Diff question 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: Mon, 18 Sep 2006 22:36:41 -0000 On Mon, Sep 18, 2006 at 03:26:05PM -0700, MC wrote: > Hello > > I am getting going on my second port. However in this new one are many > little patches > to most of the source code. I always see '.orig' suffixes appended to in > Freebsd diff files, like > > --- Src/DasherCore/FileLogger.cpp.orig Tue Jan 17 01:41:44 2006 > +++ Src/DasherCore/FileLogger.cpp Tue Jan 17 01:51:33 2006 > > but for the life of me I don't know a way to produce these '.orig' suffixes > in the patch file other than > hand editing. Using diff I never get an '.orig' suffix but something like: > > diff -r -u --ignore-all-space work/FFFF323-src/FFFF3.cpp > FFFF323-src/FFFF3.cpp > --- work/FFFF323-src/FFFF3.cpp Thu Mar 9 02:37:18 2006 > +++ FFFF323-src/FFFF3.cpp Fri Sep 8 04:02:57 2006 > > What is the trick to this? There is no trick. (15:34:01 jdc@icarus) ~ $ cat x z >> z2 (15:34:12 jdc@icarus) ~ $ diff -ruN z z2 | head -10 --- z Sun Sep 17 23:40:03 2006 +++ z2 Mon Sep 18 15:34:12 2006 @@ -1,3 +1,41 @@ +Support, + +Please investigate. + + Packets Pings + Host Loss% Snt Rcv Last Avg Best Wrst + 1. gw.home.lan 0.0% 132 132 0.4 0.4 0.4 0.7 My recommended method is to simply make a copy of the source directory via `cp -pR sourcedir sourcedir.orig`, then edit to your hearts content in sourcedir/, then `diff -ruN sourcedir.orig sourcedir > out` -- | Jeremy Chadwick jdc at parodius.com | | Parodius Networking http://www.parodius.com/ | | UNIX Systems Administrator Mountain View, CA, USA | | Making life hard for others since 1977. PGP: 4BD6C0CB |