3 files changed, 89 insertions, 15 deletions

diff --git a/japanese/ptex-tetex/Makefile b/japanese/ptex-tetex/Makefile
index 75653c23f620..fd31b902a816 100644
--- a/japanese/ptex-tetex/Makefile
+++ b/japanese/ptex-tetex/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ptex-tetex
 PORTVERSION=	3.1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/:1 \
@@ -47,7 +47,9 @@ ALL_TARGET=	default
 PLIST_SUB=	MKTEXLSR=${MKTEXLSR} \
 		TEXMFDISTDIR=${TEXMFDISTDIR} \
 		TEXMFCONFIGDIR=${TEXMFCONFIGDIR} \
-		TEXMFDIR=${TEXMFDIR}
+		TEXMFVARDIR=${TEXMFVARDIR} \
+		TEXMFDIR=${TEXMFDIR} \
+		UPDMAP_SYS_PTEX=${UPDMAP_SYS_PTEX}
 CONFLICTS=	ja-ptex-base-[0-9]*
 .if !make(do-patch)
 WRKSRC=		${WRKDIR}/${TETEX_SRC}/texk/web2c/ptex-${VER_PTEX}
@@ -66,11 +68,22 @@ TEXMFDIR?=	share/texmf
 TEXMFDISTDIR?=	share/texmf-dist
 TEXMFCONFIGDIR?=share/texmf-config
 TEXMFLOCALDIR?=	share/texmf-local
+TEXMFVARDIR?=	share/texmf-var
 TEXMFLOCAL_LSR?=${LOCALBASE}/${TEXMFLOCALDIR}/ls-R
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
 LIBPNG_PREFIX?=	${LOCALBASE}
 LIBWWW_PREFIX?=	${LOCALBASE}
 LIBT1_PREFIX?=	${LOCALBASE}
+FONTSMAPDIR=	${TEXMFDIR}/fonts/map/ptex
+FONTSMAPVARDIR=	${TEXMFVARDIR}/fonts/map/ptex
+
+UPDMAP_SYS_PTEX=${PREFIX}/bin/updmap-sys-ptex
+UPDMAP_SUB=	PREFIX=${PREFIX} \
+		TEXMFDIR=${TEXMFDIR} \
+		DVIPSDIR=${DVIPSDIR} \
+		TEXMFVARDIR=${TEXMFVARDIR} \
+		FONTSMAPDIR=${FONTSMAPDIR} \
+		FONTSMAPVARDIR=${FONTSMAPVARDIR}
 
 INSTDIRS=	doc fonts jbibtex ptex
 DOC_FILES=	COPYRIGHT COPYRIGHT.jis Changes.txt README.txt
@@ -159,6 +172,12 @@ 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} | \
@@ -170,8 +189,19 @@ post-install:
 	cd ${WRKDIR} && ${INSTALL_DATA} ${${D}FILES} ${${D}DIR}
 .endfor
 	${MKDIR} ${PREFIX}/${TEXMFCONFIGDIR}/texconfig
-	${CP} ${FILESDIR}/tcfmgr.map ${PREFIX}/${TEXMFCONFIGDIR}/texconfig
+	${INSTALL_DATA} ${FILESDIR}/tcfmgr.map \
+		${PREFIX}/${TEXMFCONFIGDIR}/texconfig
+	${INSTALL_DATA} ${LOCALBASE}/${TEXMFDISTDIR}/web2c/updmap.cfg \
+		${PREFIX}/${TEXMFDIR}/web2c/ptex/updmap.cfg
+	${MKDIR} ${PREFIX}/${TEXMFCONFIGDIR}/dvips/ptex
+.for F in dvips dvipdfm pdftex
+	${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
 	${MKTEXLSR}
+	${SH} ${UPDMAP_SYS_PTEX}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in-teTeX b/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in-teTeX
index 0f8464c2b080..609aada1c46c 100644
--- a/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in-teTeX
+++ b/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in-teTeX
@@ -1,6 +1,6 @@
---- texk/kpathsea/texmf.in-teTeX.orig	Sun Jan 30 08:09:42 2005
-+++ texk/kpathsea/texmf.in-teTeX	Sun Feb  6 06:22:57 2005
-@@ -167,11 +167,18 @@
+--- texk/kpathsea/texmf.in-teTeX.orig	Sun Feb  6 09:04:35 2005
++++ texk/kpathsea/texmf.in-teTeX	Sat Feb 12 20:27:12 2005
+@@ -177,11 +177,18 @@
  % latex209, useful for macros that were written for 2.09 and do not
  % mention 2e at all, but can be used with 2e.
  TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
@@ -20,7 +20,7 @@
  % Fontinst needs to read afm files.
  TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}//
  
-@@ -232,12 +239,12 @@
+@@ -246,12 +253,12 @@
  % and string pools (.pool) for ini{tex,mf,mp}.  It is silly that we have six
  % paths and directories here (they all resolve to a single place by default),
  % but historically ...
@@ -39,7 +39,16 @@
  
  % Device-independent font metric files.
  VFFONTS = .;$TEXMF/fonts/vf//
-@@ -277,8 +284,8 @@
+@@ -274,7 +281,7 @@
+ MISCFONTS = .;$TEXMF/fonts/misc//
+ 
+ % font name map files.
+-TEXFONTMAPS = .;$TEXMF/fonts/map//
++TEXFONTMAPS = .;$TEXMF/fonts/map{/ptex,}//
+ 
+ % support non"k"-xdvi:
+ PKFONTS.XDvi    = .:$TEXMF/%s:$VARTEXFONTS/pk/{%m,modeless}//
+@@ -291,8 +298,8 @@
  
  % PostScript headers and prologues (.pro); unfortunately, some programs
  % also use this for acessing font files (enc, type1, truetype)
@@ -50,7 +59,7 @@
  
  % PostScript Type 1 outline fonts.
  T1FONTS = .;$TEXMF/fonts/type1//
-@@ -296,10 +303,10 @@
+@@ -310,10 +317,10 @@
  LIGFONTS =  .;$TEXMF/fonts/lig//
  
  % Dvips' config.* files (this name should not start with `TEX'!).
@@ -63,7 +72,7 @@
  
  % Font encoding files (.enc).
  ENCFONTS = .;$TEXMF/fonts/enc//
-@@ -352,6 +359,10 @@
+@@ -366,6 +373,10 @@
  % search formats, you'll want to add their variables here as well.
  T4HTINPUTS   = .;$TEXMF/tex4ht//
  
@@ -74,7 +83,7 @@
  % Architecture independent executables
  TEXMFSCRIPTS = $TEXMF/scripts//
  
-@@ -368,7 +379,7 @@
+@@ -382,7 +393,7 @@
  %
  % For security reasons, it is better not to have . part of the path.
  % 
@@ -83,7 +92,7 @@
  
  # $progname: kpathsea v. 3.5.3 or later overwrites this at runtime. To
  # avoid empty expansions from binaries linked against an earlier
-@@ -542,3 +553,8 @@
+@@ -556,3 +567,8 @@
  error_line = 79
  half_error_line = 50
  max_print_line = 79
diff --git a/japanese/ptex-tetex/pkg-plist b/japanese/ptex-tetex/pkg-plist
index d8c6185cab8e..f12ee1c62857 100644
--- a/japanese/ptex-tetex/pkg-plist
+++ b/japanese/ptex-tetex/pkg-plist
@@ -15,6 +15,8 @@ bin/tftopl-ptex
 %%TEXMFDIR%%/web2c/ptex/ptex.fmt
 %%TEXMFDIR%%/web2c/ptex/ptex.pool
 %%TEXMFDIR%%/web2c/ptex/texmf.cnf
+%%TEXMFDIR%%/web2c/ptex/updmap.cfg
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/ptex/updmap.log
 @dirrm %%TEXMFDIR%%/web2c/ptex
 %%TEXMFDIR%%/doc/jbibtex/doc-ascii/Makefile
 %%TEXMFDIR%%/doc/jbibtex/doc-ascii/README
@@ -238,7 +240,6 @@ bin/tftopl-ptex
 @dirrm %%TEXMFDIR%%/ptex/plain/base
 %%TEXMFDIR%%/ptex/plain/config/ptex.ini
 @dirrm %%TEXMFDIR%%/ptex/plain/config
-@dirrm %%TEXMFDIR%%/ptex/plain
 %%TEXMFDIR%%/ptex/platex/base/Changes.txt
 %%TEXMFDIR%%/ptex/platex/base/README.txt
 %%TEXMFDIR%%/ptex/platex/base/README2.txt
