- updmap(1) now supports --progname=ptex to generate map files for pTeX.

- Bump PORTREVISION.

5 files changed, 33 insertions, 45 deletions

diff --git a/japanese/ptex-tetex/Makefile b/japanese/ptex-tetex/Makefile
index d920d162bdf8..b5036f1fdf5e 100644
--- a/japanese/ptex-tetex/Makefile
+++ b/japanese/ptex-tetex/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ptex-tetex
 PORTVERSION=	3.1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/:1 \
@@ -49,7 +49,8 @@ PLIST_SUB=	MKTEXLSR=${MKTEXLSR} \
 		TEXMFCONFIGDIR=${TEXMFCONFIGDIR} \
 		TEXMFVARDIR=${TEXMFVARDIR} \
 		TEXMFDIR=${TEXMFDIR} \
-		UPDMAP_SYS_PTEX=${UPDMAP_SYS_PTEX} \
+		UPDMAP_SYS=${UPDMAP_SYS} \
+		UPDMAPDIR=${UPDMAPDIR} \
 		MAPDIR=${MAPDIR} \
 		VFDIR=${VFDIR} \
 		TFMDIR=${TFMDIR}
@@ -80,15 +81,17 @@ LIBT1_PREFIX?=	${LOCALBASE}
 FONTSMAPDIR=	${TEXMFDIR}/fonts/map/ptex
 FONTSMAPVARDIR=	${TEXMFVARDIR}/fonts/map/ptex
 
-UPDMAP_SYS_PTEX=${PREFIX}/bin/updmap-sys-ptex
+UPDMAP_SYS=	${PREFIX}/bin/updmap-sys --progname=ptex
+UPDMAPDIR=	${TEXMFDIR}/updmap
 
-SUB_FILES=	updmap-ptex updmap-sys-ptex
+SUB_FILES=	updmap-ptex
 SUB_LIST=	PREFIX=${PREFIX} \
 		TEXMFDIR=${TEXMFDIR} \
 		DVIPSDIR=${DVIPSDIR} \
 		TEXMFVARDIR=${TEXMFVARDIR} \
 		FONTSMAPDIR=${FONTSMAPDIR} \
-		FONTSMAPVARDIR=${FONTSMAPVARDIR}
+		FONTSMAPVARDIR=${FONTSMAPVARDIR} \
+		UPDMAPDIR=${UPDMAPDIR}
 
 INSTDIRS=	doc fonts jbibtex ptex
 DOC_FILES=	COPYRIGHT COPYRIGHT.jis Changes.txt README.txt
@@ -133,9 +136,9 @@ post-install:
 	cd ${WRKDIR} && \
 		${INSTALL_DATA} ${DOC_FILES} ${PREFIX}/${TEXMFDIR}/doc/ptex
 	${AWK} '/@comment INSTALL_DATA/{printf "${MKDIR} ${PREFIX}/%s && ${INSTALL_DATA} ${WRKDIR}/%s ${PREFIX}/%s\n",$$4,$$3,$$4}' < ${TMPPLIST} | ${SH}
-	${MKDIR} ${PREFIX}/${TEXMFCONFIGDIR}/texconfig
+	${MKDIR} ${PREFIX}/${TEXMFCONFIGDIR}/texconfig/ptex
 	${INSTALL_DATA} ${FILESDIR}/tcfmgr.map \
-		${PREFIX}/${TEXMFCONFIGDIR}/texconfig
+		${PREFIX}/${TEXMFCONFIGDIR}/texconfig/ptex/tcfmgr.map
 	${INSTALL_DATA} ${LOCALBASE}/${TEXMFDISTDIR}/web2c/updmap.cfg \
 		${PREFIX}/${TEXMFDIR}/web2c/ptex/updmap.cfg
 	${MKDIR} ${PREFIX}/${TEXMFCONFIGDIR}/web2c/ptex
@@ -146,10 +149,9 @@ post-install:
 	${MKDIR} ${PREFIX}/${FONTSMAPDIR}/${F}/updmap
 	${MKDIR} ${PREFIX}/${FONTSMAPVARDIR}/${F}/updmap
 .endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/updmap-ptex ${PREFIX}/bin/updmap-ptex
-	${INSTALL_SCRIPT} ${WRKDIR}/updmap-sys-ptex ${PREFIX}/bin/updmap-sys-ptex
+	${INSTALL_SCRIPT} ${WRKDIR}/updmap-ptex ${PREFIX}/${UPDMAPDIR}/updmap.ptex
 	${MKTEXLSR}
-	${SH} ${UPDMAP_SYS_PTEX}
+	${SH} ${UPDMAP_SYS}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/japanese/ptex-tetex/files/updmap-ptex.in b/japanese/ptex-tetex/files/updmap-ptex.in
index 98942059c46a..7d5800d155a1 100644
--- a/japanese/ptex-tetex/files/updmap-ptex.in
+++ b/japanese/ptex-tetex/files/updmap-ptex.in
@@ -1,16 +1,17 @@
 #!/bin/sh
 # $FreeBSD$
 
-SETENV=/usr/bin/env
-PATH=${PATH}:%%PREFIX%%/bin
+WEB2C="\$TEXMF/web2c{/ptex,}"; export WEB2C
+TEXPSHEADERS="\$TEXMF/{dvips{/ptex,},fonts/{enc,type1,type3}}//"; export TEXPSHEADERS
+TEXCONFIG="\$TEXMF/dvips{/ptex,}//"; export TEXCONFIG
+TEXFONTMAPS="\$TEXMF/fonts/map{/ptex,}//"; export TEXFONTMAPS
+TEXCONFIGINPUTS="\$TEXMF/texconfig{/ptex,}"; export TEXCONFIGINPUTS
 
