Use texmf.mk to update texmf.cnf. This fixes PR 40359.

Bump PKGREVISION.

5 files changed, 75 insertions, 52 deletions

diff --git a/print/tex-jadetex/DEINSTALL b/print/tex-jadetex/DEINSTALL
new file mode 100644
index 00000000000..d1d8cf37e12
--- /dev/null
+++ b/print/tex-jadetex/DEINSTALL
@@ -0,0 +1,13 @@
+# $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/INSTALL b/print/tex-jadetex/INSTALL
new file mode 100644
index 00000000000..85980b1c96a
--- /dev/null
+++ b/print/tex-jadetex/INSTALL
@@ -0,0 +1,16 @@
+# $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 87d12aa94a8..8a4aa504cd0 100644
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2007/10/10 05:30:29 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.27 2009/01/11 09:16:30 minskim Exp $
 #
 
 DISTNAME=	jadetex-3.13
 PKGNAME=	tex-${DISTNAME}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jadetex/}
 
@@ -11,26 +11,31 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://jadetex.sourceforge.net/
 COMMENT=	Process tex files produced by the TeX backend of Jade
 
-DEPENDS+=	tex-hugelatex>=1.0nb1:../../print/tex-hugelatex
+DEPENDS+=	teTeX-bin-[0-9]*:../../print/teTeX3-bin
+DEPENDS+=	tex-hugelatex>=2.0nb6:../../print/tex-hugelatex
+
+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/sgml/jade
-NO_BUILD=	yes
-TEXMF_CNF=	${PKG_TEXMFPREFIX}/web2c/texmf.cnf
-CHECK_FILES_SKIP += ${PREFIX}/share/texmf/web2c/texmf.cnf-before-jadetex
+			share/texmf/web2c \
+			share/texmf-dist/tex/jadetex/base \
+			share/texmf-dist/tex/jadetex/config
 
-.include "../../print/teTeX/module.mk"
+.include "../../print/kpathsea/texmf.mk"
 
 do-install:
-	${CP} -p ${TEXMF_CNF} ${TEXMF_CNF}-before-jadetex
-	${CAT} ${FILESDIR}/texmf.cnf-add >>${TEXMF_CNF}
-	cd ${WRKSRC}; ${SETENV} TEX=${TEX} PDFTEX=${PDFTEX} \
-		TEXFORMATS=${LOCALBASE}/share/texmf-var/web2c \
-	       ${MAKE} ${MAKEFLAGS};
-	cd ${WRKSRC}; ${SETENV} TEX=${TEX} PDFTEX=${PDFTEX} \
-       		TEXFORMATS=${LOCALBASE}/share/texmf-var/web2c \
-	       ${MAKE} ${MAKEFLAGS} install
-	:
 	${RM} -f ${PREFIX}/bin/jadetex
 	${LN} -s ${TEX} ${PREFIX}/bin/jadetex
 	${RM} -f ${PREFIX}/bin/pdfjadetex
@@ -38,18 +43,18 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/jadetex.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/pdfjadetex.1 ${PREFIX}/${PKGMANDIR}/man1
 	for i in ${WRKSRC}/doc/* ; do \
-		${INSTALL_MAN} $$i ${PREFIX}/share/doc/jadetex; \
+		${INSTALL_DATA} $$i ${PREFIX}/share/doc/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
-	: really made from:
-	${INSTALL_DATA} ${WRKSRC}/jadetex.dtx ${PREFIX}/share/sgml/jade
-	${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
-	${LOCALBASE}/bin/texconfig rehash
-	${LOCALBASE}/bin/mktexlsr
-
+	${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
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-jadetex/PLIST b/print/tex-jadetex/PLIST
index 218c1b71498..f5254ef1abc 100644
--- a/print/tex-jadetex/PLIST
+++ b/print/tex-jadetex/PLIST
@@ -1,30 +1,23 @@
-@comment $NetBSD: PLIST,v 1.7 2007/10/10 05:30:29 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/01/11 09:16:30 minskim Exp $
 bin/jadetex
 bin/pdfjadetex
 man/man1/jadetex.1
 man/man1/pdfjadetex.1
-@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
 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
-share/texmf/tex/jadetex/dsssl.def
-share/texmf/tex/jadetex/jadetex.ltx
-share/texmf/web2c/jadetex.fmt
-share/texmf/web2c/pdfjadetex.fmt
-@dirrm ${PKG_TEXMFPREFIX}/tex/jadetex
+share/texmf-dist/tex/jadetex/base/dsssl.def
+share/texmf-dist/tex/jadetex/base/jadetex.ltx
+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
 @dirrm share/doc/jadetex
-@exec %D/bin/texconfig rehash
-@unexec %D/bin/texconfig rehash
-@exec %D/bin/mktexlsr
-@unexec %D/bin/mktexlsr
-@unexec ${RMDIR} %D/share/sgml/jade 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/sgml 2>/dev/null || ${TRUE}
diff --git a/print/tex-jadetex/files/texmf.cnf-add b/print/tex-jadetex/files/texmf.jadetex.cnf
index d4edd88485a..d4a20824c9d 100644
--- a/print/tex-jadetex/files/texmf.cnf-add
+++ b/print/tex-jadetex/files/texmf.jadetex.cnf
@@ -1,6 +1,3 @@
-
-% jadetex & pdfjadetex
-% added by jadetex pkg
 main_memory.jadetex = 1500000
 param_size.jadetex = 1500
 stack_size.jadetex = 1500
@@ -22,4 +19,3 @@ nest_size.pdfjadetex = 500
 save_size.pdfjadetex = 5000
 pool_size.pdfjadetex = 500000
 max_strings.pdfjadetex = 55000
-