From owner-freebsd-questions@FreeBSD.ORG Mon May 5 18:14:45 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 5AFB037B401 for ; Mon, 5 May 2003 18:14:45 -0700 (PDT) Received: from thalia.otenet.gr (mailsrv.otenet.gr [195.170.0.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC1B043FBD for ; Mon, 5 May 2003 18:14:43 -0700 (PDT) (envelope-from keramida@ceid.upatras.gr) Received: from gothmog.gr (patr530-b196.otenet.gr [212.205.244.204]) by thalia.otenet.gr (8.12.9/8.12.9) with ESMTP id h461Ed5V004236; Tue, 6 May 2003 04:14:40 +0300 (EEST) Received: from gothmog.gr (gothmog [127.0.0.1]) by gothmog.gr (8.12.9/8.12.9) with ESMTP id h461Edhl069419; Tue, 6 May 2003 04:14:39 +0300 (EEST) (envelope-from keramida@ceid.upatras.gr) Received: (from giorgos@localhost) by gothmog.gr (8.12.9/8.12.9/Submit) id h461Ecca069418; Tue, 6 May 2003 04:14:38 +0300 (EEST) (envelope-from keramida@ceid.upatras.gr) Date: Tue, 6 May 2003 04:14:38 +0300 From: Giorgos Keramidas To: =?greek?B?wdK51Q==?= Message-ID: <20030506011438.GA69227@gothmog.gr> References: <20030506003703.11368.qmail@web21503.mail.yahoo.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030506003703.11368.qmail@web21503.mail.yahoo.com> cc: questions@freebsd.org Subject: Re: checkout doc from /home/ncvs 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, 06 May 2003 01:14:45 -0000 On 2003-05-05 17:37, radwasteus@yahoo.com wrote: > > i have just finished cvsup -g -L 2 cvs-supfile into /home/ncvs. it > really took very long time. here is my cvs-supfile > [...snip supfile...] A brave soul you are :) > i put CVSROOT environment variable to /home/ncvs then i did a cvs > checkout doc at /usr. i got so many files in /usr/doc and > /usr/share/doc. > > once i did make at /usr/doc, i got errors that said > share/mk/doc.docbook.mk/Makefile line number 2,4,6 contain or need > operators. actually those lines begin with <<<<, ====, and <<<< > respectively. These are "conflicts". Places where your local docs contained changes that CVS can't merge with the state of the files in the repository. Putting this aside for a while, you don't have to use /usr/doc for checking out a doc/ tree and working with it. > my question is that what is the right way to checkout doc, or other > like ports and src, from CVSROOT ? I usually use something like this (to check out a copy of the English docs only): $ cd /tmp $ mkdir giorgos $ cd giorgos $ export CVSROOT=/home/ncvs $ cvs checkout doc/README doc/Makefile \ doc/share doc/en_US.ISO8859-1 $ cd doc $ cvs -qR update -APd * && cvs -qR update -APd * The final two 'cvs update' commands are to make sure I don't have any stale files in my doc/ tree. The second one should (if all things have worked fine) produce NO output at all. After this is done, the following should work without problems[1]: $ cd /tmp/giorgos/doc/en_US.ISO8859-1 $ make FORMATS="html" [1] Provided you have taken care of installing the textproc/docproj port already; obviously. - Giorgos