Update tex-jadetex to 3.13. Needed for XML documentation in htdocs,

the old version was not sufficient.

4 files changed, 22 insertions, 82 deletions

diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile
index e9bf1055749..50331d81dff 100644
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@@ -1,19 +1,16 @@
-# $NetBSD: Makefile,v 1.10 2004/09/29 01:26:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2004/09/29 13:10:23 hubertf Exp $
 #
 
-DISTNAME=	jadetex-2.20
+DISTNAME=	jadetex-3.13
 PKGNAME=	tex-${DISTNAME}
-PKGREVISION=	4
 CATEGORIES=	print
-MASTER_SITES=	http://www.tug.org/applications/jadetex/
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jadetex/}
 
 MAINTAINER=	hubertf@NetBSD.org
 COMMENT=	Process tex files produced by the TeX backend of Jade
 
 DEPENDS+=	tex-hugelatex>=1.0nb1:../tex-hugelatex
 
-WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 TEXMF_CNF=	${LOCALBASE}/share/texmf/web2c/texmf.cnf
 
@@ -21,24 +18,20 @@ do-install:
 	${CP} -p ${TEXMF_CNF} ${TEXMF_CNF}-before-jadetex
 	${CAT} ${FILESDIR}/texmf.cnf-add >>${TEXMF_CNF}
 	cd ${WRKSRC}; ${SETENV} TEXFORMATS=${LOCALBASE}/share/texmf/web2c \
-		${MAKE} ${MAKEFLAGS};
+	       ${MAKE} ${MAKEFLAGS};
 	cd ${WRKSRC}; ${SETENV} TEXFORMATS=${LOCALBASE}/share/texmf/web2c \
-		${MAKE} ${MAKEFLAGS} install
+	       ${MAKE} ${MAKEFLAGS} install
+	:
 	${RM} -f ${PREFIX}/bin/jadetex
 	${LN} -s tex ${PREFIX}/bin/jadetex
 	${RM} -f ${PREFIX}/bin/pdfjadetex
 	${LN} -s pdftex ${PREFIX}/bin/pdfjadetex
