From heath@twix.bar.net  Sat May 18 16:10:57 2002
Return-Path: <heath@twix.bar.net>
Received: from twix.bar.net (12-254-239-14.client.attbi.com [12.254.239.14])
	by hub.freebsd.org (Postfix) with ESMTP id CEB1937B400
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 18 May 2002 16:10:56 -0700 (PDT)
Received: from twix.bar.net (15nljq3b74on5t6v@localhost [127.0.0.1])
	by twix.bar.net (8.12.3/8.12.3) with ESMTP id g4INASao045264
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 18 May 2002 17:10:28 -0600 (MDT)
	(envelope-from heath@twix.bar.net)
Received: (from heath@localhost)
	by twix.bar.net (8.12.3/8.12.3/Submit) id g4INARlv045263;
	Sat, 18 May 2002 17:10:27 -0600 (MDT)
Message-Id: <200205182310.g4INARlv045263@twix.bar.net>
Date: Sat, 18 May 2002 17:10:27 -0600 (MDT)
From: Heath Nielson <heath@cs.byu.edu>
Reply-To: Heath Nielson <heath@cs.byu.edu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Patch] htmlhelp transforms not installed with other transforms
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         38262
>Category:       ports
>Synopsis:       [Patch] htmlhelp transforms not installed with other transforms
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    des
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 18 16:20:01 PDT 2002
>Closed-Date:    Wed Oct 30 07:14:30 PST 2002
>Last-Modified:  Wed Oct 30 07:14:30 PST 2002
>Originator:     Heath Nielson
>Release:        FreeBSD 4.6-RC i386
>Organization:
>Environment:
System: FreeBSD twix.bar.net 4.6-RC FreeBSD 4.6-RC #0: Sat May 18 12:24:57 MDT 2002 heath@twix.bar.net:/usr/src/sys/compile/TWIX i386


	
>Description:
The htmlhelp stylesheets are installed in
{PORTDOCS}/share/doc/docbook-xsl/htmlhelp/
This causes problems if the stylesheet is being called because it includes
"../html/chunk.xsl" which is installed to ${PREFIX}/share/xsl/docbook.

Also htmlhelp.xsl had a problem in v1.50 that caused an error which was
fixed later in their CVS Repository.  Since they've only released a subsequent
"experimental" release, I've included the fix in my patch so that it now works
with the current version.
>How-To-Repeat:
Install the port and try using the htmlhelp.xsl stylesheet.
>Fix:

	

--- docbook-xsl.patch begins here ---
diff -ruN docbook-xsl.orig/Makefile docbook-xsl/Makefile
--- docbook-xsl.orig/Makefile	Sat May 18 16:24:59 2002
+++ docbook-xsl/Makefile	Sat May 18 16:45:22 2002
@@ -29,12 +29,9 @@
 	${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 lib params xhtml |\
+	(cd ${WRKSRC} && ${TAR} -cf - VERSION common fo html htmlhelp lib params xhtml |\
 		${TAR} -xf - -C${INSTDIR})
 
 .include <bsd.port.mk>
diff -ruN docbook-xsl.orig/files/patch-htmlhelp::htmlhelp.xsl docbook-xsl/files/patch-htmlhelp::htmlhelp.xsl
--- docbook-xsl.orig/files/patch-htmlhelp::htmlhelp.xsl	Wed Dec 31 17:00:00 1969
+++ docbook-xsl/files/patch-htmlhelp::htmlhelp.xsl	Sat May 18 16:30:08 2002
@@ -0,0 +1,41 @@
+--- 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">
diff -ruN docbook-xsl.orig/pkg-plist docbook-xsl/pkg-plist
--- docbook-xsl.orig/pkg-plist	Sat May 18 16:24:59 2002
+++ docbook-xsl/pkg-plist	Sat May 18 16:43:00 2002
@@ -386,10 +386,6 @@
 %%PORTDOCS%%share/doc/docbook-xsl/html/using.chunker.html
 %%PORTDOCS%%share/doc/docbook-xsl/html/variablelist.as.table.html
 %%PORTDOCS%%share/doc/docbook-xsl/htmlhelp.html
-%%PORTDOCS%%share/doc/docbook-xsl/htmlhelp/ChangeLog
-%%PORTDOCS%%share/doc/docbook-xsl/htmlhelp/htmlhelp.xsl
-%%PORTDOCS%%share/doc/docbook-xsl/htmlhelp/langcodes.xml
-%%PORTDOCS%%share/doc/docbook-xsl/htmlhelp/profile-htmlhelp.xsl
 %%PORTDOCS%%share/doc/docbook-xsl/index.html
 %%PORTDOCS%%share/doc/docbook-xsl/jrefhtml.xsl
 %%PORTDOCS%%share/doc/docbook-xsl/lib/ChangeLog
@@ -547,6 +543,11 @@
 share/xsl/docbook/html/toc.xsl
 share/xsl/docbook/html/verbatim.xsl
 share/xsl/docbook/html/xref.xsl
+share/xsl/docbook/htmlhelp/ChangeLog
+share/xsl/docbook/htmlhelp/htmlhelp.xsl
+share/xsl/docbook/htmlhelp/htmlhelp.xsl.orig
+share/xsl/docbook/htmlhelp/langcodes.xml
+share/xsl/docbook/htmlhelp/profile-htmlhelp.xsl
 share/xsl/docbook/lib/ChangeLog
 share/xsl/docbook/lib/lib.xsl
 share/xsl/docbook/params/ChangeLog
@@ -817,6 +818,7 @@
 @dirrm share/xsl/docbook/params
 @dirrm share/xsl/docbook/lib
 @dirrm share/xsl/docbook/html
+@dirrm share/xsl/docbook/htmlhelp
 @dirrm share/xsl/docbook/fo
 @dirrm share/xsl/docbook/common
 @dirrm share/xsl/docbook
@@ -824,7 +826,6 @@
 %%PORTDOCS%%@dirrm share/doc/docbook-xsl/tools
 %%PORTDOCS%%@dirrm share/doc/docbook-xsl/template
 %%PORTDOCS%%@dirrm share/doc/docbook-xsl/lib
-%%PORTDOCS%%@dirrm share/doc/docbook-xsl/htmlhelp
 %%PORTDOCS%%@dirrm share/doc/docbook-xsl/html
 %%PORTDOCS%%@dirrm share/doc/docbook-xsl/fo
 %%PORTDOCS%%@dirrm share/doc/docbook-xsl/common
--- docbook-xsl.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->des 
Responsible-Changed-By: ijliao 
Responsible-Changed-When: Fri Sep 20 20:40:35 PDT 2002 
Responsible-Changed-Why:  
over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=38262 
State-Changed-From-To: open->closed 
State-Changed-By: des 
State-Changed-When: Wed Oct 30 07:14:29 PST 2002 
State-Changed-Why:  
Fixed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=38262 
>Unformatted:
