From owner-freebsd-ports@FreeBSD.ORG Tue Mar 3 15:22:01 2015 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 34533F1E; Tue, 3 Mar 2015 15:22:01 +0000 (UTC) Received: from astart2.astart.com (wsip-72-214-30-30.sd.sd.cox.net [72.214.30.30]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1137DA91; Tue, 3 Mar 2015 15:21:59 +0000 (UTC) Received: from laptop_93.private (localhost [127.0.0.1]) by astart2.astart.com (8.14.9/8.14.9) with ESMTP id t23FLqif053383; Tue, 3 Mar 2015 07:21:52 -0800 (PST) (envelope-from papowell@astart.com) Message-ID: <54F5D190.7050402@astart.com> Date: Tue, 03 Mar 2015 07:21:52 -0800 From: Patrick Powell Reply-To: papowell@astart.com Organization: Astart Technologies User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: koobs@FreeBSD.org, FreeBSD Ports ML Subject: Re: Generating port changes easily References: <54F09CC7.1000407@astart.com> <54F16F90.2070600@FreeBSD.org> In-Reply-To: <54F16F90.2070600@FreeBSD.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2015 15:22:01 -0000 On 02/27/15 23:34, Kubilay Kocak wrote: > On 28/02/2015 3:35 AM, Patrick Powell wrote: >> I have made some modifications to a port - couple of lines in the >> Makefile, and an updated pkg-plist. >> >> Once upon a time I was shown a script (run_this_script?) to help with >> updating a port. >> >> 1. Copy the original files in the port to XXX.orig (or something) >> For example cp Makefile Makefile.orig >> 2. Make your changes >> For example: vi Makefile .... >> 3. Now run this script which will generate a DIFF file which can be >> posted: >> run_this_script ... >/tmp/changes.shar ? >> run_this_script ... >/tmp/diffs ? >> 4. Post the generated file to bugzilla with an update request. >> >> Ummm... is there such a 'run_this_script' or am I indulging in wishful >> thinking? >> > If the changes you make are in the ports files, porttools has a `port > diff` command (which uses a reference ports tree to create diffs > against. You can use /usr/ports as that reference, and in fact I believe > that is the default. > > You can then just port diff > path-to-patch-file.diff, ready for > attachment into a new bugzilla issue. > > If the patch is against WRKSRC source code, you can > > a) cp WRKSRC/file WRKSRC/file.orig > b) edit file > c) make makepatch (from the port dir) > > makepatch recursively searches WRKSRC for *.orig files, and > automatically creates correctly named patch-foo patch files in /files > for you. > > Hope that helps > > -- > > koobs > > Excellent suggestions, both. I tried port diff AND make makepatch - both seemed to work as advertised. Thanks for the help! -- Patrick Powell Astart Technologies papowell@astart.com 1530 Jamacha Rd, Suite X Network and System San Diego, CA 92019 Consulting 858-874-6543 FAX 858-751-2435 Web: www.astart.com