@@ -314,12 +315,46 @@ bin/tftopl-ptex
 %%TEXMFDIR%%/ptex/platex/config/hyphen.cfg
 %%TEXMFDIR%%/ptex/platex/config/platex.ini
 @dirrm %%TEXMFDIR%%/ptex/platex/config
-@dirrm %%TEXMFDIR%%/ptex/platex
-@dirrm %%TEXMFDIR%%/ptex
 %%TEXMFDIR%%/dvips/ptex/jis.map
 %%TEXMFDIR%%/dvips/ptex/morisawa.map
 @unexec rmdir %D/%%TEXMFDIR%%/dvips/ptex 2> /dev/null || true
+@exec /bin/mkdir -p %D/%%TEXMFCONFIGDIR%%/dvips/ptex
+@unexec rmdir %D/%%TEXMFCONFIGDIR%%/dvips/ptex 2> /dev/null || true
 %%TEXMFCONFIGDIR%%/texconfig/tcfmgr.map
 @dirrm %%TEXMFCONFIGDIR%%/texconfig
 @exec %%MKTEXLSR%%
+@exec /bin/mkdir -p %D/%%TEXMFDIR%%/fonts/map/ptex/dvips/updmap
+@exec /bin/mkdir -p %D/%%TEXMFDIR%%/fonts/map/ptex/dvipdfm/updmap
+@exec /bin/mkdir -p %D/%%TEXMFDIR%%/fonts/map/ptex/pdftex/updmap
+@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%%
+@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
+@unexec rm -f %D/%%TEXMFVARDIR%%/fonts/map/ptex/dvips/updmap/psfonts_pk.map
+@unexec rm -f %D/%%TEXMFVARDIR%%/fonts/map/ptex/dvips/updmap/ps2pk.map
+@unexec rm -f %D/%%TEXMFVARDIR%%/fonts/map/ptex/dvips/updmap/psfonts.map
+@unexec rm -f %D/%%TEXMFVARDIR%%/fonts/map/ptex/pdftex/updmap/pdftex_dl14.map
+@unexec rm -f %D/%%TEXMFVARDIR%%/fonts/map/ptex/pdftex/updmap/pdftex_ndl14.map
+@unexec rm -f %D/%%TEXMFVARDIR%%/fonts/map/ptex/pdftex/updmap/pdftex.map
+@unexec rm -f %D/%%TEXMFVARDIR%%/fonts/map/ptex/dvipdfm/updmap/dvipdfm_dl14.map
+@unexec rm -f %D/%%TEXMFVARDIR%%/fonts/map/ptex/dvipdfm/updmap/dvipdfm_ndl14.map
+@unexec rm -f %D/%%TEXMFVARDIR%%/fonts/map/ptex/dvipdfm/updmap/dvipdfm.map
+@dirrm %%TEXMFDIR%%/fonts/map/ptex/dvips/updmap
+@dirrm %%TEXMFDIR%%/fonts/map/ptex/dvips
+@dirrm %%TEXMFDIR%%/fonts/map/ptex/dvipdfm/updmap
+@dirrm %%TEXMFDIR%%/fonts/map/ptex/dvipdfm
+@dirrm %%TEXMFDIR%%/fonts/map/ptex/pdftex/updmap
+@dirrm %%TEXMFDIR%%/fonts/map/ptex/pdftex
+@dirrm %%TEXMFDIR%%/fonts/map/ptex
+@dirrm %%TEXMFVARDIR%%/fonts/map/ptex/dvips/updmap
+@dirrm %%TEXMFVARDIR%%/fonts/map/ptex/dvips
+@dirrm %%TEXMFVARDIR%%/fonts/map/ptex/dvipdfm/updmap
+@dirrm %%TEXMFVARDIR%%/fonts/map/ptex/dvipdfm
+@dirrm %%TEXMFVARDIR%%/fonts/map/ptex/pdftex/updmap
+@dirrm %%TEXMFVARDIR%%/fonts/map/ptex/pdftex
+@dirrm %%TEXMFVARDIR%%/fonts/map/ptex
+@exec %%MKTEXLSR%%
 @unexec %%MKTEXLSR%%