From owner-freebsd-ports@FreeBSD.ORG Mon Sep 18 23:00:37 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 CFB5E16A4F1 for ; Mon, 18 Sep 2006 23:00:37 +0000 (UTC) (envelope-from fernan@iib.unsam.edu.ar) Received: from usmmx.unsam.edu.ar (usmmx.unsam.edu.ar [170.210.48.254]) by mx1.FreeBSD.org (Postfix) with ESMTP id 421DE43D7E for ; Mon, 18 Sep 2006 23:00:19 +0000 (GMT) (envelope-from fernan@iib.unsam.edu.ar) Received: from omega.iib.unsam.edu.ar ([192.168.10.14]) by usmmx.unsam.edu.ar with InterScan Message Security Suite; Mon, 18 Sep 2006 20:00:09 -0300 Received: from omega.iib.unsam.edu.ar (localhost [127.0.0.1])by omega.iib.unsam.edu.ar (8.13.6/8.13.6) with ESMTP id k8IN08PF098014; Mon, 18 Sep 2006 20:00:08 -0300 (ART)(envelope-from fernan@iib.unsam.edu.ar) Received: (from fernan@localhost)by omega.iib.unsam.edu.ar (8.13.6/8.13.6/Submit) id k8IN08VC098013; Mon, 18 Sep 2006 20:00:08 -0300 (ART)(envelope-from fernan@iib.unsam.edu.ar) X-Authentication-Warning: omega.iib.unsam.edu.ar: fernan set sender to fernan@iib.unsam.edu.ar using -f Date: Mon, 18 Sep 2006 20:00:08 -0300 From: Fernan Aguero To: MC Message-ID: <20060918230008.GB89966@iib.unsam.edu.ar> Mail-Followup-To: MC , 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> User-Agent: Mutt/1.5.13 (2006-08-11) X-imss-version: 2.042 X-imss-result: Passed X-imss-exclusionListMatch: =?utf-8?Q?iib?= Cc: freebsd-ports@freebsd.org 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 23:00:37 -0000 +----[ MC (18.Sep.2006 19:47): | | 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. +----] cp file file.orig edit file, fix things, hack away, and when you're done diff -u file.orig file will produce the kind of output you see all over the place in the FreeBSD repo. Using .orig it's just a matter of taste ... you can follow what most freebsd people do ... but you can use .bak, .old or whatever you want, provided you supply the old/bak/orig file first to diff ... The thing is that having the old file associated with '---' and the new file with '+++' makes one more comfortable, as things that got added in the new version of the file will get labeled by diff as '+', and things that got deleted in the new version will be shown as present in the old version (as '-'). Hope this makes it clearer for you, Fernan