From owner-freebsd-doc@FreeBSD.ORG Sat Mar 26 13:32:50 2005 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D2BF16A4CE; Sat, 26 Mar 2005 13:32:50 +0000 (GMT) Received: from smtp-1.dlr.de (smtp-1.dlr.de [195.37.61.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E45043D3F; Sat, 26 Mar 2005 13:32:48 +0000 (GMT) (envelope-from Hartmut.Brandt@dlr.de) Received: from dlr.de ([172.21.151.3]) by smtp-1.dlr.de with Microsoft SMTPSVC(5.0.2195.6713); Sat, 26 Mar 2005 14:32:45 +0100 Message-ID: <424565F5.9050904@dlr.de> Date: Sat, 26 Mar 2005 14:39:01 +0100 From: Hartmut Brandt User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:0.9.4.1) Gecko/20020314 Netscape6/6.2.2 X-Accept-Language: en-us MIME-Version: 1.0 To: Giorgos Keramidas References: <200503251410.00034.jhb@FreeBSD.org> <20050326004453.GA51118@gothmog.gr> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 26 Mar 2005 13:32:46.0246 (UTC) FILETIME=[4BC81C60:01C53208] cc: harti@freebsd.org cc: doc@freebsd.org Subject: Re: docs breaking my make release X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Mar 2005 13:32:50 -0000 I have forwarded this to Max Okumoto who did most of this work. I'm back on wednesday to look at it. harti Giorgos Keramidas wrote: >On 2005-03-25 14:09, John Baldwin wrote: > >>I'm trying to build a release with docs for some more ISO layout >>tweaks, but the doc build keeps failing. Any ideas? >> >>===> en_US.ISO8859-1/articles/checkpoint (all) >>Unclosed substitution for @ (/ missing) >>*** Error code 2 >> > >The IMAGE_EN substitutions done in doc/share/mk/ are broken. It seems >our make has changed its behavior and now expects '$' characters to be >doubled in expressions like this: > > FOO= ${BAR:S/.eps$/.png} > >Replacing all the patterns matched in doc/share/mk/*.mk with the >following patch fixes the doc build again. > >I'm not sure if the change in the behavior of make is a bug or if it >intentional. Harti would be the right person to answer this, I guess. > >Regards, >Giorgos > > >%%%% patch begins here %%%% >Index: doc.images.mk >=================================================================== >RCS file: /home/ncvs/doc/share/mk/doc.images.mk,v >retrieving revision 1.29 >diff -u -r1.29 doc.images.mk >--- doc.images.mk 23 Jul 2004 18:58:56 -0000 1.29 >+++ doc.images.mk 26 Mar 2005 00:36:30 -0000 >@@ -71,21 +71,21 @@ > _IMAGES_PIC= ${IMAGES:M*.pic} > _IMAGES_PIC+= ${LOCAL_IMAGES_EN:M*.pic} > >-IMAGES_GEN_PNG= ${_IMAGES_EPS:S/.eps$/.png/} >-IMAGES_GEN_EPS= ${_IMAGES_PNG:S/.png$/.eps/} >-IMAGES_GEN_PDF= ${_IMAGES_EPS:S/.eps$/.pdf/} >-IMAGES_SCR_PNG= ${_IMAGES_SCR:S/.scr$/.png/} >-IMAGES_SCR_EPS= ${_IMAGES_SCR:S/.scr$/.eps/} >-IMAGES_SCR_PDF= ${_IMAGES_SCR:S/.scr$/.pdf/} >-IMAGES_SCR_TXT= ${_IMAGES_SCR:S/.scr$/.txt/} >-IMAGES_PIC_PNG= ${_IMAGES_PIC:S/.pic$/.png/} >-IMAGES_PIC_EPS= ${_IMAGES_PIC:S/.pic$/.eps/} >-IMAGES_PIC_PDF= ${_IMAGES_PIC:S/.pic$/.pdf/} >+IMAGES_GEN_PNG= ${_IMAGES_EPS:S/.eps$$/.png/} >+IMAGES_GEN_EPS= ${_IMAGES_PNG:S/.png$$/.eps/} >+IMAGES_GEN_PDF= ${_IMAGES_EPS:S/.eps$$/.pdf/} >+IMAGES_SCR_PNG= ${_IMAGES_SCR:S/.scr$$/.png/} >+IMAGES_SCR_EPS= ${_IMAGES_SCR:S/.scr$$/.eps/} >+IMAGES_SCR_PDF= ${_IMAGES_SCR:S/.scr$$/.pdf/} >+IMAGES_SCR_TXT= ${_IMAGES_SCR:S/.scr$$/.txt/} >+IMAGES_PIC_PNG= ${_IMAGES_PIC:S/.pic$$/.png/} >+IMAGES_PIC_EPS= ${_IMAGES_PIC:S/.pic$$/.eps/} >+IMAGES_PIC_PDF= ${_IMAGES_PIC:S/.pic$$/.pdf/} > IMAGES_GEN_PDF+= ${IMAGES_PIC_PDF} ${IMAGES_SCR_PDF} > > CLEANFILES+= ${IMAGES_GEN_PNG} ${IMAGES_GEN_EPS} ${IMAGES_GEN_PDF} > CLEANFILES+= ${IMAGES_SCR_PNG} ${IMAGES_SCR_EPS} ${IMAGES_SCR_TXT} >-CLEANFILES+= ${IMAGES_PIC_PNG} ${IMAGES_PIC_EPS} ${_IMAGES_PIC:S/.pic$/.ps/} >+CLEANFILES+= ${IMAGES_PIC_PNG} ${IMAGES_PIC_EPS} ${_IMAGES_PIC:S/.pic$$/.ps/} > > IMAGES_PNG= ${_IMAGES_PNG} ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG} > IMAGES_EPS= ${_IMAGES_EPS} ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS} >@@ -187,10 +187,10 @@ > .scr.txt: > ${SCR2TXT} ${SCR2TXTOPTS} < ${.IMPSRC} | ${SED} -E -e 's/ +$$//' > ${.TARGET} > >-.pic.png: ${.TARGET:S/.png$/.eps/} >- ${EPSGEOM} -offset ${EPSGEOMOPTS} ${.TARGET:S/.png$/.eps/} \ >+.pic.png: ${.TARGET:S/.png$$/.eps/} >+ ${EPSGEOM} -offset ${EPSGEOMOPTS} ${.TARGET:S/.png$$/.eps/} \ > | ${EPS2PNM} ${EPS2PNMOPTS} \ >- -g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.TARGET:S/.png$/.eps/}` - \ >+ -g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.TARGET:S/.png$$/.eps/}` - \ > | ${PNMTOPNG} > ${.TARGET} > > .pic.ps: >@@ -225,7 +225,7 @@ > # the targets on the fly. > > .for _curimage in ${IMAGES_GEN_PNG} >-${_curimage}: ${_curimage:S/.png$/.eps/} >+${_curimage}: ${_curimage:S/.png$$/.eps/} > ${EPSGEOM} -offset ${EPSGEOMOPTS} ${.ALLSRC} \ > | ${EPS2PNM} ${EPS2PNMOPTS} \ > -g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.ALLSRC}` - \ >@@ -233,13 +233,13 @@ > .endfor > > .for _curimage in ${IMAGES_GEN_EPS} >-${_curimage}: ${_curimage:S/.eps$/.png/} >+${_curimage}: ${_curimage:S/.eps$$/.png/} > ${PNGTOPNM} ${PNGTOPNMOPTS} ${.ALLSRC} | \ > ${PNMTOPS} ${PNMTOPSOPTS} > ${.TARGET} > .endfor > > .for _curimage in ${IMAGES_GEN_PDF} >-${_curimage}: ${_curimage:S/.pdf$/.eps/} >+${_curimage}: ${_curimage:S/.pdf$$/.eps/} > ${EPSTOPDF} ${EPSTOPDFOPTS} --outfile=${.TARGET} ${.ALLSRC} > .endfor > >Index: doc.slides.mk >=================================================================== >RCS file: /home/ncvs/doc/share/mk/doc.slides.mk,v >retrieving revision 1.4 >diff -u -r1.4 doc.slides.mk >--- doc.slides.mk 7 Sep 2004 12:06:22 -0000 1.4 >+++ doc.slides.mk 26 Mar 2005 00:36:57 -0000 >@@ -65,16 +65,16 @@ > > ${DOC}.fo: ${SRCS} > .if defined(USE_SAXON) >- ${SAXON_CMD} ${DOC}.xml ${SLIDES_XSLPRINT} > ${.TARGET:S/.pdf$/.fo/} >+ ${SAXON_CMD} ${DOC}.xml ${SLIDES_XSLPRINT} > ${.TARGET:S/.pdf$$/.fo/} > .else >- ${XSLTPROC} ${XSLTPROCOPTS} ${SLIDES_XSLPRINT} ${DOC}.xml > ${.TARGET:S/.pdf$/.fo/} >+ ${XSLTPROC} ${XSLTPROCOPTS} ${SLIDES_XSLPRINT} ${DOC}.xml > ${.TARGET:S/.pdf$$/.fo/} > .endif > > ${DOC}.pdf: ${DOC}.fo > .if defined(USE_FOP) >- ${FOP_CMD} ${.TARGET:S/.pdf$/.fo/} ${.TARGET} >+ ${FOP_CMD} ${.TARGET:S/.pdf$$/.fo/} ${.TARGET} > .elif defined(USE_XEP) >- ${XEP_CMD} ${.TARGET:S/.pdf$/.fo/} ${.TARGET} >+ ${XEP_CMD} ${.TARGET:S/.pdf$$/.fo/} ${.TARGET} > .else >- ${PDFTEX_CMD} --interaction nonstopmode "&pdfxmltex" ${.TARGET:S/.pdf$/.fo/} >+ ${PDFTEX_CMD} --interaction nonstopmode "&pdfxmltex" ${.TARGET:S/.pdf$$/.fo/} > .endif >%%%% patch ends here %%%% > >