From owner-freebsd-questions@FreeBSD.ORG Tue Jan 27 14:06:58 2004 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE84F16A4CE for ; Tue, 27 Jan 2004 14:06:58 -0800 (PST) Received: from dan.emsphone.com (dan.emsphone.com [199.67.51.101]) by mx1.FreeBSD.org (Postfix) with ESMTP id C970943D53 for ; Tue, 27 Jan 2004 14:06:46 -0800 (PST) (envelope-from dan@dan.emsphone.com) Received: (from dan@localhost) by dan.emsphone.com (8.12.10/8.12.10) id i0RM6iXd053010; Tue, 27 Jan 2004 16:06:44 -0600 (CST) (envelope-from dan) Date: Tue, 27 Jan 2004 16:06:44 -0600 From: Dan Nelson To: Rob Ellis , freebsd-questions@freebsd.org Message-ID: <20040127220643.GC26356@dan.emsphone.com> References: <20040127190516.GP57848@web.ca> <20040127213316.GA81362@falcon.midgard.homeip.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20040127213316.GA81362@falcon.midgard.homeip.net> X-OS: FreeBSD 5.2-CURRENT X-message-flag: Outlook Error User-Agent: Mutt/1.5.5.1i Subject: Re: Tracking local port hacks? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jan 2004 22:06:58 -0000 In the last episode (Jan 27), Erik Trulsson said: > On Tue, Jan 27, 2004 at 02:05:16PM -0500, Rob Ellis wrote: > > We sometimes find it necessary to make some small change to a port > > before installing it, and need a way to track/merge these changes > > as ports are updated. Is there a recommended way of doing that? > > > > The cvsup faq (http://www.cvsup.org) suggests that it's possible to > > get sources in "cvs mode" and it has some suggestions for managing > > a local branch. Is that the best way to do it? Anyone know how BIG > > the ports tree is if we get it via cvsup in "cvs mode"? > > Using cvsup to maintain a copy of the whole (or part of the) CVS > repository, and then using cvs to check out the branch/version you > want is certainly one way to do it. Cvs (unlike cvsup) understands > local changes and can merge changed files (assuming the changes don't > conflict of course, then you have to do some editing by hand.) > > I don't know if it is the *best* way of doing it, but it is the way I > do it and it works fairly well. I do it too. It takes a bit longer to update, since you have to "cvsup" then cvs "update -dP", but I do it at night via cron, and get an email the next morning if there were any conflicts with local changes. > The ports part of the CVS repository uses around 600MB of disk space. Another plus is you get instant access to cvs logs and diffs. -- Dan Nelson dnelson@allantgroup.com