From owner-freebsd-questions@FreeBSD.ORG Thu Jul 31 13:49:56 2003 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 25B5737B401 for ; Thu, 31 Jul 2003 13:49:54 -0700 (PDT) Received: from webserver.get-linux.org (adsl-64-161-78-226.dsl.lsan03.pacbell.net [64.161.78.226]) by mx1.FreeBSD.org (Postfix) with SMTP id 2E20943F75 for ; Thu, 31 Jul 2003 13:49:54 -0700 (PDT) (envelope-from oremanj@webserver.get-linux.org) Received: (qmail 26185 invoked by uid 1000); 31 Jul 2003 20:50:16 -0000 Date: Thu, 31 Jul 2003 13:50:16 -0700 From: oremanj@get-linux.org To: adstro@stny.rr.com Message-ID: <20030731205016.GB15236@webserver> References: <16aedf1718ef.1718ef16aedf@nyroc.rr.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <16aedf1718ef.1718ef16aedf@nyroc.rr.com> User-Agent: Mutt/1.4.1i cc: questions@freebsd.org Subject: Re: CVSUP 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: Thu, 31 Jul 2003 20:49:56 -0000 On Thu, Jul 31, 2003 at 03:00:55PM -0400 or thereabouts, adstro@stny.rr.com wrote: > 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. "It's a feature, not a bug." :-) If you have lots of disk space, you can try using CVSup to mirror the CVS repository and let CVS merge your changes: * Omit the `tag' in your cvsupfile. Just don't put one in. * Change the `prefix' to a place where you have a lot of space, such as /usr/local/portcvs. (Do NOT use /usr!) * Cvsup as normal. * You should find a lot of files in /usr/local/portcvs/ports/* with names ending in ",v". These are the CVS files. * Back up your ports tree (mv /usr/ports /usr/ports.old). * cd /usr && cvs -d /usr/local/portcvs checkout ports * If all went well, you have a ports tree. Now, always cvsup this way. To update your main ports tree, do `cd /usr/ports && cvs -d /usr/local/portcvs update'. This will try and merge your changes. This may have been a bit difficult to understand. I'm sure someone else can explain it better than I :-) -- Josh > > Thanks > > _______________________________________________ > freebsd-questions@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-questions > To unsubscribe, send any mail to "freebsd-questions-unsubscribe@freebsd.org"