Attachment #21947 for bug #38262

View | Details | Raw Unified | Return to bug 38262
Collapse All | Expand All




	${MKDIR} ${DOCSDIR}
	(cd ${WRKSRC}/doc && ${TAR} -cf - . |\
		${TAR} -xf - -C${DOCSDIR})
	${MKDIR} ${DOCSDIR}/htmlhelp
	(cd ${WRKSRC}/htmlhelp && ${TAR} -cf - . |\
		${TAR} -xf - -C${DOCSDIR}/htmlhelp)
.endif
	${MKDIR} ${INSTDIR}
	(cd ${WRKSRC} && ${TAR} -cf - VERSION common fo html htmlhelp lib params xhtml |\
		${TAR} -xf - -C${INSTDIR})

.include <bsd.port.mk>




--- htmlhelp/htmlhelp.xsl	2002/03/14 19:06:10	1.21
+++ htmlhelp/htmlhelp.xsl	2002/04/11 07:42:10	1.22
@@ -7,7 +7,7 @@
                 exclude-result-prefixes="doc exsl set">
 
 <!-- ********************************************************************
-     $Id: htmlhelp.xsl,v 1.21 2002/03/14 19:06:10 nwalsh Exp $
+     $Id: htmlhelp.xsl,v 1.22 2002/04/11 07:42:10 kosek Exp $
      ******************************************************************** 
 
      This file is used by htmlhelp.xsl if you want to generate source
@@ -402,8 +402,13 @@
     &lt;/OBJECT&gt;</xsl:text>
   </xsl:if>
   <xsl:if test="book">
+    <xsl:variable name="toc.params">
+      <xsl:call-template name="find.path.params">
+        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:text>&lt;UL&gt;</xsl:text>
-      <xsl:if test="$generate.set.toc != 0 and $htmlhelp.hhc.show.root = 0">
+      <xsl:if test="contains($toc.params, 'toc') and $htmlhelp.hhc.show.root = 0">
         <xsl:text>&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
           &lt;param name="Name" value="</xsl:text>
             <xsl:call-template name="gentext">
@@ -444,8 +449,13 @@
     &lt;/OBJECT&gt;</xsl:text>
   </xsl:if>
   <xsl:if test="part|reference|preface|chapter|appendix|bibliography|article|colophon|glossary">
+    <xsl:variable name="toc.params">
+      <xsl:call-template name="find.path.params">
+        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:text>&lt;UL&gt;</xsl:text>
-      <xsl:if test="$generate.book.toc != 0 and $htmlhelp.hhc.show.root = 0 and not(parent::*)">
+      <xsl:if test="contains($toc.params, 'toc') and $htmlhelp.hhc.show.root = 0 and not(parent::*)">
         <xsl:text>&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
           &lt;param name="Name" value="</xsl:text>
             <xsl:call-template name="gentext">

Lines 386-395 Link Here

(-)docbook-xsl/pkg-plist (-5 / +6 lines)
386	%%PORTDOCS%%share/doc/docbook-xsl/html/using.chunker.html	386	%%PORTDOCS%%share/doc/docbook-xsl/html/using.chunker.html
387	%%PORTDOCS%%share/doc/docbook-xsl/html/variablelist.as.table.html	387	%%PORTDOCS%%share/doc/docbook-xsl/html/variablelist.as.table.html
388	%%PORTDOCS%%share/doc/docbook-xsl/htmlhelp.html	388	%%PORTDOCS%%share/doc/docbook-xsl/htmlhelp.html
389	%%PORTDOCS%%share/doc/docbook-xsl/htmlhelp/ChangeLog
390	%%PORTDOCS%%share/doc/docbook-xsl/htmlhelp/htmlhelp.xsl
391	%%PORTDOCS%%share/doc/docbook-xsl/htmlhelp/langcodes.xml
392	%%PORTDOCS%%share/doc/docbook-xsl/htmlhelp/profile-htmlhelp.xsl
393	%%PORTDOCS%%share/doc/docbook-xsl/index.html	389	%%PORTDOCS%%share/doc/docbook-xsl/index.html
394	%%PORTDOCS%%share/doc/docbook-xsl/jrefhtml.xsl	390	%%PORTDOCS%%share/doc/docbook-xsl/jrefhtml.xsl
395	%%PORTDOCS%%share/doc/docbook-xsl/lib/ChangeLog	391	%%PORTDOCS%%share/doc/docbook-xsl/lib/ChangeLog
Lines 547-552 Link Here
547	share/xsl/docbook/html/toc.xsl	543	share/xsl/docbook/html/toc.xsl
548	share/xsl/docbook/html/verbatim.xsl	544	share/xsl/docbook/html/verbatim.xsl
549	share/xsl/docbook/html/xref.xsl	545	share/xsl/docbook/html/xref.xsl
		546	share/xsl/docbook/htmlhelp/ChangeLog
		547	share/xsl/docbook/htmlhelp/htmlhelp.xsl
		548	share/xsl/docbook/htmlhelp/htmlhelp.xsl.orig
		549	share/xsl/docbook/htmlhelp/langcodes.xml
		550	share/xsl/docbook/htmlhelp/profile-htmlhelp.xsl
550	share/xsl/docbook/lib/ChangeLog	551	share/xsl/docbook/lib/ChangeLog
551	share/xsl/docbook/lib/lib.xsl	552	share/xsl/docbook/lib/lib.xsl
552	share/xsl/docbook/params/ChangeLog	553	share/xsl/docbook/params/ChangeLog
Lines 817-822 Link Here
817	@dirrm share/xsl/docbook/params	818	@dirrm share/xsl/docbook/params
818	@dirrm share/xsl/docbook/lib	819	@dirrm share/xsl/docbook/lib
819	@dirrm share/xsl/docbook/html	820	@dirrm share/xsl/docbook/html
		821	@dirrm share/xsl/docbook/htmlhelp
