Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/print/tex-jadetex/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/print/tex-jadetex/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- pkgsrc/print/tex-jadetex/Makefile	2007/10/10 05:30:29	1.26
+++ pkgsrc/print/tex-jadetex/Makefile	2009/01/11 09:16:30	1.27
@@ -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"