-${SETENV} \
-	WEB2C='$TEXMF/web2c{/ptex,}' \
-	TEXPSHEADERS='$TEXMF/{dvips{/ptex,},fonts/{enc,type1,type3}}//' \
-	TEXCONFIG='$TEXMF/dvips{/ptex,}//' \
-	TEXFONTMAPS='$TEXMF/fonts/map{/ptex,}//' \
-	%%PREFIX%%/bin/updmap \
-		--dvipsoutputdir %%PREFIX%%/%%FONTSMAPVARDIR%%/dvips/updmap \
-		--dvipdfmoutputdir %%PREFIX%%/%%FONTSMAPVARDIR%%/dvipdfm/updmap \
-		--pdftexoutputdir %%PREFIX%%/%%FONTSMAPVARDIR%%/pdftex/updmap \
-		$@
+FONTSMAPVARDIR=%%PREFIX%%/%%FONTSMAPVARDIR%%
+: ${UPDMAP_DIST:=%%PREFIX%%/%%UPDMAPDIR%%/updmap.dist}
+
+/bin/sh ${UPDMAP_DIST} \
+	--dvipsoutputdir ${FONTSMAPVARDIR}/dvips/updmap \
+	--dvipdfmoutputdir ${FONTSMAPVARDIR}/dvipdfm/updmap \
+	--pdftexoutputdir ${FONTSMAPVARDIR}/pdftex/updmap \
+	"$@"
diff --git a/japanese/ptex-tetex/files/updmap-sys-ptex.in b/japanese/ptex-tetex/files/updmap-sys-ptex.in
deleted file mode 100644
index bd20363bd1cc..000000000000
--- a/japanese/ptex-tetex/files/updmap-sys-ptex.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-SETENV=/usr/bin/env
-PATH=${PATH}:%%PREFIX%%/bin
-
-${SETENV} \
-	WEB2C='$TEXMF/web2c{/ptex,}' \
-	TEXPSHEADERS='$TEXMF/{dvips{/ptex,},fonts/{enc,type1,type3}}//' \
-	TEXCONFIG='$TEXMF/dvips{/ptex,}//' \
-	TEXFONTMAPS='$TEXMF/fonts/map{/ptex,}//' \
-	%%PREFIX%%/bin/updmap-sys \
-		--dvipsoutputdir %%PREFIX%%/%%FONTSMAPVARDIR%%/dvips/updmap \
-		--dvipdfmoutputdir %%PREFIX%%/%%FONTSMAPVARDIR%%/dvipdfm/updmap \
-		--pdftexoutputdir %%PREFIX%%/%%FONTSMAPVARDIR%%/pdftex/updmap \
-		$@
-
-
diff --git a/japanese/ptex-tetex/pkg-message b/japanese/ptex-tetex/pkg-message
index 369eea0f2d56..e1112b6add60 100644
--- a/japanese/ptex-tetex/pkg-message
+++ b/japanese/ptex-tetex/pkg-message
@@ -9,4 +9,8 @@
  - Japanized versions of "pltotf" and "tftopl" are installed
    as "pltotf-ptex" and "tftopl-ptex".
 
+ - updmap(1) and updmap-sys(1) supports --progname=ptex option.
+   When this option specified, pTeX specific font maps
+   will be generated/processed.
+
  - pLaTeX2e is now based on LaTeX2e as of 2003/12/01.
diff --git a/japanese/ptex-tetex/pkg-plist b/japanese/ptex-tetex/pkg-plist
index 06dbdedfcb3c..f68506cebe19 100644
--- a/japanese/ptex-tetex/pkg-plist
+++ b/japanese/ptex-tetex/pkg-plist
@@ -5,8 +5,6 @@ bin/platex
 bin/pltotf-ptex
 bin/ptex
 bin/tftopl-ptex
-bin/updmap-ptex
-bin/updmap-sys-ptex
 %%TEXMFDIR%%/web2c/ptex/platex-euc.fmt
 %%TEXMFDIR%%/web2c/ptex/platex-jis.fmt
 %%TEXMFDIR%%/web2c/ptex/platex-sjis.fmt
@@ -322,10 +320,11 @@ bin/updmap-sys-ptex
 @dirrmtry %%TEXMFDIR%%/dvips/ptex
 @exec /bin/mkdir -p %D/%%TEXMFCONFIGDIR%%/dvips/ptex
 @dirrmtry %%TEXMFCONFIGDIR%%/dvips/ptex
-%%TEXMFCONFIGDIR%%/texconfig/tcfmgr.map
-@dirrm %%TEXMFCONFIGDIR%%/texconfig
+%%TEXMFCONFIGDIR%%/texconfig/ptex/tcfmgr.map
+@dirrm %%TEXMFCONFIGDIR%%/texconfig/ptex
 %%TEXMFCONFIGDIR%%/web2c/ptex/updmap.cfg
 @dirrmtry %%TEXMFCONFIGDIR%%/web2c/ptex
+%%UPDMAPDIR%%/updmap.ptex
 @exec %%MKTEXLSR%%
 @exec /bin/mkdir -p %D/%%TEXMFDIR%%/fonts/map/ptex/dvips/updmap
 @exec /bin/mkdir -p %D/%%TEXMFDIR%%/fonts/map/ptex/dvipdfm/updmap
@@ -333,7 +332,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 %%UPDMAP_SYS_PTEX%%
+@exec %%UPDMAP_SYS%%
 @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