Use jadetex from TeX Live 2010.

8 files changed, 44 insertions, 154 deletions

diff --git a/print/tex-jadetex/DEINSTALL b/print/tex-jadetex/DEINSTALL
deleted file mode 100644
index d1d8cf37e12..00000000000
--- a/print/tex-jadetex/DEINSTALL
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1 2009/01/11 09:16:30 minskim Exp $
-
-case ${STAGE} in
-DEINSTALL)
-	${RM} @VARBASE@/lib/texmf/web2c/jadetex.fmt
-	${RM} @VARBASE@/lib/texmf/web2c/jadetex.log
-	${RM} @VARBASE@/lib/texmf/web2c/pdfjadetex.fmt
-	${RM} @VARBASE@/lib/texmf/web2c/pdfjadetex.log
-	@MKTEXLSR@ @VARBASE@/lib/texmf
-	;;
-*)
-	;;
-esac
diff --git a/print/tex-jadetex/DESCR b/print/tex-jadetex/DESCR
index 083d54759c0..d4995882b16 100644
--- a/print/tex-jadetex/DESCR
+++ b/print/tex-jadetex/DESCR
@@ -1,2 +1,2 @@
-TeX macros needed to produce DVI/PDF files from TeX code generated
-by the jade SGML processor.
+Macro package on top of LaTeX to typeset TeX output of the Jade DSSSL
+implementation.
diff --git a/print/tex-jadetex/INSTALL b/print/tex-jadetex/INSTALL
deleted file mode 100644
index 85980b1c96a..00000000000
--- a/print/tex-jadetex/INSTALL
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: INSTALL,v 1.1 2009/01/11 09:16:30 minskim Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	@TEX@ -ini -progname=jadetex "&latex" jadetex.ini
-	${MV} jadetex.fmt @VARBASE@/lib/texmf/web2c
-	${MV} jadetex.log @VARBASE@/lib/texmf/web2c
-	@PDFTEX@ -ini -progname=pdfjadetex "&pdflatex" pdfjadetex.ini
-	${MV} pdfjadetex.fmt @VARBASE@/lib/texmf/web2c
-	${MV} pdfjadetex.log @VARBASE@/lib/texmf/web2c
-	${RM} -f texsys.aux texput.log
-	@MKTEXLSR@ @VARBASE@/lib/texmf
-	;;
-*)
-	;;
-esac
diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile
index 062ed125896..1e822b2b73d 100644
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@@ -1,59 +1,37 @@
-# $NetBSD: Makefile,v 1.28 2010/01/28 09:26:46 wiz Exp $
-#
-
-DISTNAME=	jadetex-3.13
-PKGNAME=	tex-${DISTNAME}
-PKGREVISION=	7
-CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jadetex/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://jadetex.sourceforge.net/
-COMMENT=	Process tex files produced by the TeX backend of Jade
-
-DEPENDS+=	teTeX-bin-[0-9]*:../../print/teTeX3-bin
-
-BUILD_TARGET=	default
-MAKE_ENV+=	TEX=${TEX:Q}
-
-EVAL_PREFIX+=	TETEX_BIN_PREFIX=teTeX-bin
-FILES_SUBST+=	TEX=${TETEX_BIN_PREFIX:Q}/bin/etex
-FILES_SUBST+=	PDFTEX=${TETEX_BIN_PREFIX:Q}/bin/pdftex
-
-TEX=	${LOCALBASE}/bin/etex
-PDFTEX=	${LOCALBASE}/bin/pdftex
-
-TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
-TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf-dist
-TEX_CONFIG_NAMES=	jadetex
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/jadetex \
-			share/texmf/web2c \
-			share/texmf-dist/tex/jadetex/base \
-			share/texmf-dist/tex/jadetex/config
-
-.include "../../print/kpathsea/texmf.mk"
-
-do-install:
-	${RM} -f ${PREFIX}/bin/jadetex
-	${LN} -s ${TEX} ${PREFIX}/bin/jadetex
-	${RM} -f ${PREFIX}/bin/pdfjadetex
-	${LN} -s ${PDFTEX} ${PREFIX}/bin/pdfjadetex
-	${INSTALL_MAN} ${WRKSRC}/jadetex.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/pdfjadetex.1 ${PREFIX}/${PKGMANDIR}/man1
-	for i in ${WRKSRC}/doc/* ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/share/doc/jadetex; \
-	done
-	${INSTALL_DATA} ${FILESDIR}/texmf.jadetex.cnf \
-		${PREFIX}/share/texmf/web2c
-.for f in dsssl.def jadetex.ltx uentities.sty ut1omlgc.fd
-	${INSTALL_DATA} ${WRKSRC}/${f} \
-		${PREFIX}/share/texmf-dist/tex/jadetex/base
-.endfor
-.for f in jadetex.ini pdfjadetex.ini mlnames.sty unicode.sty dummyels.sty \
-		ucharacters.sty
-	${INSTALL_DATA} ${WRKSRC}/${f} \
-		${PREFIX}/share/texmf-dist/tex/jadetex/config
-.endfor
+# $NetBSD: Makefile,v 1.29 2011/03/18 23:26:58 minskim Exp $
+
+DISTNAME=	jadetex
+PKGNAME=	tex-${DISTNAME}-3.13
+PKGREVISION=	8
+TEXLIVE_REV=	18835
+
+MAINTAINER=	minskim@NetBSD.org
+COMMENT=	Macros supporting Jade DSSSL output
+
+DEPENDS+=	tex-colortbl-[0-9]*:../../print/tex-colortbl
+DEPENDS+=	tex-ec-[0-9]*:../../fonts/tex-ec
+DEPENDS+=	tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr
+DEPENDS+=	tex-graphics-[0-9]*:../../print/tex-graphics
+DEPENDS+=	tex-hyperref-[0-9]*:../../print/tex-hyperref
+DEPENDS+=	tex-lambda-[0-9]*:../../print/tex-lambda
+DEPENDS+=	tex-latex-[0-9]*:../../print/tex-latex
+DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
+DEPENDS+=	tex-marvosym-[0-9]*:../../fonts/tex-marvosym
+DEPENDS+=	tex-passivetex>=1.25nb2:../../print/tex-passivetex
+DEPENDS+=	tex-pdftex-[0-9]*:../../print/tex-pdftex
+DEPENDS+=	tex-tools-[0-9]*:../../print/tex-tools
+DEPENDS+=	tex-ulem-[0-9]*:../../print/tex-ulem
+DEPENDS+=	web2c-[0-9]*:../../print/web2c
+
+INSTALLATION_DIRS+=	bin
+
+TEX_FORMATS+=	"jadetex pdftex language.dat *jadetex.ini\\npdfjadetex pdftex language.dat *pdfjadetex.ini\\n"
+TEX_TEXMF_DIRS=	${PREFIX}/share/texmf-dist
+
+.include "../../print/texlive/package.mk"
+
+post-install:
+	${LN} -sf pdftex ${DESTDIR}${PREFIX}/bin/jadetex
+	${LN} -sf pdftex ${DESTDIR}${PREFIX}/bin/pdfjadetex
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-jadetex/PLIST b/print/tex-jadetex/PLIST
index e986bd547ba..31ec72a8c6e 100644
--- a/print/tex-jadetex/PLIST
+++ b/print/tex-jadetex/PLIST
@@ -1,22 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:12:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2011/03/18 23:26:58 minskim Exp $
 bin/jadetex
 bin/pdfjadetex
-man/man1/jadetex.1
-man/man1/pdfjadetex.1
-share/doc/jadetex/Makefile
-share/doc/jadetex/demo.sgm
-share/doc/jadetex/docbook.dsl
-share/doc/jadetex/logo.png
-share/doc/jadetex/releasenotes.dsl
-share/doc/jadetex/releasenotes.xml
 share/texmf-dist/tex/jadetex/base/dsssl.def
+share/texmf-dist/tex/jadetex/base/jadetex.ini
 share/texmf-dist/tex/jadetex/base/jadetex.ltx
+share/texmf-dist/tex/jadetex/base/pdfjadetex.ini
 share/texmf-dist/tex/jadetex/base/uentities.sty
 share/texmf-dist/tex/jadetex/base/ut1omlgc.fd
-share/texmf-dist/tex/jadetex/config/dummyels.sty
-share/texmf-dist/tex/jadetex/config/jadetex.ini
-share/texmf-dist/tex/jadetex/config/mlnames.sty
-share/texmf-dist/tex/jadetex/config/pdfjadetex.ini
-share/texmf-dist/tex/jadetex/config/ucharacters.sty
-share/texmf-dist/tex/jadetex/config/unicode.sty
-share/texmf/web2c/texmf.jadetex.cnf
diff --git a/print/tex-jadetex/distinfo b/print/tex-jadetex/distinfo
index 04e843a0d8f..19f4abf817e 100644
--- a/print/tex-jadetex/distinfo
+++ b/print/tex-jadetex/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/11/09 21:40:20 tonio Exp $
+$NetBSD: distinfo,v 1.6 2011/03/18 23:26:58 minskim Exp $
 
-SHA1 (jadetex-3.13.tar.gz) = fa70595ad3b1dc9dae2b4f5051ab28261808769c
-RMD160 (jadetex-3.13.tar.gz) = d28ea2f55892c26fe04eea2faace15e9b646cef4
-Size (jadetex-3.13.tar.gz) = 103137 bytes
-SHA1 (patch-aa) = 13b7def2fb8ee8f07096ae1bf34158af689a8b42
+SHA1 (tex-jadetex-18835/jadetex.tar.xz) = a72d601846bc2c007c79f78872d3270ff723359a
+RMD160 (tex-jadetex-18835/jadetex.tar.xz) = 6562f1c79668901d348c2f6602432f330f8dd89b
+Size (tex-jadetex-18835/jadetex.tar.xz) = 29428 bytes
diff --git a/print/tex-jadetex/files/texmf.jadetex.cnf b/print/tex-jadetex/files/texmf.jadetex.cnf
deleted file mode 100644
index d4a20824c9d..00000000000
--- a/print/tex-jadetex/files/texmf.jadetex.cnf
+++ /dev/null
@@ -1,21 +0,0 @@
-main_memory.jadetex = 1500000
-param_size.jadetex = 1500
-stack_size.jadetex = 1500
-hash_extra.jadetex = 50000
-string_vacancies.jadetex = 45000
-pool_free.jadetex = 47500
-nest_size.jadetex = 500
-save_size.jadetex = 5000
-pool_size.jadetex = 500000
-max_strings.jadetex = 55000
-
-main_memory.pdfjadetex = 2500000
-param_size.pdfjadetex = 1500
-stack_size.pdfjadetex = 1500
-hash_extra.pdfjadetex = 50000
-string_vacancies.pdfjadetex = 45000
-pool_free.pdfjadetex = 47500
-nest_size.pdfjadetex = 500
-save_size.pdfjadetex = 5000
-pool_size.pdfjadetex = 500000
-max_strings.pdfjadetex = 55000
diff --git a/print/tex-jadetex/patches/patch-aa b/print/tex-jadetex/patches/patch-aa
deleted file mode 100644
index 1b5a7196c8c..00000000000
--- a/print/tex-jadetex/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/11/09 21:40:20 tonio Exp $
-
---- Makefile.orig	2002-01-07 14:02:14.000000000 +0100
-+++ Makefile
-@@ -1,13 +1,16 @@
-+TEX?=etex
-+PDFTEX?=pdfetex
-+
- default: basic
- 
- basic: jadetex.ltx
--	tex jadetex.ins
-+	${TEX} jadetex.ins
- 
- jadetex.fmt: basic
--	tex -ini -progname=jadetex "&latex" jadetex.ini
-+	${TEX} -ini -progname=jadetex "&latex" jadetex.ini
- 
- pdfjadetex.fmt: basic
--	pdftex -ini -progname=pdfjadetex "&pdflatex" pdfjadetex.ini
-+	${PDFTEX} -ini -progname=pdfjadetex "&pdflatex" pdfjadetex.ini
- 
- install: jadetex.fmt pdfjadetex.fmt
- 	(TT=$$DESTDIR/`kpsewhich -expand-var '$$TEXMFMAIN'`; \