6 files changed, 18 insertions, 13 deletions

diff --git a/japanese/ptex-tetex/Makefile b/japanese/ptex-tetex/Makefile
index c84b746c3a56..3dde0af8b19b 100644
--- a/japanese/ptex-tetex/Makefile
+++ b/japanese/ptex-tetex/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ptex-tetex
-PORTVERSION=	3.1.8
-PORTREVISION=	3
+PORTVERSION=	3.1.8.1
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/:1 \
@@ -49,7 +48,8 @@ PLIST_SUB=	MKTEXLSR=${MKTEXLSR} \
 		TEXMFCONFIGDIR=${TEXMFCONFIGDIR} \
 		TEXMFVARDIR=${TEXMFVARDIR} \
 		TEXMFDIR=${TEXMFDIR} \
-		UPDMAP_SYS_PTEX=${UPDMAP_SYS_PTEX}
+		UPDMAP_SYS_PTEX=${UPDMAP_SYS_PTEX} \
+		SETENV=${SETENV}
 CONFLICTS=	ja-ptex-base-[0-9]*
 .if !make(do-patch)
 WRKSRC=		${WRKDIR}/${TETEX_SRC}/texk/web2c/ptex-${VER_PTEX}
@@ -193,6 +193,9 @@ post-install:
 		${PREFIX}/${TEXMFCONFIGDIR}/texconfig
 	${INSTALL_DATA} ${LOCALBASE}/${TEXMFDISTDIR}/web2c/updmap.cfg \
 		${PREFIX}/${TEXMFDIR}/web2c/ptex/updmap.cfg
+	${MKDIR} ${PREFIX}/${TEXMFCONFIGDIR}/web2c/ptex
+	${INSTALL_DATA} ${LOCALBASE}/${TEXMFDISTDIR}/web2c/updmap.cfg \
+		${PREFIX}/${TEXMFCONFIGDIR}/web2c/ptex/updmap.cfg
 	${MKDIR} ${PREFIX}/${TEXMFCONFIGDIR}/dvips/ptex
 .for F in dvips dvipdfm pdftex
 	${MKDIR} ${PREFIX}/${FONTSMAPDIR}/${F}/updmap
@@ -201,7 +204,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/updmap-ptex ${PREFIX}/bin/updmap-ptex
 	${INSTALL_SCRIPT} ${WRKDIR}/updmap-sys-ptex ${PREFIX}/bin/updmap-sys-ptex
 	${MKTEXLSR}
-	${SH} ${UPDMAP_SYS_PTEX}
+	${SETENV} PATH=$${PATH}:${LOCALBASE}/bin ${SH} ${UPDMAP_SYS_PTEX}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/japanese/ptex-tetex/distinfo b/japanese/ptex-tetex/distinfo
index 62031911d307..0ec557169547 100644
--- a/japanese/ptex-tetex/distinfo
+++ b/japanese/ptex-tetex/distinfo
@@ -1,5 +1,5 @@
-MD5 (teTeX/ptex-src-3.1.8.tar.gz) = 6a31c299a018225c6ddaa8f7b0de2b1e
-SIZE (teTeX/ptex-src-3.1.8.tar.gz) = 132130
+MD5 (teTeX/ptex-src-3.1.8.1.tar.gz) = f574978b226150a1dc180f3ef8c80310
+SIZE (teTeX/ptex-src-3.1.8.1.tar.gz) = 131752
 MD5 (teTeX/ptex-texmf-2.3.tar.gz) = e47a49328a369781d94c40355047ffc6
 SIZE (teTeX/ptex-texmf-2.3.tar.gz) = 1866282
 MD5 (teTeX/tetex-src-3.0.tar.gz) = 944a4641e79e61043fdaf8f38ecbb4b3
diff --git a/japanese/ptex-tetex/files/patch-texk::web2c::ptex-ver::Makefile.in b/japanese/ptex-tetex/files/patch-texk::web2c::ptex-ver::Makefile.in
index 5077e60c018c..c7e1d98153f2 100644
--- a/japanese/ptex-tetex/files/patch-texk::web2c::ptex-ver::Makefile.in
+++ b/japanese/ptex-tetex/files/patch-texk::web2c::ptex-ver::Makefile.in
@@ -1,5 +1,5 @@
---- texk/web2c/ptex-3.1.8/Makefile.in.orig	Fri Dec  3 17:33:13 2004
-+++ texk/web2c/ptex-3.1.8/Makefile.in	Tue Jan 11 01:41:20 2005
+--- texk/web2c/ptex-3.1.8.1/Makefile.in.orig	Mon Mar  7 15:30:44 2005
++++ texk/web2c/ptex-3.1.8.1/Makefile.in	Sat Mar 19 08:24:59 2005
 @@ -5,7 +5,7 @@
  
  default: programs formats
