From owner-freebsd-questions@FreeBSD.ORG  Fri Aug  1 02:37:31 2003
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
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 3523D37B401
	for <questions@freebsd.org>; Fri,  1 Aug 2003 02:37:30 -0700 (PDT)
Received: from mintaka.emea.mci.com (mintaka.wcom.co.uk [193.131.254.155])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D8F4543F3F
	for <questions@freebsd.org>; Fri,  1 Aug 2003 02:37:29 -0700 (PDT)
	(envelope-from philip.payne@uk.mci.com)
Received: from sirius.emea.mci.com ([166.59.189.29] helo=sirus.emea.mci.com)
	by mintaka.emea.mci.com with esmtp (Exim 4.20)
	id 19iWLn-0006TB-Jd
	for questions@freebsd.org; Fri, 01 Aug 2003 10:37:27 +0100
Received: from ocampa.wcom.co.uk ([166.59.189.250] helo=ocampa.emea.mci.com)
	by sirus.emea.mci.com with esmtp (Exim 4.12)
	id 19iWLa-0001BD-00; Fri, 01 Aug 2003 10:37:14 +0100
Received: from [62.191.1.65] (helo=ukcamgate1.cbg.uk.corp.eu.uu.net)
	by ocampa.emea.mci.com with esmtp (Exim 4.14)
	id 19iWLZ-0003uP-PZ; Fri, 01 Aug 2003 09:37:13 +0000
Received: by ukcamgate1.cbg.uk.corp.eu.uu.net with Internet Mail Service
	(5.5.2653.19)	id <P71LVB5Y>; Fri, 1 Aug 2003 10:39:00 +0100
Message-ID: <36D04A8168B2D41182250008C7E6F8780374F9DC@ukcamexch2.cbg.uk.corp.eu.uu.net>
From: Philip Payne <philip.payne@uk.mci.com>
To: "'adstro@stny.rr.com'" <adstro@stny.rr.com>,
	questions@freebsd.org
Date: Fri, 1 Aug 2003 10:38:46 +0100 
MIME-Version: 1.0
X-Mailer: Internet Mail Service (5.5.2653.19)
Content-Type: text/plain;
	charset="iso-8859-1"
X-Spam-Score: -3.2 (---)
X-Scanner: exiscan for exim4 (http://duncanthrax.net/exiscan/)
	*19iWLa-0001BD-00*uLhVqeg2wxE*
Subject: RE: CVSUP
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>,
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>,
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Aug 2003 09:37:31 -0000

 
> I have a question about cvsup.  I read the manual and can 
> update my ports with no 
> problem.  Here is my question though...what if I was to 
> change the Makefile for a port? 
>  Is there a way I can still use CVSup to update my ports and 
> merge the changes I made 
> in the old Makefile with the new Makefile instead of having 
> cvsup just delete the old 
> one.

I guess it would depend on the changes you were making but is the file
/usr/local/etc/pkgtools.conf any use?

If not, then I think mirroring the CVS tree is probably the way to go.

Phil.