- Update ptex-texmf-2.3 to ptex-texmf-2.4.

- Update pkg-message.
- Use SUB_FILES/SUB_LIST and add some style changes.
- Bump PORTREVISION.

4 files changed, 77 insertions, 73 deletions

diff --git a/japanese/ptex-tetex/Makefile b/japanese/ptex-tetex/Makefile
index dd67cadd34f8..d920d162bdf8 100644
--- a/japanese/ptex-tetex/Makefile
+++ b/japanese/ptex-tetex/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ptex-tetex
 PORTVERSION=	3.1.9
+PORTREVISION=	1
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/:1 \
@@ -49,7 +50,9 @@ PLIST_SUB=	MKTEXLSR=${MKTEXLSR} \
 		TEXMFVARDIR=${TEXMFVARDIR} \
 		TEXMFDIR=${TEXMFDIR} \
 		UPDMAP_SYS_PTEX=${UPDMAP_SYS_PTEX} \
-		SETENV=${SETENV}
+		MAPDIR=${MAPDIR} \
+		VFDIR=${VFDIR} \
+		TFMDIR=${TFMDIR}
 CONFLICTS=	ja-ptex-base-[0-9]*
 .if !make(do-patch)
 WRKSRC=		${WRKDIR}/${TETEX_SRC}/texk/web2c/ptex-${VER_PTEX}
@@ -62,7 +65,7 @@ WRKSRC_PTEX=	${WRKDIR}/ptex-src-${VER_PTEX}
 
 TETEX_SRC=	tetex-src-3.0
 VER_PTEX=	${PORTVERSION}
-VER_PTEXTEXMF=	2.3
+VER_PTEXTEXMF=	2.4
 KANJICODE?=	euc
 TEXMFDIR?=	share/texmf
 TEXMFDISTDIR?=	share/texmf-dist
@@ -78,7 +81,9 @@ FONTSMAPDIR=	${TEXMFDIR}/fonts/map/ptex
 FONTSMAPVARDIR=	${TEXMFVARDIR}/fonts/map/ptex
 
 UPDMAP_SYS_PTEX=${PREFIX}/bin/updmap-sys-ptex
-UPDMAP_SUB=	PREFIX=${PREFIX} \
+
+SUB_FILES=	updmap-ptex updmap-sys-ptex
+SUB_LIST=	PREFIX=${PREFIX} \
 		TEXMFDIR=${TEXMFDIR} \
 		DVIPSDIR=${DVIPSDIR} \
 		TEXMFVARDIR=${TEXMFVARDIR} \
@@ -88,60 +93,9 @@ UPDMAP_SUB=	PREFIX=${PREFIX} \
 INSTDIRS=	doc fonts jbibtex ptex
 DOC_FILES=	COPYRIGHT COPYRIGHT.jis Changes.txt README.txt
 