@@ -31,12 +31,12 @@
  texmf.cnf: $(kpathsea_dir)/texmf.cnf
  	$(SHELL) $(thisdir)/mkconf $(kpathsea_dir)/texmf.cnf > texmf.cnf
  
--dumpenv = TEXMFCNF=$(thisdir) TEXMF=$(texmf)
+-dumpenv = TEXMFCNF=$(thisdir)
 +dumpenv = TEXMFCNF=$(thisdir) TEXMF=\{${TEXMFDUMP},${TEXMFDISTDIR},$(texmf),${TEXMFLOCALDIR}\}
  
  ptex-euc.fmt: ptex texmf.cnf
  	$(dumpenv) $(MAKE) progname=ptex files="ptex.tex min10.tfm" prereq-check
-@@ -271,13 +271,13 @@
+@@ -272,13 +272,13 @@
  	-$(DIFF) $(DIFFFLAGS) $(tripdir)/trip.typ trip.typ
  
  # Ad hoc tests.
diff --git a/japanese/ptex-tetex/files/updmap-ptex.in b/japanese/ptex-tetex/files/updmap-ptex.in
index 76a26c5f3454..98942059c46a 100644
--- a/japanese/ptex-tetex/files/updmap-ptex.in
+++ b/japanese/ptex-tetex/files/updmap-ptex.in
@@ -5,11 +5,11 @@ 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 \
-		--cnffile %%PREFIX%%/%%TEXMFDIR%%/web2c/ptex/updmap.cfg \
 		--dvipsoutputdir %%PREFIX%%/%%FONTSMAPVARDIR%%/dvips/updmap \
 		--dvipdfmoutputdir %%PREFIX%%/%%FONTSMAPVARDIR%%/dvipdfm/updmap \
 		--pdftexoutputdir %%PREFIX%%/%%FONTSMAPVARDIR%%/pdftex/updmap \
diff --git a/japanese/ptex-tetex/files/updmap-sys-ptex.in b/japanese/ptex-tetex/files/updmap-sys-ptex.in
index d927dbbcf98c..bd20363bd1cc 100644
--- a/japanese/ptex-tetex/files/updmap-sys-ptex.in
+++ b/japanese/ptex-tetex/files/updmap-sys-ptex.in
@@ -5,11 +5,11 @@ 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 \
-		--cnffile %%PREFIX%%/%%TEXMFDIR%%/web2c/ptex/updmap.cfg \
 		--dvipsoutputdir %%PREFIX%%/%%FONTSMAPVARDIR%%/dvips/updmap \
 		--dvipdfmoutputdir %%PREFIX%%/%%FONTSMAPVARDIR%%/dvipdfm/updmap \
 		--pdftexoutputdir %%PREFIX%%/%%FONTSMAPVARDIR%%/pdftex/updmap \
diff --git a/japanese/ptex-tetex/pkg-plist b/japanese/ptex-tetex/pkg-plist
index efffa2212c00..07c4cfee147b 100644
--- a/japanese/ptex-tetex/pkg-plist
+++ b/japanese/ptex-tetex/pkg-plist
@@ -324,6 +324,8 @@ bin/updmap-sys-ptex
 @unexec rmdir %D/%%TEXMFCONFIGDIR%%/dvips/ptex 2> /dev/null || true
 %%TEXMFCONFIGDIR%%/texconfig/tcfmgr.map
 @dirrm %%TEXMFCONFIGDIR%%/texconfig
+%%TEXMFCONFIGDIR%%/web2c/ptex/updmap.cfg
+@unexec rmdir %D/%%TEXMFCONFIGDIR%%/web2c/ptex 2> /dev/null || true
 @exec %%MKTEXLSR%%
 @exec /bin/mkdir -p %D/%%TEXMFDIR%%/fonts/map/ptex/dvips/updmap
 @exec /bin/mkdir -p %D/%%TEXMFDIR%%/fonts/map/ptex/dvipdfm/updmap
@@ -331,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 %%UPDMAP_SYS_PTEX%%
+@exec %%SETENV%% PATH=${PATH}:%D/bin %%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