Fix for teTeX3 by using the etex engine for generation

bump PKGREVISION, it will change the binary package

4 files changed, 37 insertions, 10 deletions

diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile
index e804f7031d8..98de5992356 100644
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/07/19 10:15:30 grant Exp $
+# $NetBSD: Makefile,v 1.14 2005/11/09 21:40:20 tonio Exp $
 #
 
 DISTNAME=	jadetex-3.13
 PKGNAME=	tex-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jadetex/}
 
@@ -12,16 +13,16 @@ COMMENT=	Process tex files produced by the TeX backend of Jade
 DEPENDS+=	tex-hugelatex>=1.0nb1:../../print/tex-hugelatex
 
 NO_BUILD=	yes
-TEXMF_CNF=	${LOCALBASE}/share/texmf/web2c/texmf.cnf
+TEXMF_CNF=	${PKG_TEXMFPREFIX}/web2c/texmf.cnf
 
 INSTALLATION_DIRS=	bin
 
 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 \
+	cd ${WRKSRC}; ${SETENV} TEXFORMATS=${LOCALBASE}/share/texmf-var/web2c \
 	       ${MAKE} ${MAKEFLAGS};
-	cd ${WRKSRC}; ${SETENV} TEXFORMATS=${LOCALBASE}/share/texmf/web2c \
+	cd ${WRKSRC}; ${SETENV} TEXFORMATS=${LOCALBASE}/share/texmf-var/web2c \
 	       ${MAKE} ${MAKEFLAGS} install
 	:
 	${RM} -f ${PREFIX}/bin/jadetex
@@ -45,4 +46,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/pdfjadetex.ini ${PREFIX}/share/sgml/jade
 	${PREFIX}/bin/mktexlsr
 
+.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-jadetex/PLIST b/print/tex-jadetex/PLIST
index 616c2a10ac8..22046c1041d 100644
--- a/print/tex-jadetex/PLIST
+++ b/print/tex-jadetex/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2005/03/24 14:24:29 ben Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/11/09 21:40:20 tonio 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
+@exec cp %D/${PKG_TEXMFPREFIX}/web2c/texmf.cnf %D/${PKG_TEXMFPREFIX}/web2c/texmf.cnf-before-jadetex
+${PKG_TEXMFPREFIX}/web2c/texmf.cnf
+@unexec mv %D/${PKG_TEXMFPREFIX}/web2c/texmf.cnf-before-jadetex %D/${PKG_TEXMFPREFIX}/web2c/texmf.cnf
 share/doc/jadetex/Makefile
 share/doc/jadetex/demo.sgm
 share/doc/jadetex/docbook.dsl
@@ -22,5 +22,5 @@ share/texmf/web2c/jadetex.fmt
 share/texmf/web2c/pdfjadetex.fmt
 @exec %D/bin/mktexlsr
 @unexec %D/bin/mktexlsr
-@dirrm share/texmf/tex/jadetex
+@dirrm ${PKG_TEXMFPREFIX}/tex/jadetex
 @dirrm share/doc/jadetex
diff --git a/print/tex-jadetex/distinfo b/print/tex-jadetex/distinfo
index 8637ab795b7..04e843a0d8f 100644
--- a/print/tex-jadetex/distinfo
+++ b/print/tex-jadetex/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 12:51:45 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/11/09 21:40:20 tonio 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
diff --git a/print/tex-jadetex/patches/patch-aa b/print/tex-jadetex/patches/patch-aa
new file mode 100644
index 00000000000..1b5a7196c8c
--- /dev/null
+++ b/print/tex-jadetex/patches/patch-aa
@@ -0,0 +1,24 @@
+$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'`; \