-MAPDIR=		${PREFIX}/${TEXMFDIR}/dvips/ptex
-MAPFILES=	morisawa/morisawa.map jis/jis.map
-
-VFDIR=		${PREFIX}/${TEXMFDIR}/fonts/vf/ptex
-VFFILES=	jis/vf/jis.vf jis/vf/jisg.vf \
-		jis/vf/jis-v.vf jis/vf/jisg-v.vf \
-		jis/vf/jisgn-v.vf jis/vf/jisgn.vf \
-		jis/vf/jisn-v.vf jis/vf/jisn.vf \
-		morisawa/vf/FutoGoB101-Bold-H.vf \
-		morisawa/vf/FutoGoB101-Bold-J.vf \
-		morisawa/vf/FutoGoB101-Bold-V.vf \
-		morisawa/vf/FutoMinA101-Bold-H.vf \
-		morisawa/vf/FutoMinA101-Bold-J.vf \
-		morisawa/vf/FutoMinA101-Bold-V.vf \
-		morisawa/vf/GothicBBB-Medium-H.vf \
-		morisawa/vf/GothicBBB-Medium-J.vf \
-		morisawa/vf/GothicBBB-Medium-V.vf \
-		morisawa/vf/Jun101-Light-H.vf \
-		morisawa/vf/Jun101-Light-J.vf \
-		morisawa/vf/Jun101-Light-V.vf \
-		morisawa/vf/Ryumin-Light-H.vf \
-		morisawa/vf/Ryumin-Light-J.vf \
-		morisawa/vf/Ryumin-Light-V.vf
-
-TFMDIR=		${PREFIX}/${TEXMFDIR}/fonts/tfm/ptex
-TFMFILES=	jis/tfm/ptex/jis.tfm jis/tfm/ptex/jisg.tfm \
-		jis/tfm/ptex/jis-v.tfm jis/tfm/ptex/jisg-v.tfm \
-		jis/tfm/ptex/jisgn-v.tfm jis/tfm/ptex/jisgn.tfm \
-		jis/tfm/ptex/jisn-v.tfm jis/tfm/ptex/jisn.tfm \
-		morisawa/tfm/dvips/futogo-b-v.tfm \
-		morisawa/tfm/dvips/futogo-b.tfm \
-		morisawa/tfm/dvips/futomin-b-v.tfm \
-		morisawa/tfm/dvips/futomin-b.tfm \
-		morisawa/tfm/dvips/gtbbb-m-v.tfm \
-		morisawa/tfm/dvips/gtbbb-m.tfm \
-		morisawa/tfm/dvips/jun101-l-v.tfm \
-		morisawa/tfm/dvips/jun101-l.tfm \
-		morisawa/tfm/dvips/ryumin-l-v.tfm \
-		morisawa/tfm/dvips/ryumin-l.tfm \
-		morisawa/tfm/ptex/FutoGoB101-Bold-H.tfm \
-		morisawa/tfm/ptex/FutoMinA101-Bold-H.tfm \
-		morisawa/tfm/ptex/GothicBBB-Medium-H.tfm \
-		morisawa/tfm/ptex/Jun101-Light-H.tfm \
-		morisawa/tfm/ptex/Ryumin-Light-H.tfm \
-		morisawa/tfm/ptex/FutoGoB101-Bold-J.tfm \
-		morisawa/tfm/ptex/FutoMinA101-Bold-J.tfm \
-		morisawa/tfm/ptex/GothicBBB-Medium-J.tfm \
-		morisawa/tfm/ptex/Jun101-Light-J.tfm \
-		morisawa/tfm/ptex/Ryumin-Light-J.tfm \
-		morisawa/tfm/ptex/FutoGoB101-Bold-V.tfm \
-		morisawa/tfm/ptex/FutoMinA101-Bold-V.tfm \
-		morisawa/tfm/ptex/GothicBBB-Medium-V.tfm \
-		morisawa/tfm/ptex/Jun101-Light-V.tfm \
-		morisawa/tfm/ptex/Ryumin-Light-V.tfm
+MAPDIR=		${TEXMFDIR}/dvips/ptex
+VFDIR=		${TEXMFDIR}/fonts/vf/ptex
+TFMDIR=		${TEXMFDIR}/fonts/tfm/ptex
 
 post-extract:
 	${MV} ${WRKSRC_PTEX} ${WRKSRC}
@@ -172,22 +126,13 @@ pre-configure:
 			--without-etex && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET}
 