-	${PREFIX}/bin/mktexlsr
 	${INSTALL_MAN} ${WRKSRC}/jadetex.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/pdfjadetex.1 ${PREFIX}/man/man1
 	${INSTALL_MAN_DIR} ${PREFIX}/share/doc/jadetex
 	for i in ${WRKSRC}/doc/* ; do \
 		${INSTALL_MAN} $$i ${PREFIX}/share/doc/jadetex; \
 	done
-	${INSTALL_MAN_DIR} ${PREFIX}/share/examples/jadetex
-	for i in ${WRKSRC}/test/* ; do \
-		${INSTALL_MAN} $$i ${PREFIX}/share/examples/jadetex; \
-	done
 	:
 	: Complete the set that the textproc/jade pkg started. We
 	: use our files here as that is what the jadetex.fmt file is
@@ -48,5 +41,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/jadetex.ini ${PREFIX}/share/sgml/jade
 	${INSTALL_DATA} ${WRKSRC}/jadetex.ins ${PREFIX}/share/sgml/jade
 	${INSTALL_DATA} ${WRKSRC}/pdfjadetex.ini ${PREFIX}/share/sgml/jade
+	${PREFIX}/bin/mktexlsr
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-jadetex/PLIST b/print/tex-jadetex/PLIST
index 93bc44dd6f9..34ccb068896 100644
--- a/print/tex-jadetex/PLIST
+++ b/print/tex-jadetex/PLIST
@@ -1,60 +1,24 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:28:12 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/29 13:10:23 hubertf Exp $
 bin/jadetex
 bin/pdfjadetex
+man/man1/jadetex.1
+man/man1/pdfjadetex.1
 @exec cp %D/share/texmf/web2c/texmf.cnf %D/share/texmf/web2c/texmf.cnf-before-jadetex
 share/texmf/web2c/texmf.cnf
 @unexec mv %D/share/texmf/web2c/texmf.cnf-before-jadetex %D/share/texmf/web2c/texmf.cnf
-share/texmf/web2c/pdfjadetex.fmt
-share/texmf/web2c/jadetex.fmt
-share/texmf/tex/jadetex/dsssl.def
-share/texmf/tex/jadetex/jadetex.ltx
-man/man1/jadetex.1
-man/man1/pdfjadetex.1
 share/doc/jadetex/Makefile
 share/doc/jadetex/demo.sgm
-share/doc/jadetex/demo.tex
-share/doc/jadetex/install.aux
-share/doc/jadetex/install.fot
-share/doc/jadetex/install.log
-share/doc/jadetex/install.out
-share/doc/jadetex/install.pdf
-share/doc/jadetex/install.sgm
-share/doc/jadetex/install.tex
-@dirrm share/doc/jadetex
-share/examples/jadetex/Makefile
-share/examples/jadetex/aftermath.discuss
-share/examples/jadetex/aftermath.dsl
-share/examples/jadetex/aftermath.sgm
-share/examples/jadetex/aftermath.tex
-share/examples/jadetex/defective-table2.sgml
-share/examples/jadetex/defective-table2.tex
-share/examples/jadetex/demo.dsl
-share/examples/jadetex/demo.sgm
-share/examples/jadetex/demo.tex
-share/examples/jadetex/ex-table.sgm
-share/examples/jadetex/ex-table.sgml
-share/examples/jadetex/ex-table.tex
-share/examples/jadetex/fence.discuss
-share/examples/jadetex/fence.dsl
-share/examples/jadetex/fence.sgm
-share/examples/jadetex/fence.tex
-share/examples/jadetex/jadetex.cfg
-share/examples/jadetex/span.aux
-share/examples/jadetex/span.discuss
-share/examples/jadetex/span.dsl
-share/examples/jadetex/span.dvi
-share/examples/jadetex/span.log
-share/examples/jadetex/span.out
-share/examples/jadetex/span.sgm
-share/examples/jadetex/span.tex
-share/examples/jadetex/tables.sgm
-share/examples/jadetex/test-tables.sgm
-share/examples/jadetex/test-tables.tex
+share/doc/jadetex/docbook.dsl
+share/doc/jadetex/logo.png
+share/doc/jadetex/releasenotes.dsl
+share/doc/jadetex/releasenotes.xml
 share/sgml/jade/jadetex.dtx
 share/sgml/jade/jadetex.ini
 share/sgml/jade/jadetex.ins
 share/sgml/jade/pdfjadetex.ini
-@dirrm share/sgml/jade
-@dirrm share/examples/jadetex
+share/texmf/tex/jadetex/dsssl.def
+share/texmf/tex/jadetex/jadetex.ltx
+share/texmf/web2c/jadetex.fmt
+share/texmf/web2c/pdfjadetex.fmt
 @dirrm share/texmf/tex/jadetex
-@unexec %D/bin/mktexlsr
+@dirrm share/doc/jadetex
diff --git a/print/tex-jadetex/distinfo b/print/tex-jadetex/distinfo
index faf3eb5f3cf..3f69f755b2d 100644
--- a/print/tex-jadetex/distinfo
+++ b/print/tex-jadetex/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/09/29 01:26:16 hubertf Exp $
+$NetBSD: distinfo,v 1.3 2004/09/29 13:10:23 hubertf Exp $
 
-SHA1 (jadetex-2.20.zip) = 235d90328e6d5d7e231a7908ebfb1b132c3f6892
-Size (jadetex-2.20.zip) = 152421 bytes
-SHA1 (patch-aa) = c59aeec58f8def3e1a608e6a46ead1281f7ce96a
-SHA1 (patch-ab) = f422e5ccddf8ddd901d7901eca9dde37093ae1c8
+SHA1 (jadetex-3.13.tar.gz) = fa70595ad3b1dc9dae2b4f5051ab28261808769c
+Size (jadetex-3.13.tar.gz) = 103137 bytes
diff --git a/print/tex-jadetex/patches/patch-aa b/print/tex-jadetex/patches/patch-aa
deleted file mode 100644
index 527b02e7e88..00000000000
--- a/print/tex-jadetex/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/04 18:47:06 hubertf Exp $
-
-per http://lists.oasis-open.org/archives/docbook/200002/msg00214.html
-
-
---- jadetex.dtx.orig	Tue Jun 20 10:13:31 2000
-+++ jadetex.dtx
-@@ -130,7 +130,7 @@
- \def\TeXFOTversion{0.0} 
- \makeatletter
- \ifx\pushocplist\@undefined
-- \RequirePackage[portuguese,brazil,spanish,german,frenchb,english]{babel}[1997/01/23]
-+ \RequirePackage[portuguese,brazil,spanish,german,frenchb,english,italian]{babel}[1997/01/23]
-  \RequirePackage[implicit=true,colorlinks,linkcolor=black,bookmarks=true]{hyperref}[2000/03/01]
-  \def\PDFBorders{0 0 0}
-  \RequirePackage[dsssl]{inputenc}[1997/12/20]