- Remove a redundant template from the stylesheet. It used to be

  ignored by xsltproc, but the recent version generates an error.
- Delete share/xsl only it is emtpy, since it is shared by other
  xsl packages.

Bump PKGREVISION.

4 files changed, 67 insertions, 5 deletions

diff --git a/textproc/db2latex/Makefile b/textproc/db2latex/Makefile
index 199be76a38d..d312f6c2c68 100644
--- a/textproc/db2latex/Makefile
+++ b/textproc/db2latex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:33 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/11/18 08:04:25 minskim Exp $
 
 DISTNAME=	db2latex-xsl-0.8pre1
 PKGNAME=	${DISTNAME:S/xsl-//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=db2latex/}
 
@@ -27,6 +27,9 @@ XML_ENTRIES=	system "http://db2latex.sourceforge.net/xsl/docbook.xsl" \
 post-extract:
 	cd ${WRKSRC} && ${FIND} . -name "*\**" -exec ${RM} {} \;
 
+pre-install:
+	${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
+
 do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA_DIR} ${XSLDIR}
diff --git a/textproc/db2latex/PLIST b/textproc/db2latex/PLIST
index 737dcdf005b..1a262a75c17 100644
--- a/textproc/db2latex/PLIST
+++ b/textproc/db2latex/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/11/25 20:47:00 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/11/18 08:04:25 minskim Exp $
 share/doc/db2latex/AUTHOR
 share/doc/db2latex/COPYING
 share/doc/db2latex/COPYRIGHT
@@ -1463,7 +1463,7 @@ share/xsl/db2latex/xsldoc.ent
 @dirrm share/xsl/db2latex/figures
 @dirrm share/xsl/db2latex/common
 @dirrm share/xsl/db2latex
-@dirrm share/xsl
+@unexec ${RMDIR} %D/share/xsl 2>/dev/null || ${TRUE}
 @dirrm share/doc/db2latex/reference
 @dirrm share/doc/db2latex/images
 @dirrm share/doc/db2latex/graphics/navicons/triangle/other
diff --git a/textproc/db2latex/distinfo b/textproc/db2latex/distinfo
index 6ad59ecf891..e41fee4254b 100644
--- a/textproc/db2latex/distinfo
+++ b/textproc/db2latex/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:40 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/11/18 08:04:25 minskim Exp $
 
 SHA1 (db2latex-xsl-0.8pre1.tar.gz) = a82efeac8881edaacb323777b01befbaa4d067b8
 RMD160 (db2latex-xsl-0.8pre1.tar.gz) = 7f610cb176576ae5507b4bf2c53c4e2380ec021b
 Size (db2latex-xsl-0.8pre1.tar.gz) = 696369 bytes
+SHA1 (patch-aa) = 4dbfcc93d92dd527345f9e5e353d1edb26d1f1bd
diff --git a/textproc/db2latex/patches/patch-aa b/textproc/db2latex/patches/patch-aa
new file mode 100644
index 00000000000..4e00934ed29
--- /dev/null
+++ b/textproc/db2latex/patches/patch-aa
@@ -0,0 +1,58 @@
+$NetBSD: patch-aa,v 1.1 2005/11/18 08:04:26 minskim Exp $
+
+--- xsl/qandaset.mod.xsl.orig	2004-01-04 05:22:27.000000000 -0800
++++ xsl/qandaset.mod.xsl
+@@ -363,53 +363,4 @@
+ 	</doc:template>
+ 	<xsl:template match="revhistory" mode="qandatoc.mode"/>
+ 
+-<xsl:template name="question.answer.label">
+-	<!-- variable: deflabel -->
+-  <xsl:variable name="deflabel">
+-  	<!-- chck whether someone has a defaultlabel attribute -->
+-    <xsl:choose>
+-		<xsl:when test="ancestor-or-self::*[@defaultlabel]">
+-        	<xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]/@defaultlabel"/>
+-	      </xsl:when>
+-      <xsl:otherwise>
+-        <xsl:value-of select="latex.qanda.defaultlabel"/>
+-      </xsl:otherwise>
+-    </xsl:choose>
+-  </xsl:variable>
+-
+-  <xsl:variable name="label" select="@label"/>
+-  <xsl:choose>
+-    <xsl:when test="$deflabel = 'qanda'">
+-      <xsl:call-template name="gentext">
+-        <xsl:with-param name="key">
+-          <xsl:choose>
+-            <xsl:when test="local-name(.) = 'question'">question</xsl:when>
+-            <xsl:when test="local-name(.) = 'answer'">answer</xsl:when>
+-            <xsl:when test="local-name(.) = 'qandadiv'">qandadiv</xsl:when>
+-            <xsl:otherwise>qandaset</xsl:otherwise>
+-          </xsl:choose>
+-        </xsl:with-param>
+-      </xsl:call-template>
+-    </xsl:when>
+-    <xsl:when test="$deflabel = 'label'">
+-      <xsl:value-of select="$label"/>
+-    </xsl:when>
+-    <xsl:when test="$deflabel = 'number' and local-name(.) = 'question'">
+-      <xsl:apply-templates select="ancestor::qandaset[1]" mode="number"/>
+-      <xsl:choose>
+-        <xsl:when test="ancestor::qandadiv">
+-          <xsl:apply-templates select="ancestor::qandadiv[1]" mode="number"/>
+-          <xsl:apply-templates select="ancestor::qandaentry" mode="number"/>
+-        </xsl:when>
+-        <xsl:otherwise>
+-          <xsl:apply-templates select="ancestor::qandaentry" mode="number"/>
+-        </xsl:otherwise>
+-      </xsl:choose>
+-    </xsl:when>
+-    <xsl:otherwise>
+-      <!-- nothing -->
+-    </xsl:otherwise>
+-  </xsl:choose>
+-</xsl:template>
+-
+ </xsl:stylesheet>