From owner-freebsd-ports@FreeBSD.ORG Wed Jan 9 07:23:25 2013 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B1E6B654 for ; Wed, 9 Jan 2013 07:23:25 +0000 (UTC) (envelope-from utisoft@gmail.com) Received: from mail-ie0-f175.google.com (mail-ie0-f175.google.com [209.85.223.175]) by mx1.freebsd.org (Postfix) with ESMTP id 841A6746 for ; Wed, 9 Jan 2013 07:23:25 +0000 (UTC) Received: by mail-ie0-f175.google.com with SMTP id qd14so1617878ieb.6 for ; Tue, 08 Jan 2013 23:23:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=6caN6g62H6CLIZqfSoaD9YmGoeIVscRlQXcZkYfyKb0=; b=VDlqy+9hvVMRbLfN+iKVPsqvyg7XVYZbC9MLnbRw0AqV67Ls/lYtsAaRmaTS1txS10 UGtQEtO3MWyji3jtULXDe2a7+d0N2pnjhD/2ywQI0T9Y51RJy9kLJW+rSef3aYGxtroQ M7aECJoEgAdsgAsZLuFASpO4rjfce88ZahWnrvdSpsB/0fXY9aytMoyn9qb0q9/KETNv 9gaa58ZF7Zu+LGwdZhK2aPZwsrmX80NJi7+N3DC8YCq/zlV0mrZD+Da4ulre6Xoa19ml Ar5orCEKSMh9bs/Ae7Wd6pdEcxIJCgVvvxzmZZWf7ZGjeO54megmwejkWK+P/P7HWl+y DUdQ== MIME-Version: 1.0 X-Received: by 10.50.202.97 with SMTP id kh1mr576217igc.15.1357716199575; Tue, 08 Jan 2013 23:23:19 -0800 (PST) Received: by 10.64.65.132 with HTTP; Tue, 8 Jan 2013 23:23:19 -0800 (PST) Received: by 10.64.65.132 with HTTP; Tue, 8 Jan 2013 23:23:19 -0800 (PST) In-Reply-To: <20130108215222.GE2001@albert.catwhisker.org> References: <20130108215222.GE2001@albert.catwhisker.org> Date: Wed, 9 Jan 2013 07:23:19 +0000 Message-ID: Subject: Re: How to apply an svn diff From: Chris Rees To: David Wolfskill Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: Paul Schmehl , FreeBSD Mailing List X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2013 07:23:25 -0000 On 8 Jan 2013 21:52, "David Wolfskill" wrote: > > On Tue, Jan 08, 2013 at 03:47:30PM -0600, Paul Schmehl wrote: > > Once you've created an svn diff and submitted it using send-pr, how is the > > diff applied to update the port? I can't seem to figure this out from > > reading the svn docs. > > .... > > The approach I prefer involves invoking "svn patch". (This is not > specific to ports, btw.) > > g1-227(9.1-S)[1] svn help patch > patch: Apply a patch to a working copy. > usage: patch PATCHFILE [WCPATH] > > Apply a unidiff patch in PATCHFILE to the working copy WCPATH. > If WCPATH is omitted, '.' is assumed. > .... I intensely dislike the way svn patch wants a file specified rather than using stdin; my technique is to use curl "url" | patch. I'll fix that one of these days... Chris