From owner-cvs-all Tue Oct 29 7:34: 2 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 6485937B401; Tue, 29 Oct 2002 07:34:00 -0800 (PST) Received: from abigail.blackend.org (blackend.org [212.11.50.35]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27EBB43E3B; Tue, 29 Oct 2002 07:33:56 -0800 (PST) (envelope-from marc@blackend.org) Received: from nosferatu.blackend.org (nosferatu.blackend.org [192.168.1.205]) by abigail.blackend.org (8.12.3/8.12.3) with ESMTP id g9TFXp4f031639; Tue, 29 Oct 2002 16:33:51 +0100 (CET) (envelope-from marc@abigail.blackend.org) Received: from nosferatu.blackend.org (localhost [127.0.0.1]) by nosferatu.blackend.org (8.12.6/8.12.6) with ESMTP id g9TFVGA0005652; Tue, 29 Oct 2002 16:31:16 +0100 (CET) (envelope-from marc@nosferatu.blackend.org) Received: (from marc@localhost) by nosferatu.blackend.org (8.12.6/8.12.6/Submit) id g9TFV79A005651; Tue, 29 Oct 2002 16:31:07 +0100 (CET) Date: Tue, 29 Oct 2002 16:31:06 +0100 From: Marc Fonvieille To: John Hay Cc: Nik Clayton , Kent Stewart , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: doc/en_US.ISO8859-1/books/handbook/install chapter.sgml Message-ID: <20021029153106.GA458@nosferatu.blackend.org> References: <20021029074744.GL20263@clan.nothing-going-on.org> <200210291306.g9TD6CgZ072206@zibbi.icomtek.csir.co.za> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200210291306.g9TD6CgZ072206@zibbi.icomtek.csir.co.za> User-Agent: Mutt/1.4i X-Useless-Header: blackend.org X-Operating-System: FreeBSD 4.7-STABLE 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 On Tue, Oct 29, 2002 at 03:06:12PM +0200, John Hay wrote: > > On Mon, Oct 28, 2002 at 08:19:15PM -0800, Kent Stewart wrote: > > > Nik Clayton wrote: > > > >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