-pre-install:
-	${SED} ${UPDMAP_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/updmap-ptex.in > ${WRKDIR}/updmap-ptex
-	${SED} ${UPDMAP_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/updmap-sys-ptex.in > ${WRKDIR}/updmap-sys-ptex
-
 post-install:
 	cd ${WRKDIR}/texmf-tmp && \
 		${TAR} cf - ${INSTDIRS} | \
 			(cd ${PREFIX}/${TEXMFDIR} && ${TAR} xf -)
 	cd ${WRKDIR} && \
 		${INSTALL_DATA} ${DOC_FILES} ${PREFIX}/${TEXMFDIR}/doc/ptex
-.for D in MAP VF TFM
-	${MKDIR} ${${D}DIR}
-	cd ${WRKDIR} && ${INSTALL_DATA} ${${D}FILES} ${${D}DIR}
-.endfor
+	${AWK} '/@comment INSTALL_DATA/{printf "${MKDIR} ${PREFIX}/%s && ${INSTALL_DATA} ${WRKDIR}/%s ${PREFIX}/%s\n",$$4,$$3,$$4}' < ${TMPPLIST} | ${SH}
 	${MKDIR} ${PREFIX}/${TEXMFCONFIGDIR}/texconfig
 	${INSTALL_DATA} ${FILESDIR}/tcfmgr.map \
 		${PREFIX}/${TEXMFCONFIGDIR}/texconfig
@@ -204,7 +149,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/updmap-ptex ${PREFIX}/bin/updmap-ptex
 	${INSTALL_SCRIPT} ${WRKDIR}/updmap-sys-ptex ${PREFIX}/bin/updmap-sys-ptex
 	${MKTEXLSR}
-	${SETENV} PATH=$${PATH}:${LOCALBASE}/bin ${SH} ${UPDMAP_SYS_PTEX}
+	${SH} ${UPDMAP_SYS_PTEX}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/japanese/ptex-tetex/distinfo b/japanese/ptex-tetex/distinfo
index 1317ea2011b3..87d4d36a20c6 100644
--- a/japanese/ptex-tetex/distinfo
+++ b/japanese/ptex-tetex/distinfo
@@ -1,9 +1,9 @@
 MD5 (teTeX/ptex-src-3.1.9.tar.gz) = e847e5461ff4ea93bdd2291eed19482f
 SHA256 (teTeX/ptex-src-3.1.9.tar.gz) = ff119b012bfc134a4dfad6aead2cd3bb7a79491caef94ebfc2098b9c7e5d72a0
 SIZE (teTeX/ptex-src-3.1.9.tar.gz) = 131943
-MD5 (teTeX/ptex-texmf-2.3.tar.gz) = e47a49328a369781d94c40355047ffc6
-SHA256 (teTeX/ptex-texmf-2.3.tar.gz) = b4ab3c8abd5a4b935d0a5b2738fd691012c01567190b8551f3b0ec0dbc04de34
-SIZE (teTeX/ptex-texmf-2.3.tar.gz) = 1866282
+MD5 (teTeX/ptex-texmf-2.4.tar.gz) = 1350dfb1780f5ea8e122bdbc5eaf3c0b
+SHA256 (teTeX/ptex-texmf-2.4.tar.gz) = 650271c8575e18597c23b1a3616c97914aea3fb8e05338234d9038a425767a2b
+SIZE (teTeX/ptex-texmf-2.4.tar.gz) = 1866715
 MD5 (teTeX/tetex-src-3.0.tar.gz) = 944a4641e79e61043fdaf8f38ecbb4b3
 SHA256 (teTeX/tetex-src-3.0.tar.gz) = 9c0f7eaeb5ba6dc6f66433404d264941bf95cded2fa798b1f7a9dd580c21649b
 SIZE (teTeX/tetex-src-3.0.tar.gz) = 12749314
diff --git a/japanese/ptex-tetex/pkg-descr b/japanese/ptex-tetex/pkg-descr
index 4ad3aea0a0a0..a93fe90ddeec 100644
--- a/japanese/ptex-tetex/pkg-descr
+++ b/japanese/ptex-tetex/pkg-descr
@@ -1,7 +1,7 @@
 This is pTeX, TeX system with Japanese support.  This package installs
 Japanese specific executables and other files.
 
-This system depends on teTeX 2.99.13.20050204, which contains TeX, LaTeX2e, and
+This system depends on teTeX 3.0, which contains TeX, LaTeX2e, and
 various other TeX related programs.  
 
 WWW: http://www.ascii.co.jp/pb/ptex/
diff --git a/japanese/ptex-tetex/pkg-plist b/japanese/ptex-tetex/pkg-plist
index 07c4cfee147b..19f1a4ed8f42 100644
--- a/japanese/ptex-tetex/pkg-plist
+++ b/japanese/ptex-tetex/pkg-plist
@@ -333,7 +333,7 @@ bin/updmap-sys-ptex
 @exec /bin/mkdir -p %D/%%TEXMFVARDIR%%/fonts/map/ptex/dvips/updmap
 @exec /bin/mkdir -p %D/%%TEXMFVARDIR%%/fonts/map/ptex/dvipdfm/updmap
 @exec /bin/mkdir -p %D/%%TEXMFVARDIR%%/fonts/map/ptex/pdftex/updmap
-@exec %%SETENV%% PATH=${PATH}:%D/bin %%UPDMAP_SYS_PTEX%%
+@exec %%UPDMAP_SYS_PTEX%%
 @unexec rm -f %D/%%TEXMFVARDIR%%/fonts/map/ptex/dvips/updmap/download35.map
 @unexec rm -f %D/%%TEXMFVARDIR%%/fonts/map/ptex/dvips/updmap/builtin35.map
 @unexec rm -f %D/%%TEXMFVARDIR%%/fonts/map/ptex/dvips/updmap/psfonts_t1.map
@@ -362,3 +362,62 @@ bin/updmap-sys-ptex
 @dirrm %%TEXMFVARDIR%%/fonts/map/ptex
 @exec %%MKTEXLSR%%
 @unexec %%MKTEXLSR%%
+@comment the following entries will not be used for packaging
+@comment INSTALL_DATA jis/jis.map %%MAPDIR%%
+@comment INSTALL_DATA morisawa/morisawa.map %%MAPDIR%%
+@comment INSTALL_DATA jis/vf/jis.vf %%VFDIR%%
+@comment INSTALL_DATA jis/vf/jisg.vf %%VFDIR%%
+@comment INSTALL_DATA jis/vf/jis-v.vf %%VFDIR%%
+@comment INSTALL_DATA jis/vf/jisg-v.vf %%VFDIR%%
+@comment INSTALL_DATA jis/vf/jisgn-v.vf %%VFDIR%%
+@comment INSTALL_DATA jis/vf/jisgn.vf %%VFDIR%%
+@comment INSTALL_DATA jis/vf/jisn-v.vf %%VFDIR%%
+@comment INSTALL_DATA jis/vf/jisn.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/FutoGoB101-Bold-H.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/FutoGoB101-Bold-J.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/FutoGoB101-Bold-V.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/FutoMinA101-Bold-H.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/FutoMinA101-Bold-J.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/FutoMinA101-Bold-V.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/GothicBBB-Medium-H.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/GothicBBB-Medium-J.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/GothicBBB-Medium-V.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/Jun101-Light-H.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/Jun101-Light-J.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/Jun101-Light-V.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/Ryumin-Light-H.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/Ryumin-Light-J.vf %%VFDIR%%
+@comment INSTALL_DATA morisawa/vf/Ryumin-Light-V.vf %%VFDIR%%
+@comment INSTALL_DATA jis/tfm/ptex/jis.tfm %%TFMDIR%%
+@comment INSTALL_DATA jis/tfm/ptex/jisg.tfm %%TFMDIR%%
+@comment INSTALL_DATA jis/tfm/ptex/jis-v.tfm %%TFMDIR%%
+@comment INSTALL_DATA jis/tfm/ptex/jisg-v.tfm %%TFMDIR%%
+@comment INSTALL_DATA jis/tfm/ptex/jisgn-v.tfm %%TFMDIR%%
+@comment INSTALL_DATA jis/tfm/ptex/jisgn.tfm %%TFMDIR%%
+@comment INSTALL_DATA jis/tfm/ptex/jisn-v.tfm %%TFMDIR%%
+@comment INSTALL_DATA jis/tfm/ptex/jisn.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/dvips/futogo-b-v.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/dvips/futogo-b.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/dvips/futomin-b-v.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/dvips/futomin-b.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/dvips/gtbbb-m-v.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/dvips/gtbbb-m.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/dvips/jun101-l-v.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/dvips/jun101-l.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/dvips/ryumin-l-v.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/dvips/ryumin-l.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/FutoGoB101-Bold-H.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/FutoMinA101-Bold-H.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/GothicBBB-Medium-H.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/Jun101-Light-H.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/Ryumin-Light-H.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/FutoGoB101-Bold-J.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/FutoMinA101-Bold-J.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/GothicBBB-Medium-J.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/Jun101-Light-J.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/Ryumin-Light-J.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/FutoGoB101-Bold-V.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/FutoMinA101-Bold-V.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/GothicBBB-Medium-V.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/Jun101-Light-V.tfm %%TFMDIR%%
+@comment INSTALL_DATA morisawa/tfm/ptex/Ryumin-Light-V.tfm %%TFMDIR%%