Adapt the dependencies of ja-ptex-bin to the recent teTeX changes.

- Use print/kpathsea/texmf.mk to update ls-R.
- Depend on tex-bin-dvipsk for pdvips config files.

Bump PKGREVISION.

2 files changed, 43 insertions, 49 deletions

diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile
index fc6bc843222..b05aa9b0868 100644
--- a/print/ja-ptex-bin/Makefile
+++ b/print/ja-ptex-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2008/12/09 19:49:22 minskim Exp $
+# $NetBSD: Makefile,v 1.37 2009/04/10 20:07:28 minskim Exp $
 
 DISTNAME=	ptex-src-${PTEX_VERS}
 PKGNAME=	ja-ptex-bin-${PTEX_VERS}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	print japanese
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ \
 		ftp://ftp.ring.gr.jp/pub/text/TeX/ascii-ptex/tetex/
@@ -24,13 +24,12 @@ SITES.mendexk2.6d.tar.gz= \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/ \
 		ftp://ftp.ring.gr.jp/pub/text/TeX/ascii-ptex/mendex/
 
-DEPENDS+=	ja-ptex-share>=2.4:../../print/ja-ptex-share
+DEPENDS+=	ja-ptex-share>=2.4nb1:../../print/ja-ptex-share
+DEPENDS+=	teTeX-bin>=3.0nb26:../../print/teTeX3-bin
+DEPENDS+=	teTeX-texmf>=3.0nb10:../../print/teTeX3-texmf
+DEPENDS+=	tex-bin-dvipsk-[0-9]*:../../print/tex-bin-dvipsk
 
-USE_DIRS+=	texmf-1.3
-
-.include "../../print/teTeX3-bin/buildlink3.mk"
 .include "../../print/teTeX3-bin/Makefile.common"
-.include "../../print/teTeX/module.mk"
 
 PTEX_VERS=		3.1.9
 DVIPSK_PATCH_VERS=	p1.7a
@@ -48,6 +47,10 @@ WRKSRC_PTEX=		${WRKSRC}/texk/web2c/${DISTNAME}
 EXTRACT_ONLY=		# none
 MAKE_ENV+=		TRUE=${TRUE}
 
+TEX_TEXMF_DIRS=	${PREFIX}/share/texmf-local
+
+.include "../../print/kpathsea/texmf.mk"
+
 pre-extract:
 	if [ ! -r ${WRKSRC} ]; then \
 		cd ../../print/teTeX3-bin && ${MAKE} patch; \
@@ -68,12 +71,9 @@ post-extract:
 	cd ${WRKSRC}/texk;						\
 		extract_file=${_DISTDIR:Q}/${DF_MENDEXK:Q};		\
 		${EXTRACT_CMD}
-	${SED} -e "s|\$$PKG_TEXMFPREFIX/ptex/plain/||" \
-	${PKG_LOCALTEXMFPREFIX}/ptex/plain/base/ptex.tex > \
-		${WRKSRC_PTEX}/ptex.tex
 	${RM} -f ${WRKSRC}/texmf
-	${LN} -s ${PKG_TEXMFPREFIX} ${WRKSRC}
-	${LN} -s ${PKG_LOCALTEXMFPREFIX} ${WRKSRC}
+	${LN} -s ${LOCALBASE}/share/texmf ${WRKSRC}
+	${LN} -s ${LOCALBASE}/share/texmf-local ${WRKSRC}
 
 pre-patch:
 	${PATCH} -d ${WRKSRC}/texk -p0 -s \
@@ -83,12 +83,12 @@ post-patch:
 	${MV} ${WRKSRC}/texk/kpathsea/texmf.in \
 		${WRKSRC}/texk/kpathsea/texmf.in.orig
 	${SED} -e 's,@texmfsite@,${TEXMFSITE},' \
-		-e 's,@texmflocal@,${PKG_LOCALTEXMFPREFIX},' \
+		-e 's,@texmflocal@,${PREFIX}/share/texmf-local,' \
 		${WRKSRC}/texk/kpathsea/texmf.in.orig > \
 		${WRKSRC}/texk/kpathsea/texmf.in
 
 post-configure:
-	cd ${WRKSRC_PTEX}; ./configure EUC ${PKG_LOCALTEXMFPREFIX}
+	cd ${WRKSRC_PTEX}; ./configure EUC ${PREFIX}/share/texmf-local
 
 do-build:
 	cd ${WRKSRC}/texk/web2c; ${MAKE_PROGRAM}
@@ -99,21 +99,19 @@ do-build:
 
 do-install:
 	cd ${WRKSRC_PTEX}; \
-		${SETENV} texmflcl=${PKG_LOCALTEXMFPREFIX} ${MAKE_PROGRAM} install
+		${SETENV} texmflcl=${PREFIX}/share/texmf-local ${MAKE_PROGRAM} install
 	cd ${WRKSRC}/texk/dvipsk; \
