From owner-cvs-ports Mon Mar 31 12:08:41 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id MAA06829 for cvs-ports-outgoing; Mon, 31 Mar 1997 12:08:41 -0800 (PST) Received: from awfulhak.demon.co.uk (awfulhak.demon.co.uk [158.152.17.1]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id MAA06797; Mon, 31 Mar 1997 12:08:17 -0800 (PST) Received: from awfulhak.demon.co.uk (localhost.lan.awfulhak.org [127.0.0.1]) by awfulhak.demon.co.uk (8.8.5/8.8.5) with ESMTP id UAA14396; Mon, 31 Mar 1997 20:55:16 +0100 (BST) Message-Id: <199703311955.UAA14396@awfulhak.demon.co.uk> X-Mailer: exmh version 1.6.9 8/22/96 To: obrien@NUXI.com cc: Brian Somers , Brian Somers , CVS-committers@freebsd.org, cvs-ports@freebsd.org Subject: Re: cvs commit: ports/net/netcat - Imported sources In-reply-to: Your message of "Mon, 31 Mar 1997 09:23:22 -0800." <19970331092322.03627@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Date: Mon, 31 Mar 1997 20:55:16 +0100 From: Brian Somers Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by freefall.freebsd.org id MAB06822 Sender: owner-cvs-ports@freebsd.org X-Loop: FreeBSD.org Precedence: bulk > On Mon, Mar 31, 1997 at 02:32:20PM +0100, Brian Somers wrote: > > Sorry - I didn't see it (and still can't) - where is it ? > > $ cd /usr/ports > > $ echo */net* */nc > > doesn't come up with anything of interest. > > > /usr/ports on which machine? freefall:/usr/ports/net has it... BUT more > imporatantly freefall:/home/ncvs/ports/net has it. Ah. I made this port at work on a 961014-SNAP machine and completely failed to notice it was already on my -current machine at home *blush*. Sorry. I mucked around doing "cvs import" on my home machine to make sure I didn't screw up too badly, then removed $CVSROOT/ports/net/netcat.... but obviously not necessarily in that order for netcat. It's nice to have an example of what I should have done - nearly got it right :) How do I back this out ? Do I get all the revision 1.1.1.1s and write them as new revisions (1.1.1.3), then cvs rm the patches stuff - or is there a more subtle way ? > > > You aren't using ``easy-import'' are you? I can't check out > > > ports/net/arpwatch: > > > > > > freefall:~/ports/net> cvs co arpwatch > > > cvs checkout: cannot find module `arpwatch' - ignored > > > > Works ok for me. > > > > freefall:~brian $ cvs co ports/net/arpwatch > > Yes, but you didn't commit it the the CVSROOT/modules database. So > checking it out by module name doesn't work. You can ``cvs co modules'' > and add it easily. Hey, that's neat. I didn't know you could do that. So everything on the left hand side of "modules" can be "cvs co"d rather than typing in the long version on the right hand side :) [.....] > > I havn't updated net/Makefile yet - I thought I'd cringe for a while > > before breaking the world. > > Go ahead and update it. arpwatch built fine for me. Will do. > > BTW, what's ``easy-import'' ? > > It is a nice perl script that Joerg wrote. It is in > /usr/share/examples/cvs/contrib on all machines, and /usr/local/bin on > freefall. It keeps you from commiting in the wrong place (ie. keeps you > to src, ports, www, etc). And w/in ports keeps you w/in the existing > categories. It will check to see if the thing you are importing is > already their, check out the modules database and update. Then it does > the import on the vendor branch. You would use it for adding ports, and > contrib software. > > Enjoy! > > -- > -- David (obrien@NUXI.com -or- obrien@FreeBSD.org) > Thanks - I'll take a look. -- Brian , Don't _EVER_ lose your sense of humour....