Date: Sun, 26 Sep 1999 18:52:29 +0100 From: Mark Ovens <mark@ukug.uk.freebsd.org> To: Juergen Lock <nox@jelal.kn-bremen.de> Cc: freebsd-ports@FreeBSD.ORG Subject: Re: Help with RCS files, patches, and PR's required. Message-ID: <19990926185228.M282@marder-1> In-Reply-To: <199909261722.TAA97473@saturn.kn-bremen.de> References: <19990926162508.E282@marder-1> <199909261722.TAA97473@saturn.kn-bremen.de>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Sep 26, 1999 at 07:22:52PM +0200, Juergen Lock wrote:
> In article <19990926162508.E282@marder-1> you write:
> >I'm a relative newbie to using the ports so apologies if this is
> >a dumb question, but I did read the Handbook, FAQ, and several
> >other docs when I installed cvsup and started using it.
> >
> >I've just made patches for the bochs port for the latest source
> >code (990925, which allows Win95 to install without bombing at the
> >first reboot) and was about to submit a PR but then I noticed that
> >most (all?) port patches are diffs against the RCS (*,v) files.
>
> Well they are not `against' the RCS files, they were just generated
> using those (using `cvs diff').
Ah, right.
> >
> >OK, I'll do the same, but then I find I don't have any RCS files
> >on my system.
>
> If you want that and you have some >600MB free space somewhere then
600MB? Hmm, don't think I'll bother.
> you'll need to grab (cvsup, ctm, ...) the cvs tree (a snapshot of it
> is also on the 4-CD set, you can use that as a starting point for
> cvsup to reduce net load...) Or use anoncvs, that should also work
> (which is what i do with the wine source). But you don't need that
> as long as you properly backup the version you cvsup'd before
> applying your local patches, and then diff -r against the backup
So it is perfectly acceptable to submit diffs without the RCS stuff
in them? e.g. just something like:
*** Makefile.orig Sun Sep 26 11:09:43 1999
--- Makefile Sun Sep 26 10:50:28 1999
***************
*** 7,14 ****
#
VGABIOS= VGABIOS-elpin-2.20
! BIOS= BIOS-bochs-990623a
! DATE= 990708
DISTNAME= bochs-${DATE}a
CATEGORIES= emulators
--- 7,14 ----
#
VGABIOS= VGABIOS-elpin-2.20
! BIOS= BIOS-bochs-990925a
! DATE= 990925
> (and revert to the backup before you cvsup again so you can backup
> the new versions again should there be any changes in the files you
> also changed)... Having the cvs tree available just makes this
> easier, no need to manually backup and keeping track of the original
> files, cvs knows how to deal with local patches. (and i can look
> at the commitlogs and checkout/diff against any versions/branches
> i want without needing/waiting for the net...)
> >
> >I use cvsup to keep my ports and docs trees up to date and one
> >thing I thought cvsup did the first time it was run was to build
> >a local RCS tree, in fact I believe(d) that it is exactly these
> >files that cvsup uses to determine what needs to be updated.
> >
> cvsup uses the cvs tree to determine what needs to be updated, but
> it doesn't mirror it on the local system. (unless you told it to of
> course, i.e. you cvsup the cvs tree itself.)
>
I've just taken a closer look at the ports directory. Am I right
in thinking that cvsup uses the entry in
/usr/ports/<group>/<port_name>/CVS/Entries to determine the current
local version?
> >Furthermore I've got the patches submitted for the latest version
> >of the wine(1) source code (ports/13952) and these are indeed diffs
> >against the RCS files, so without local copies of these how can I
> >apply the patches other than by hand?
>
> Have you actually tried applying them? :) they should do just fine.
> (in a `cvs diff' type patch the `Index: ' lines tell patch(1) what
> files to patch, the `RCS file: ' lines are just comments for it.)
>
OK, I'll give it a try.
Thanks for the detailed explanation, it's solved the mystery for
me.
> Regards,
> --
> Juergen Lock <nox.foo@jelal.kn-bremen.de>
> (remove dot foo from address to reply)
--
STATE-OF-THE-ART: Any computer you can't afford.
OBSOLETE: Any computer you own.
________________________________________________________________
FreeBSD - The Power To Serve http://www.freebsd.org
My Webpage http://ukug.uk.freebsd.org/~mark/
mailto:mark@ukug.uk.freebsd.org http://www.radan.com
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990926185228.M282>