-		${SETENV} texmflcl=${PKG_LOCALTEXMFPREFIX} ${MAKE_PROGRAM} install; \
-	${INSTALL_DATA} psfonts.map ${PKG_LOCALTEXMFPREFIX}/dvips/base
+		${SETENV} texmflcl=${PREFIX}/share/texmf-local ${MAKE_PROGRAM} install; \
+	${INSTALL_DATA} psfonts.map ${PREFIX}/share/texmf-local/dvips/base
 	${INSTALL_PROGRAM} ${WRKSRC}/texk/mendexk${MENDEXK_VERS}/mendex \
 		${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/dvips/pstricks
-	cd ${PKG_LOCALTEXMFPREFIX}/dvips/pstricks; \
-		${CP} ${PKG_TEXMFPREFIX}-dist/dvips/pstricks/pst-text.pro .; \
+	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf-local/dvips/pstricks
+	cd ${PREFIX}/share/texmf-local/dvips/pstricks; \
+		${CP} ${LOCALBASE}/share/texmf-dist/dvips/pstricks/pst-text.pro .; \
 		${PATCH} < ${WRKSRC}/texk/PSTricks.patch; \
 		${RM} -f pst-text.pro.orig
 
 pre-clean:
 	cd ../../print/teTeX3-bin && ${MAKE} clean
 
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-ptex-bin/PLIST b/print/ja-ptex-bin/PLIST
index 72574d7137e..0549f867b02 100644
--- a/print/ja-ptex-bin/PLIST
+++ b/print/ja-ptex-bin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/06/24 10:52:23 hira Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/04/10 20:07:28 minskim Exp $
 bin/mendex
 bin/pdvips
 bin/pdvitype
@@ -7,29 +7,25 @@ bin/platex
 bin/ppltotf
 bin/ptex
 bin/ptftopl
-${PKG_LOCALTEXMFPREFIX}/dvips/base/color.pro
-${PKG_LOCALTEXMFPREFIX}/dvips/base/crop.pro
-${PKG_LOCALTEXMFPREFIX}/dvips/base/finclude.pro
-${PKG_LOCALTEXMFPREFIX}/dvips/base/hps.pro
-${PKG_LOCALTEXMFPREFIX}/dvips/base/psfonts.map
-${PKG_LOCALTEXMFPREFIX}/dvips/base/special.pro
-${PKG_LOCALTEXMFPREFIX}/dvips/base/tex.pro
-${PKG_LOCALTEXMFPREFIX}/dvips/base/texc.pro
-${PKG_LOCALTEXMFPREFIX}/dvips/base/texps.pro
-${PKG_LOCALTEXMFPREFIX}/dvips/config/config.ps
-${PKG_LOCALTEXMFPREFIX}/dvips/pstricks/pst-text.pro
-${PKG_LOCALTEXMFPREFIX}/fonts/map/dvips/ptex/psfonts_jp.map
-${PKG_LOCALTEXMFPREFIX}/web2c/platex-euc.fmt
-${PKG_LOCALTEXMFPREFIX}/web2c/platex-jis.fmt
-${PKG_LOCALTEXMFPREFIX}/web2c/platex-sjis.fmt
-${PKG_LOCALTEXMFPREFIX}/web2c/platex.fmt
-${PKG_LOCALTEXMFPREFIX}/web2c/ptex-euc.fmt
-${PKG_LOCALTEXMFPREFIX}/web2c/ptex-jis.fmt
-${PKG_LOCALTEXMFPREFIX}/web2c/ptex-sjis.fmt
-${PKG_LOCALTEXMFPREFIX}/web2c/ptex.fmt
-${PKG_LOCALTEXMFPREFIX}/web2c/ptex.pool
-${PKG_LOCALTEXMFPREFIX}/web2c/texmf.cnf
-@dirrm ${PKG_LOCALTEXMFPREFIX}/dvips/pstricks
-@dirrm ${PKG_LOCALTEXMFPREFIX}/dvips/config
-@dirrm ${PKG_LOCALTEXMFPREFIX}/dvips/base
-@dirrm ${PKG_LOCALTEXMFPREFIX}/dvips
+share/texmf-local/dvips/base/color.pro
+share/texmf-local/dvips/base/crop.pro
+share/texmf-local/dvips/base/finclude.pro
+share/texmf-local/dvips/base/hps.pro
+share/texmf-local/dvips/base/psfonts.map
+share/texmf-local/dvips/base/special.pro
+share/texmf-local/dvips/base/tex.pro
+share/texmf-local/dvips/base/texc.pro
+share/texmf-local/dvips/base/texps.pro
+share/texmf-local/dvips/config/config.ps
+share/texmf-local/dvips/pstricks/pst-text.pro
+share/texmf-local/fonts/map/dvips/ptex/psfonts_jp.map
+share/texmf-local/web2c/platex-euc.fmt
+share/texmf-local/web2c/platex-jis.fmt
+share/texmf-local/web2c/platex-sjis.fmt
+share/texmf-local/web2c/platex.fmt
+share/texmf-local/web2c/ptex-euc.fmt
+share/texmf-local/web2c/ptex-jis.fmt
+share/texmf-local/web2c/ptex-sjis.fmt
+share/texmf-local/web2c/ptex.fmt
+share/texmf-local/web2c/ptex.pool
+share/texmf-local/web2c/texmf.cnf