From owner-freebsd-ports@FreeBSD.ORG Thu Sep 29 14:13:10 2005 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 DB27A16A41F for ; Thu, 29 Sep 2005 14:13:10 +0000 (GMT) (envelope-from danny@ricin.com) Received: from smtpq2.home.nl (smtpq2.home.nl [213.51.128.197]) by mx1.FreeBSD.org (Postfix) with ESMTP id 679EB43D49 for ; Thu, 29 Sep 2005 14:13:09 +0000 (GMT) (envelope-from danny@ricin.com) Received: from [213.51.128.136] (port=54843 helo=smtp5.home.nl) by smtpq2.home.nl with esmtp (Exim 4.30) id 1EKz9p-0006t8-1p; Thu, 29 Sep 2005 16:13:09 +0200 Received: from cp464173-a.dbsch1.nb.home.nl ([84.27.215.228]:63801 helo=desktop.homenet) by smtp5.home.nl with esmtp (Exim 4.30) id 1EKz9m-000116-3p; Thu, 29 Sep 2005 16:13:06 +0200 From: Danny Pansters To: freebsd-ports@freebsd.org Date: Thu, 29 Sep 2005 16:12:25 +0000 User-Agent: KMail/1.8.1 References: <433B558D.8000204@computer.org> <34bd754105092820056ab6f73d@mail.gmail.com> <433B6870.7070802@computer.org> In-Reply-To: <433B6870.7070802@computer.org> X-Face: "0Qv=,p:+]LvuqrtS4U\z3k"qN=.1]@=?utf-8?q?=258=3F=3BPoab=23v=27F=7E=0A=09!Wm=5Fe-=24=7EL=5D=3B?=>[c*L^Qoladj)x@mH}Bqz"vLO?Zdl}[@V@=?utf-8?q?U=3Fx3=23lI=3A=0A=09=24DN=7E!Hr?=@K`-mNv"zXm MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200509291612.26221.danny@ricin.com> X-AtHome-MailScanner-Information: Please contact support@home.nl for more information X-AtHome-MailScanner: Found to be clean Cc: Eric Schuele Subject: Re: Need help with patching a file in a new port.... 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: Thu, 29 Sep 2005 14:13:11 -0000 On Thursday 29 September 2005 04:07, Eric Schuele wrote: > I have compared my diff to other port's diffs and the first few lines of > mine 'seem' reasonable. But then again I'm not really sure how they > should look. > > If my port is in > /usr/ports/sysutils/foo > And I go in there and type > make install > The tarball is pulled down into distfiles and unpacked into > /usr/ports/sysutils/foo/work This is $WORKDIR > below work exists $WORKDIR/foo-0.1.1 would be $WRKSRC then. The patch-* files should be diffs taken against $WRKSRC. > /foo-0.1.1/src > There exists in src a Makefile. It is this file I have modified. The > full path to this modified file is: > /usr/ports/sysutils/foo/work/foo-0.1.1/src > > The first two lines of my patch-* file (presently, after some messing > around) look like: > --- foo-0.1.1/src/Makefile.orig Fri Apr 8 07:17:10 2005 > +++ foo-0.1.1/src/Makefile Wed Sep 28 21:14:29 2005 > > Given your comments above, I'm even more confused. Have I generated the > diff in the wrong format (I used `diff -ru `)? Are your comments > related to another file which needs tweaking? In this case you would: # cd /usr/ports/sysutils/foo/work/foo-0.1.1/src # cp Makefile Makefile.orig # (make your changes to Makefile) # cd .. # diff -u src/Makefile.orig src/Makefile > ../../files/patch-src:Makefile It doesn't really matter what name you give the patchfile, but a descriptive one (eg indicating the path) will be appreciated. Dan