From owner-cvs-all Wed Oct 30 1: 5:50 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ABFAA37B65C; Wed, 30 Oct 2002 01:05:46 -0800 (PST) Received: from zibbi.icomtek.csir.co.za (zibbi.icomtek.csir.co.za [146.64.24.58]) by mx1.FreeBSD.org (Postfix) with ESMTP id D277543E77; Wed, 30 Oct 2002 01:05:39 -0800 (PST) (envelope-from jhay@zibbi.icomtek.csir.co.za) Received: from zibbi.icomtek.csir.co.za (localhost [IPv6:::1]) by zibbi.icomtek.csir.co.za (8.12.6/8.12.6) with ESMTP id g9U95YD8018866; Wed, 30 Oct 2002 11:05:34 +0200 (SAT) (envelope-from jhay@zibbi.icomtek.csir.co.za) Received: (from jhay@localhost) by zibbi.icomtek.csir.co.za (8.12.6/8.12.6/Submit) id g9U95YVM018865; Wed, 30 Oct 2002 11:05:34 +0200 (SAT) (envelope-from jhay) From: John Hay Message-Id: <200210300905.g9U95YVM018865@zibbi.icomtek.csir.co.za> Subject: Re: cvs commit: doc/en_US.ISO8859-1/books/handbook/install chapter.sgml In-Reply-To: <20021029153106.GA458@nosferatu.blackend.org> from Marc Fonvieille at "Oct 29, 2002 04:31:06 pm" To: blackend@FreeBSD.org (Marc Fonvieille) Date: Wed, 30 Oct 2002 11:05:34 +0200 (SAT) Cc: jhay@icomtek.csir.co.za (John Hay), nik@FreeBSD.org (Nik Clayton), kstewart@owt.com (Kent Stewart), cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org X-Mailer: ELM [version 2.4ME+ PL54 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Yes, with this patch a make release finish without error, so will someone commit it please? Or something to that effect. For now I'll just disable the doc build in my automatic snap build scripts. John -- John Hay -- John.Hay@icomtek.csir.co.za / jhay@FreeBSD.org > > > > >nik 2002/10/28 14:46:14 PST > > > > > > > > > > Modified files: > > > > > en_US.ISO8859-1/books/handbook/install chapter.sgml > > > > > Log: > > > > > Add a for the userconfig2 screenshot. > > > > > > > > > > Revision Changes Path > > > > > 1.223 +5 -1 > > > > > doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml > > > > > > > > I just cvsuped docs-all and it couldn't find userconfig.txt and > > > > userconfig2.txt. It complained but didn't kill the make. > > > > > > Your doc/share/mk tree is out of date. In particular, you need the most > > > recent updates to doc.images.mk, which generates the .txt files from the > > > .scr files. You also need r1.10 of ports/textproc/docproj installed, > > > which introduces a new dependency on ports/textproc/scr2txt. > > > > I saw this on both my -stable and -current releases builds. How does > > one go about updating it? The script do a cvsup of the cvs bits > > before doing the release, so I don't know what more I can do. Maybe > > there is something missing in cvs? > > > > Indeed installing scr2txt etc., is not enough. > > Here's a quick hack of doc.images.mk to allow the build: > > --- doc.images.mk Mon Oct 28 20:41:55 2002 > +++ doc.images.mk.new Tue Oct 29 16:29:02 2002 > @@ -131,18 +131,17 @@ > # Use suffix rules to convert .scr files to other formats > .SUFFIXES: .scr .pic .png .eps .txt > > +# The .txt files are built on the fly with .png files. > +# The .txt files need to have any trailing spaces trimmed from > +# each line, which is why the output from ${SCR2TXT} is run > +# through ${SED} > .scr.png: > ${SCR2PNG} ${SCR2PNGOPTS} < ${.IMPSRC} > ${.TARGET} > + ${SCR2TXT} ${SCR2TXTOPTS} < ${.IMPSRC} | ${SED} -E -e 's/ +$$//' > ${.TARGET:S/.png$/.txt/} > .scr.eps: > ${SCR2PNG} ${SCR2PNGOPTS} < ${.ALLSRC} | \ > ${PNGTOPNM} ${PNGTOPNMOPTS} | \ > ${PNMTOPS} ${PNMTOPSOPTS} > ${.TARGET} > - > -# The .txt files need to have any trailing spaces trimmed from > -# each line, which is why the output from ${SCR2TXT} is run > -# through ${SED} > -.scr.txt: > - ${SCR2TXT} ${SCR2TXTOPTS} < ${.IMPSRC} | ${SED} -E -e 's/ +$$//' > ${.TARGET} > > # Some versions of ghostscript (7.04) have problems with the use of > # relative path when the arguments are passed by peps; realpath will > > Marc > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message