From owner-freebsd-ports@FreeBSD.ORG  Wed Mar 14 07:12:59 2007
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
X-Original-To: freebsd-ports@freebsd.org
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9037216A400
	for <freebsd-ports@freebsd.org>; Wed, 14 Mar 2007 07:12:59 +0000 (UTC)
	(envelope-from swhetzel@gmail.com)
Received: from an-out-0708.google.com (an-out-0708.google.com [209.85.132.242])
	by mx1.freebsd.org (Postfix) with ESMTP id 5346E13C448
	for <freebsd-ports@freebsd.org>; Wed, 14 Mar 2007 07:12:59 +0000 (UTC)
	(envelope-from swhetzel@gmail.com)
Received: by an-out-0708.google.com with SMTP id c24so83765ana
	for <freebsd-ports@freebsd.org>; Wed, 14 Mar 2007 00:12:58 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=S0pO3s7pjv01nn2ntEBC/2GvTutthFIfO/wrr47oHLcx2PCNPF/lEKfh/Yhl4UInlnf7Nmw9nBR55h1ItXGAXhIMsWnE5JAGoPnWKBuVEOT7lAQuyZKobQeFMwANxKtgkQJzRLYLxKN9owv9TaUe2awGhTKjFt7yzp69fqcL/U8=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=GSxN3oU8tni1do/qctTuG59ees4EaIvoTI6qiJ/0V9yfcGxQyIsdq+wjbGDXUK8MT2ON2MunW3P7x5zJ0sRUdFPLdu/xM8uv35QPx236zljpUI7vKpDfXW9Kb0BofMAvuTWTcGhxORN8lL6+lC9eZtIUX2rl0dfVeSxrdsJ4TbE=
Received: by 10.100.191.5 with SMTP id o5mr1434987anf.1173856378570;
	Wed, 14 Mar 2007 00:12:58 -0700 (PDT)
Received: by 10.100.141.14 with HTTP; Wed, 14 Mar 2007 00:12:58 -0700 (PDT)
Message-ID: <790a9fff0703140012o7a034644vc631e07dce2e073e@mail.gmail.com>
Date: Wed, 14 Mar 2007 02:12:58 -0500
From: "Scot Hetzel" <swhetzel@gmail.com>
To: "Nate Eldredge" <nge@cs.hmc.edu>
In-Reply-To: <Pine.LNX.4.64.0703132319320.1824@knuth.cs.hmc.edu>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <Pine.LNX.4.64.0703132319320.1824@knuth.cs.hmc.edu>
Cc: freebsd-ports@freebsd.org
Subject: Re: portsnap and local patches
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Mar 2007 07:12:59 -0000

On 3/14/07, Nate Eldredge <nge@cs.hmc.edu> wrote:
> Hi all,
>
> portsnap is a very nice way to keep your ports tree in sync, but it has
> the disadvantage that it keeps your ports tree in sync :)  If you make
> local changes (e.g. adding a patch) they get clobbered.  Does anyone know
> of a convenient way to keep ports up to date while preserving local
> patches?
>
One way to keep your local changes is to use cvs to checkout and
update the ports tree, you then make your modifications to the port.

You will need to fix any conflicts manually between an updated port
and your changes.

Scot
-- 
DISCLAIMER:
No electrons were mamed while sending this message. Only slightly bruised.