820	@dirrm share/xsl/docbook/fo	822	@dirrm share/xsl/docbook/fo
821	@dirrm share/xsl/docbook/common	823	@dirrm share/xsl/docbook/common
822	@dirrm share/xsl/docbook	824	@dirrm share/xsl/docbook
Lines 824-830 Link Here
824	%%PORTDOCS%%@dirrm share/doc/docbook-xsl/tools	826	%%PORTDOCS%%@dirrm share/doc/docbook-xsl/tools
825	%%PORTDOCS%%@dirrm share/doc/docbook-xsl/template	827	%%PORTDOCS%%@dirrm share/doc/docbook-xsl/template
826	%%PORTDOCS%%@dirrm share/doc/docbook-xsl/lib	828	%%PORTDOCS%%@dirrm share/doc/docbook-xsl/lib
827	%%PORTDOCS%%@dirrm share/doc/docbook-xsl/htmlhelp
828	%%PORTDOCS%%@dirrm share/doc/docbook-xsl/html	829	%%PORTDOCS%%@dirrm share/doc/docbook-xsl/html
829	%%PORTDOCS%%@dirrm share/doc/docbook-xsl/fo	830	%%PORTDOCS%%@dirrm share/doc/docbook-xsl/fo
830	%%PORTDOCS%%@dirrm share/doc/docbook-xsl/common	831	%%PORTDOCS%%@dirrm share/doc/docbook-xsl/common

Return to bug 38262

Lines 29-40 Link Here

(-)docbook-xsl/Makefile (-4 / +1 lines)
29	${MKDIR} ${DOCSDIR}	29	${MKDIR} ${DOCSDIR}
30	(cd ${WRKSRC}/doc && ${TAR} -cf - . \|\	30	(cd ${WRKSRC}/doc && ${TAR} -cf - . \|\
31	${TAR} -xf - -C${DOCSDIR})	31	${TAR} -xf - -C${DOCSDIR})
32	${MKDIR} ${DOCSDIR}/htmlhelp
33	(cd ${WRKSRC}/htmlhelp && ${TAR} -cf - . \|\
34	${TAR} -xf - -C${DOCSDIR}/htmlhelp)
35	.endif	32	.endif
36	${MKDIR} ${INSTDIR}	33	${MKDIR} ${INSTDIR}
37	(cd ${WRKSRC} && ${TAR} -cf - VERSION common fo html lib params xhtml \|\	34	(cd ${WRKSRC} && ${TAR} -cf - VERSION common fo html htmlhelp lib params xhtml \|\
38	${TAR} -xf - -C${INSTDIR})	35	${TAR} -xf - -C${INSTDIR})
39		36
40	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Line 0 Link Here

(-)docbook-xsl/files/patch-htmlhelp::htmlhelp.xsl (+41 lines)
	1	--- htmlhelp/htmlhelp.xsl 2002/03/14 19:06:10 1.21
	2	+++ htmlhelp/htmlhelp.xsl 2002/04/11 07:42:10 1.22
	3	@@ -7,7 +7,7 @@
	4	exclude-result-prefixes="doc exsl set">
	5
	6	<!-- ********************************************************************
	7	- $Id: htmlhelp.xsl,v 1.21 2002/03/14 19:06:10 nwalsh Exp $
	8	+ $Id: htmlhelp.xsl,v 1.22 2002/04/11 07:42:10 kosek Exp $
	9	********************************************************************
	10
	11	This file is used by htmlhelp.xsl if you want to generate source
	12	@@ -402,8 +402,13 @@
	13	</OBJECT></xsl:text>
	14	</xsl:if>
	15	<xsl:if test="book">
	16	+ <xsl:variable name="toc.params">
	17	+ <xsl:call-template name="find.path.params">
	18	+ <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
	19	+ </xsl:call-template>
	20	+ </xsl:variable>
	21	<xsl:text><UL></xsl:text>
	22	- <xsl:if test="$generate.set.toc != 0 and $htmlhelp.hhc.show.root = 0">
	23	+ <xsl:if test="contains($toc.params, 'toc') and $htmlhelp.hhc.show.root = 0">
	24	<xsl:text><LI> <OBJECT type="text/sitemap">
	25	<param name="Name" value="</xsl:text>
	26	<xsl:call-template name="gentext">
	27	@@ -444,8 +449,13 @@
	28	</OBJECT></xsl:text>
	29	</xsl:if>
	30	<xsl:if test="part\|reference\|preface\|chapter\|appendix\|bibliography\|article\|colophon\|glossary">
	31	+ <xsl:variable name="toc.params">
	32	+ <xsl:call-template name="find.path.params">
	33	+ <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
	34	+ </xsl:call-template>
	35	+ </xsl:variable>
	36	<xsl:text><UL></xsl:text>
	37	- <xsl:if test="$generate.book.toc != 0 and $htmlhelp.hhc.show.root = 0 and not(parent::*)">
	38	+ <xsl:if test="contains($toc.params, 'toc') and $htmlhelp.hhc.show.root = 0 and not(parent::*)">
	39	<xsl:text><LI> <OBJECT type="text/sitemap">
	40	<param name="Name" value="</xsl:text>
	41	<xsl:call-template name="gentext">