- update to 3.1.8

- teTeX-3.0 support
- texconfig(1) now recognizes japanese/{xdvik,dvipsk} correctly.

12 files changed, 214 insertions, 201 deletions

diff --git a/japanese/ptex-tetex/Makefile b/japanese/ptex-tetex/Makefile
index 38f5e31ef5f5..817ed2f21966 100644
--- a/japanese/ptex-tetex/Makefile
+++ b/japanese/ptex-tetex/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	ptex-tetex
-PORTVERSION=	3.1.5
+PORTVERSION=	3.1.8
 PORTREVISION=	0
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/ \
+MASTER_SITES=	ftp://ftp.dante.de/tex-archive/systems/unix/teTeX-beta/ \
 		${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/:1 \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/:2
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	systems/unix/teTeX/2.0/distrib
 PKGNAMEPREFIX=	ja-
 DISTFILES=	ptex-src-${VER_PTEX}${EXTRACT_SUFX}:1 \
 		ptex-texmf-${VER_PTEXTEXMF}${EXTRACT_SUFX}:1 \
-		tetex-src-${VER_TETEX}${EXTRACT_SUFX} \
+		${TETEX_SRC}${EXTRACT_SUFX} \
 		jis${EXTRACT_SUFX}:2 morisawa${EXTRACT_SUFX}:2
 DIST_SUBDIR=	teTeX
 
@@ -24,13 +24,11 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	ASCII Japanese pTeX which supports teTeX distribution
 
 BUILD_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
-		${LOCALBASE}/${TEXMFDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
-		mktexlsr:${PORTSDIR}/print/teTeX-base \
-		${LOCALBASE}/${TEXMFLOCAL}/tex/latex/base/latex.ltx:${PORTSDIR}/print/teTeX-latex2e
+		${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
+		mktexlsr:${PORTSDIR}/print/teTeX-base
 RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
-		${LOCALBASE}/${TEXMFDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
-		mktexlsr:${PORTSDIR}/print/teTeX-base \
-		${LOCALBASE}/${TEXMFLOCAL}/tex/latex/base/latex.ltx:${PORTSDIR}/print/teTeX-latex2e
+		${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
+		mktexlsr:${PORTSDIR}/print/teTeX-base
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
@@ -42,29 +40,34 @@ CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 USE_GMAKE=	yes
 .if make(post-extract) || make(do-build)
-MAKE_ENV=	TEXMFLOCAL=${WRKDIR}/texmf-tmp \
-		TEXMFDUMP=${LOCALBASE}/${TEXMFLOCAL}
+MAKE_ENV=	TEXMFLOCALDIR=${WRKDIR}/texmf-tmp \
+		TEXMFDUMP=${LOCALBASE}/${TEXMFLOCALDIR} \
+		TEXMFDISTDIR=${LOCALBASE}/${TEXMFDISTDIR}
 .endif
 ALL_TARGET=	default
-PLIST_SUB=	MKTEXLSR=${MKTEXLSR} TEXMFDIR=${TEXMFDIR}
+PLIST_SUB=	MKTEXLSR=${MKTEXLSR} \
+		TEXMFDISTDIR=${TEXMFDISTDIR} \
+		TEXMFCONFIGDIR=${TEXMFCONFIGDIR} \
+		TEXMFDIR=${TEXMFDIR}
 CONFLICTS=	ja-ptex-base-[0-9]*
 .if !make(do-patch)
-WRKSRC=		${WRKDIR}/tetex-src-${VER_TETEX}/texk/web2c/ptex-${VER_PTEX}
+WRKSRC=		${WRKDIR}/${TETEX_SRC}/texk/web2c/ptex-${VER_PTEX}
 .else
-WRKSRC=		${WRKDIR}/tetex-src-${VER_TETEX}
+WRKSRC=		${WRKDIR}/${TETEX_SRC}
 .endif
 
-WRKSRC_TETEX=	${WRKDIR}/tetex-src-${VER_TETEX}
+WRKSRC_TETEX=	${WRKDIR}/${TETEX_SRC}
 WRKSRC_PTEX=	${WRKDIR}/ptex-src-${VER_PTEX}
 
-VER_TETEX=	2.0.2
+TETEX_SRC=	tetex-src-2.99.13.20050204-beta
 VER_PTEX=	${PORTVERSION}
-VER_PTEXTEXMF=	2.2
+VER_PTEXTEXMF=	2.3
 KANJICODE?=	euc
 TEXMFDIR?=	share/texmf
-TEXMFLOCAL?=	share/texmf-local
-TEXMFLOCAL_LSR?=${LOCALBASE}/${TEXMFLOCAL}/ls-R
-TEXMFCNF?=	${PREFIX}/${TEXMFDIR}/web2c/texmf.cnf
+TEXMFDISTDIR?=	share/texmf-dist
+TEXMFCONFIGDIR?=share/texmf-config
+TEXMFLOCALDIR?=	share/texmf-local
+TEXMFLOCAL_LSR?=${LOCALBASE}/${TEXMFLOCALDIR}/ls-R
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
 LIBPNG_PREFIX?=	${LOCALBASE}
 LIBWWW_PREFIX?=	${LOCALBASE}
@@ -73,7 +76,7 @@ LIBT1_PREFIX?=	${LOCALBASE}
 INSTDIRS=	doc fonts jbibtex ptex
 DOC_FILES=	COPYRIGHT COPYRIGHT.jis Changes.txt README.txt
 
-MAPDIR=		${PREFIX}/${TEXMFDIR}/dvips-ptex
+MAPDIR=		${PREFIX}/${TEXMFDIR}/dvips/ptex
 MAPFILES=	morisawa/morisawa.map jis/jis.map
 
 VFDIR=		${PREFIX}/${TEXMFDIR}/fonts/vf/ptex
@@ -151,9 +154,10 @@ pre-configure:
 			--with-t1lib-include=${LIBT1_PREFIX}/include \
 			--without-xdvik --without-oxdvik \
 			--without-dvipsk --without-odvipsk \
-			--without-x11 --without-dvipdfm --without-omega \
-			--without-pdftex --without-pdfetex \
-			--with-etex=no && \
+			--without-x11 --without-dvipdfm \
+			--without-pdftex --without-pdfetex --without-pdfxtex \
+			--without-omega --without-eomega
+			--without-etex && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET}
 
 post-install:
@@ -166,6 +170,8 @@ post-install:
 	${MKDIR} ${${D}DIR}
 	cd ${WRKDIR} && ${INSTALL_DATA} ${${D}FILES} ${${D}DIR}
 .endfor
+	${MKDIR} ${PREFIX}/${TEXMFCONFIGDIR}/texconfig
+	${CP} ${FILESDIR}/tcfmgr.map ${PREFIX}/${TEXMFCONFIGDIR}/texconfig
 	${MKTEXLSR}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/japanese/ptex-tetex/distinfo b/japanese/ptex-tetex/distinfo
index 07c5408fa2a1..48e39c755725 100644
--- a/japanese/ptex-tetex/distinfo
+++ b/japanese/ptex-tetex/distinfo
@@ -1,9 +1,9 @@
-MD5 (teTeX/ptex-src-3.1.5.tar.gz) = 540af0eb4e6e5eb942e14bef0f8c1e8b
-SIZE (teTeX/ptex-src-3.1.5.tar.gz) = 122201
-MD5 (teTeX/ptex-texmf-2.2.tar.gz) = 9171f289677684d97f28e95026e75426
-SIZE (teTeX/ptex-texmf-2.2.tar.gz) = 1866278
-MD5 (teTeX/tetex-src-2.0.2.tar.gz) = a16f6bba227d55e79aeee46fbbd82d28
-SIZE (teTeX/tetex-src-2.0.2.tar.gz) = 11745933
+MD5 (teTeX/ptex-src-3.1.8.tar.gz) = 6a31c299a018225c6ddaa8f7b0de2b1e
+SIZE (teTeX/ptex-src-3.1.8.tar.gz) = 132130
+MD5 (teTeX/ptex-texmf-2.3.tar.gz) = e47a49328a369781d94c40355047ffc6
+SIZE (teTeX/ptex-texmf-2.3.tar.gz) = 1866282
+MD5 (teTeX/tetex-src-2.99.13.20050204-beta.tar.gz) = f0578ba57b930a78c8ba80f85c247a69
+SIZE (teTeX/tetex-src-2.99.13.20050204-beta.tar.gz) = 12768217
 MD5 (teTeX/jis.tar.gz) = 12fc14c4ed0530eab018c867b383eedb
 SIZE (teTeX/jis.tar.gz) = 347201
 MD5 (teTeX/morisawa.tar.gz) = 10a3a0bb382d9edf834177d0c03101f5
diff --git a/japanese/ptex-tetex/files/patch-texk::kpathsea::Makefile.in b/japanese/ptex-tetex/files/patch-texk::kpathsea::Makefile.in
deleted file mode 100644
index d760947fb395..000000000000
--- a/japanese/ptex-tetex/files/patch-texk::kpathsea::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- texk/kpathsea/Makefile.in.orig	Sun Feb 16 02:21:42 2003
-+++ texk/kpathsea/Makefile.in	Fri Jun 11 20:45:58 2004
-@@ -126,7 +126,7 @@
- 	| sed 's/^\([^ 	=]*\)[ 	]*=*[ 	]*\(.*\)/#ifndef DEFAULT_\1%#define DEFAULT_\1 "\2"%#endif/' \
- 	| tr '%' '\012' \
- 	| sed -e 's%\$$TEXMFMAIN%$(texmf)%g' \
--	      -e 's%\$$TEXMF%$(texmf)%g' \
-+	      -e 's%\$$TEXMF\([,}/]\)%$(texmf)\1%g' \
- 	      -e 's%\$$VARTEXFONTS%$(vartexfonts)%g' \
- 	      -e 's%\$$web2cdir%$(web2cdir)%g' \
- 	      -e 's%\$$prefix%$(prefix)%g' \
diff --git a/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in b/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in
deleted file mode 100644
index 566c36462fe0..000000000000
--- a/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in
+++ /dev/null
@@ -1,106 +0,0 @@
---- texk/kpathsea/texmf.in.orig	Sat Feb 22 05:55:05 2003
-+++ texk/kpathsea/texmf.in	Fri Sep 17 14:23:28 2004
-@@ -62,7 +62,7 @@
- 
- % If defined, teTeX's texconfig stores modifications here (instead of the
- % TEXMFMAIN tree).
--%   VARTEXMF = @texmf@-var
-+VARTEXMF = @texmf@-var
- 
- % User texmf trees can be catered for like this...
- HOMETEXMF = $HOME/texmf
-@@ -74,7 +74,7 @@
- %   - list $VARTEXMF in the TEXMF definition;
- %   - make sure that $VARTEXMF precedes $TEXMFMAIN in the TEXMF definition.
- % TEXMF = $TEXMFMAIN
--TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}
-+TEXMF = {$HOMETEXMF,!!$VARTEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}
- 
- % The system trees.  These are the trees that are shared by all the users.
- SYSTEXMF = $TEXMF
-@@ -144,6 +144,13 @@
- TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}//
- TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}//
- 
-+% TeXfamily
-+TEXINPUTS.jtex = .:$TEXMF/{jtex,tex}/{plain,generic,}//
-+TEXINPUTS.jlatex = .:$TEXMF/{jtex,tex}/{latex,generic,}//
-+TEXINPUTS.jlatex209 = .:$TEXMF/{jtex,tex}/{latex209,generic,latex,}//
-+TEXINPUTS.multex = .:$TEXMF/{multex,jtex,tex}/{plain,generic,}//
-+TEXINPUTS.mullatex = .:$TEXMF/{multex,jtex,tex}/{latex,generic,}//
-+
- % Fontinst needs to read afm files.
- TEXINPUTS.fontinst = .;$TEXMF/tex//;$TEXMF/fonts/afm//
- 
-@@ -201,12 +208,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 ...
--TEXFORMATS = .;$TEXMF/web2c
--MFBASES = .;$TEXMF/web2c
--MPMEMS = .;$TEXMF/web2c
--TEXPOOL = .;$TEXMF/web2c
--MFPOOL = .;$TEXMF/web2c
--MPPOOL = .;$TEXMF/web2c
-+TEXFORMATS = .;$TEXMF/web2c{-ptex,}
-+MFBASES = .;$TEXMF/web2c{-ptex,}
-+MPMEMS = .;$TEXMF/web2c{-ptex,}
-+TEXPOOL = .;$TEXMF/web2c{-ptex,}
-+MFPOOL = .;$TEXMF/web2c{-ptex,}
-+MPPOOL = .;$TEXMF/web2c{-ptex,}
- 
- % Device-independent font metric files.
- VFFONTS = .;$TEXMF/fonts/vf//
-@@ -246,8 +253,8 @@
- MFTINPUTS = .;$TEXMF/mft//
- 
- % PostScript headers, prologues (.pro), encodings (.enc) and fonts.
--TEXPSHEADERS = .;$TEXMF/{dvips,pdftex,tex,fonts/type1}//
--TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,pdftex,tex,fonts/{type1,truetype}}//
-+TEXPSHEADERS = .;$TEXMF/{dvips{-ptex,},pdftex,tex,fonts/type1}//
-+TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips{-ptex,},pdftex,tex,fonts/{type1,truetype}}//
- 
- % PostScript Type 1 outline fonts.
- T1FONTS = .;$TEXMF/fonts/type1//
-@@ -262,10 +269,10 @@
- T42FONTS = .;$TEXMF/fonts/type42//
- 
- % Dvips' config.* files (this name should not start with `TEX'!).
--TEXCONFIG = $TEXMF/dvips//
-+TEXCONFIG = $TEXMF/dvips{-ptex,}//
- 
- % Makeindex style (.ist) files.
--INDEXSTYLE = .;$TEXMF/makeindex//
-+INDEXSTYLE = .;$TEXMF/makeindex{-ptex,}//
- 
- % Used by DMP (ditroff-to-mpx), called by makempx -troff.
- TRFONTS = /usr/lib/font/devpost
-@@ -302,8 +309,8 @@
- T4HTINPUTS   = .;$TEXMF/tex4ht//
- 
- % xdvik and dvipdfm can share some files with dvips
--XDVIINPUTS = .;$TEXMF/{xdvi,dvips}//
--DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}//
-+XDVIINPUTS = .;$TEXMF/{xdvi,dvips}{-ptex,}//
-+DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}{-ptex,}//
- 
- %% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
- % KPSE_DOT = .
-@@ -318,7 +325,7 @@
- %
- % For security reasons, it is better not to have . part of the path.
- % 
--TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};$TETEXDIR;$TEXMF/web2c;@web2c@
-+TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/{web2c-ptex,web2c}};$TETEXDIR;@web2c@;$TEXMF/web2c
- 
- 
- 
-@@ -483,3 +490,8 @@
- error_line = 79
- half_error_line = 50
- max_print_line = 79
-+
-+% default file code of JTeX and MuLTeX
-+% These override the code specified by TeX command in dumping (making format).
-+jtex_filetype = euc
-+%ml_input_code = junet
diff --git a/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in-teTeX b/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in-teTeX
new file mode 100644
index 000000000000..0f8464c2b080
--- /dev/null
+++ b/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in-teTeX
@@ -0,0 +1,94 @@
+--- 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 @@
+ % 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,}//
+-TEXINPUTS.platex  = .;$TEXMF/tex/{platex,latex,generic,}//
++%TEXINPUTS.platex  = .;$TEXMF/tex/{platex,latex,generic,}//
+ TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}//
+ TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}//
+ TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}//
+ 
++% TeXfamily
++TEXINPUTS.jtex = .:$TEXMF/{jtex,tex}/{plain,generic,}//
++TEXINPUTS.jlatex = .:$TEXMF/{jtex,tex}/{latex,generic,}//
++TEXINPUTS.jlatex209 = .:$TEXMF/{jtex,tex}/{latex209,generic,latex,}//
++TEXINPUTS.multex = .:$TEXMF/{multex,jtex,tex}/{plain,generic,}//
++TEXINPUTS.mullatex = .:$TEXMF/{multex,jtex,tex}/{latex,generic,}//
++
+ % Fontinst needs to read afm files.
+ TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}//
+ 
+@@ -232,12 +239,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 ...
+-TEXFORMATS = .;$TEXMF/web2c
+-MFBASES = .;$TEXMF/web2c
+-MPMEMS = .;$TEXMF/web2c
+-TEXPOOL = .;$TEXMF/web2c
+-MFPOOL = .;$TEXMF/web2c
+-MPPOOL = .;$TEXMF/web2c
++TEXFORMATS = .;$TEXMF/web2c{/ptex,}
++MFBASES = .;$TEXMF/web2c{/ptex,}
++MPMEMS = .;$TEXMF/web2c{/ptex,}
++TEXPOOL = .;$TEXMF/web2c{/ptex,}
++MFPOOL = .;$TEXMF/web2c{/ptex,}
++MPPOOL = .;$TEXMF/web2c{/ptex,}
+ 
+ % Device-independent font metric files.
+ VFFONTS = .;$TEXMF/fonts/vf//
+@@ -277,8 +284,8 @@
+ 
+ % PostScript headers and prologues (.pro); unfortunately, some programs
+ % also use this for acessing font files (enc, type1, truetype)
+-TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type3}}//
+-TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type3,truetype}}//
++TEXPSHEADERS = .;$TEXMF/{dvips{/ptex,},fonts/{enc,type1,type3}}//
++TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips{/ptex,},fonts/{enc,type1,type3,truetype}}//
+ 
+ % PostScript Type 1 outline fonts.
+ T1FONTS = .;$TEXMF/fonts/type1//
+@@ -296,10 +303,10 @@
+ LIGFONTS =  .;$TEXMF/fonts/lig//
+ 
+ % Dvips' config.* files (this name should not start with `TEX'!).
+-TEXCONFIG = $TEXMF/dvips//
++TEXCONFIG = $TEXMF/dvips{/ptex,}//
+ 
+ % Makeindex style (.ist) files.
+-INDEXSTYLE = .;$TEXMF/makeindex//
++INDEXSTYLE = .;$TEXMF/makeindex{/ptex,}//
+ 
+ % Font encoding files (.enc).
+ ENCFONTS = .;$TEXMF/fonts/enc//
+@@ -352,6 +359,10 @@
+ % search formats, you'll want to add their variables here as well.
+ T4HTINPUTS   = .;$TEXMF/tex4ht//
+ 
++% xdvik and dvipdfm can share some files with dvips (for old ones)
++XDVIINPUTS = .;$TEXMF/{xdvi,dvips}{/ptex,}//
++DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}{/ptex,}//
++
+ % Architecture independent executables
+ TEXMFSCRIPTS = $TEXMF/scripts//
+ 
+@@ -368,7 +379,7 @@
+ %
+ % For security reasons, it is better not to have . part of the path.
+ % 
+-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};$TETEXDIR;$TEXMF/web2c;@web2c@
++TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,,-dist}/web2c{/ptex,}};$TETEXDIR;$TEXMF/web2c;@web2c@
+ 
+ # $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 @@
+ error_line = 79
+ half_error_line = 50
+ max_print_line = 79
++
++% default file code of JTeX and MuLTeX
++% These override the code specified by TeX command in dumping (making format).
++jtex_filetype = euc
++%ml_input_code = junet
diff --git a/japanese/ptex-tetex/files/patch-texk::make::paths.mk b/japanese/ptex-tetex/files/patch-texk::make::paths.mk
index 1ad84123e814..d71fe60ca93c 100644
--- a/japanese/ptex-tetex/files/patch-texk::make::paths.mk
+++ b/japanese/ptex-tetex/files/patch-texk::make::paths.mk
@@ -1,11 +1,11 @@
---- texk/make/paths.mk.orig	Wed Nov 13 05:54:37 2002
-+++ texk/make/paths.mk	Fri Sep 17 13:22:23 2004
+--- texk/make/paths.mk.orig	Sat May  8 19:05:24 2004
++++ texk/make/paths.mk	Tue Jan 11 01:15:49 2005
 @@ -61,7 +61,7 @@
  dvilj_latex2e_macrodir = $(texinputdir)/latex/dvilj
  
  # mktex.cnf, texmf.cnf, etc.
 -web2cdir = $(texmf)/web2c
-+web2cdir = $(texmf)/web2c-ptex
++web2cdir = $(texmf)/web2c/ptex
  
  # The top-level font directory.
  fontdir = $(texmf)/fonts
@@ -14,7 +14,7 @@
  
  # For dvips configuration files, psfonts.map, etc.
 -dvipsdir = $(texmf)/dvips
-+dvipsdir = $(texmf)/dvips-ptex
++dvipsdir = $(texmf)/dvips/ptex
  
  # For dvips .pro files, gsftopk's render.ps, etc.
  psheaderdir = $(dvipsdir)
diff --git a/japanese/ptex-tetex/files/patch-texk::web2c::Makefile.in b/japanese/ptex-tetex/files/patch-texk::web2c::Makefile.in
index 105fde2969f9..729865d3642e 100644
--- a/japanese/ptex-tetex/files/patch-texk::web2c::Makefile.in
+++ b/japanese/ptex-tetex/files/patch-texk::web2c::Makefile.in
@@ -1,31 +1,51 @@
---- texk/web2c/Makefile.in.orig	Sat Feb 14 01:57:41 2004
-+++ texk/web2c/Makefile.in	Sat Feb 14 01:58:37 2004
-@@ -137,8 +137,8 @@
- @MFW@@MFN@mfn = mf-nowin
- programs = bibtex ctangle cweave dvicopy dvitomp dvitype $(etex) gftodvi \
- gftopk gftype $(mfn) $(mfw) mft mpost $(odvicopy) $(odvitype) $(omega) \
--$(otangle) patgen $(pdftex) $(pdfetex) $(pdftosrc) pktogf pktype pltotf \
--pooltype tangle $(tex) tftopl tie $(ttf2afm) vftovp vptovf weave
-+$(otangle) patgen $(pdftex) $(pdfetex) $(pdftosrc) pktogf pktype pltotf-ptex \
-+pooltype tangle $(tex) tftopl-ptex tie $(ttf2afm) vftovp vptovf weave
+--- texk/web2c/Makefile.in.orig	Tue Dec 21 04:33:02 2004
++++ texk/web2c/Makefile.in	Tue Jan 11 01:18:06 2005
+@@ -335,15 +335,15 @@
+ 	rm -f pktype.o pktype.c pktype.h pktype.p
+ 	rm -f tests/xcmr10.pktyp
  
- mpware = mpware/dmp mpware/makempx mpware/mpto mpware/newer
- mpware_sources = mpware/dmp.c mpware/makempx.in mpware/mpto.c mpware/newer.c
-@@ -207,7 +207,7 @@
- 	$(kpathsea_link) pktogf.o $(LOADLIBES)
- pktype: pktype.o
- 	$(kpathsea_link) pktype.o $(LOADLIBES)
 -pltotf: pltotf.o
 +pltotf-ptex: pltotf.o
  	$(kpathsea_link) pltotf.o $(LOADLIBES)
- pooltype: pooltype.o
- 	$(kpathsea_link) pooltype.o $(LOADLIBES)
-@@ -215,7 +215,7 @@
- 	$(kpathsea_link) $(tex_o) $(socketlibs) $(LOADLIBES)
- tie: tie.o
- 	$(kpathsea_link) tie.o $(LOADLIBES)
+ pltotf.c pltotf.h: $(web2c_common) $(web2c_programs) pltotf.p
+ 	$(web2c) pltotf
+ pltotf.p: tangle pltotf.web pltotf.ch
+ 	$(tangle) pltotf pltotf
+ check: pltotf-check
+-pltotf-check: pltotf
+-	./pltotf -verbose $(srcdir)/tests/cmr10 tests/xcmr10
++pltotf-check: pltotf-ptex
++	./pltotf-ptex -verbose $(srcdir)/tests/cmr10 tests/xcmr10
+ clean:: pltotf-clean
+ pltotf-clean:
+ 	$(LIBTOOL) --mode=clean rm -f pltotf
+@@ -375,15 +375,15 @@
+ 	$(LIBTOOL) --mode=clean rm -f tie
+ 	rm -f tie.o tie.c
+ 
 -tftopl: tftopl.o
 +tftopl-ptex: tftopl.o
  	$(kpathsea_link) tftopl.o $(LOADLIBES)
- vftovp: vftovp.o
- 	$(kpathsea_link) vftovp.o $(LOADLIBES)
+ tftopl.c tftopl.h: $(web2c_common) $(web2c_programs) tftopl.p
+ 	$(web2c) tftopl
+ tftopl.p: tangle tftopl.web tftopl.ch
+ 	$(tangle) tftopl tftopl
+ check: tftopl-check
+-tftopl-check: tftopl
+-	./tftopl -verbose $(srcdir)/tests/cmr10 tests/xcmr10
++tftopl-check: tftopl-ptex
++	./tftopl-ptex -verbose $(srcdir)/tests/cmr10 tests/xcmr10
+ clean:: tftopl-clean
+ tftopl-clean:
+ 	$(LIBTOOL) --mode=clean rm -f tftopl
+@@ -650,8 +650,8 @@
+ # 
+ # Common
+ programs = bibtex ctangle ctie cweave dvicopy dvitomp dvitype gftodvi gftopk \
+- gftype mft $(odvicopy) $(odvitype) $(otangle) patgen pktogf pktype pltotf \
+- pooltype tangle tftopl tie $(ttf2afm) vftovp vptovf weave
++ gftype mft $(odvicopy) $(odvitype) $(otangle) patgen pktogf pktype pltotf-ptex \
++ pooltype tangle tftopl-ptex tie $(ttf2afm) vftovp vptovf weave
+ engines = $(tex) $(etex) $(mf) $(mfn) $(mpost) \
+           $(omega) $(aleph) \
+           $(pdftex) $(pdfetex) $(pdfxtex)
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 086d6888fd53..5077e60c018c 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.5/Makefile.in.orig	Tue Jun 17 14:30:40 2003
-+++ texk/web2c/ptex-3.1.5/Makefile.in	Wed Sep 15 18:09:11 2004
+--- 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
 @@ -5,7 +5,7 @@
  
  default: programs formats
@@ -26,17 +26,17 @@
 +pltotf-ptex: pltotf.o $(plib_o) $(kpathsea) $(proglib)
  	$(kpathsea_link) pltotf.o $(plib_o) $(LOADLIBES)
  pltotf.o: pltotf.c kanji.h ptexhelp.h
- pltotf.c: pltotf.p $(web2c_aux)
-@@ -167,7 +167,7 @@
+ 	$(compile) -DKANJI_C=1 -c pltotf.c
+@@ -168,7 +168,7 @@
  texmf.cnf: $(kpathsea_dir)/texmf.cnf
  	$(SHELL) $(thisdir)/mkconf $(kpathsea_dir)/texmf.cnf > texmf.cnf
  
 -dumpenv = TEXMFCNF=$(thisdir) TEXMF=$(texmf)
-+dumpenv = TEXMFCNF=$(thisdir) TEXMF=\{${TEXMFDUMP},$(texmf),${TEXMFLOCAL}\}
++dumpenv = TEXMFCNF=$(thisdir) TEXMF=\{${TEXMFDUMP},${TEXMFDISTDIR},$(texmf),${TEXMFLOCALDIR}\}
  
  ptex-euc.fmt: ptex texmf.cnf
- 	$(dumpenv) $(MAKE) $(makeargs) files="--progname=ptex ptex.tex min10.tfm" prereq-check
-@@ -277,13 +277,13 @@
+ 	$(dumpenv) $(MAKE) progname=ptex files="ptex.tex min10.tfm" prereq-check
+@@ -271,13 +271,13 @@
  	-$(DIFF) $(DIFFFLAGS) $(tripdir)/trip.typ trip.typ
  
  # Ad hoc tests.
diff --git a/japanese/ptex-tetex/files/tcfmgr.map b/japanese/ptex-tetex/files/tcfmgr.map
new file mode 100644
index 000000000000..3a701c7817e4
--- /dev/null
+++ b/japanese/ptex-tetex/files/tcfmgr.map
@@ -0,0 +1,10 @@
+# $FreeBSD$
+# file			rel dir			search path		progname
+config			dvipdfm/ptex/config	other text files	dvipdfm
+config.ps		dvips/ptex/config	dvips config		-
+modes.mf		metafont/misc		.mf			-
+pdftexconfig.tex	tex/generic/config	.tex			-
+fmtutil.cnf		web2c			web2c files		-
+mktex.cnf		web2c			web2c files		-
+updmap.cfg		web2c/ptex		web2c files		-
+XDvi			xdvi/ptex		other text files	xdvi
diff --git a/japanese/ptex-tetex/pkg-descr b/japanese/ptex-tetex/pkg-descr
index 1a4c924f7e3c..4ad3aea0a0a0 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.0.2, which contains TeX, LaTeX2e, and
+This system depends on teTeX 2.99.13.20050204, 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-message b/japanese/ptex-tetex/pkg-message
index 9e3237e26f2f..369eea0f2d56 100644
--- a/japanese/ptex-tetex/pkg-message
+++ b/japanese/ptex-tetex/pkg-message
@@ -1,9 +1,9 @@
 === IMPORTANT NOTICE ===
 
  - The standard texmf.cnf for pTeX is installed into
-   texmf/web2c-ptex/texmf.cnf and this is used by default.
+   texmf/web2c/ptex/texmf.cnf and this is used by default.
    Do not edit it directly; instead put the file to
-   texmf-var/web2c-ptex/texmf.cnf and edit it if you want
+   texmf-local/web2c/ptex/texmf.cnf and edit it if you want
    to customize it.
 
  - Japanized versions of "pltotf" and "tftopl" are installed
diff --git a/japanese/ptex-tetex/pkg-plist b/japanese/ptex-tetex/pkg-plist
index f3a6740e7b97..d8c6185cab8e 100644
--- a/japanese/ptex-tetex/pkg-plist
+++ b/japanese/ptex-tetex/pkg-plist
@@ -1,23 +1,21 @@
 @comment $FreeBSD$
-bin/iniptex
 bin/jbibtex
 bin/pdvitype
 bin/platex
 bin/pltotf-ptex
 bin/ptex
 bin/tftopl-ptex
-bin/virptex
-%%TEXMFDIR%%/web2c-ptex/platex-euc.fmt
-%%TEXMFDIR%%/web2c-ptex/platex-jis.fmt
-%%TEXMFDIR%%/web2c-ptex/platex-sjis.fmt
-%%TEXMFDIR%%/web2c-ptex/platex.fmt
-%%TEXMFDIR%%/web2c-ptex/ptex-euc.fmt
-%%TEXMFDIR%%/web2c-ptex/ptex-jis.fmt
-%%TEXMFDIR%%/web2c-ptex/ptex-sjis.fmt
-%%TEXMFDIR%%/web2c-ptex/ptex.fmt
-%%TEXMFDIR%%/web2c-ptex/ptex.pool
-%%TEXMFDIR%%/web2c-ptex/texmf.cnf
-@dirrm %%TEXMFDIR%%/web2c-ptex
+%%TEXMFDIR%%/web2c/ptex/platex-euc.fmt
+%%TEXMFDIR%%/web2c/ptex/platex-jis.fmt
+%%TEXMFDIR%%/web2c/ptex/platex-sjis.fmt
+%%TEXMFDIR%%/web2c/ptex/platex.fmt
+%%TEXMFDIR%%/web2c/ptex/ptex-euc.fmt
+%%TEXMFDIR%%/web2c/ptex/ptex-jis.fmt
+%%TEXMFDIR%%/web2c/ptex/ptex-sjis.fmt
+%%TEXMFDIR%%/web2c/ptex/ptex.fmt
+%%TEXMFDIR%%/web2c/ptex/ptex.pool
+%%TEXMFDIR%%/web2c/ptex/texmf.cnf
+@dirrm %%TEXMFDIR%%/web2c/ptex
 %%TEXMFDIR%%/doc/jbibtex/doc-ascii/Makefile
 %%TEXMFDIR%%/doc/jbibtex/doc-ascii/README
 %%TEXMFDIR%%/doc/jbibtex/doc-ascii/README.1st
@@ -318,8 +316,10 @@ bin/virptex
 @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
+%%TEXMFDIR%%/dvips/ptex/jis.map
+%%TEXMFDIR%%/dvips/ptex/morisawa.map
+@unexec rmdir %D/%%TEXMFDIR%%/dvips/ptex 2> /dev/null || true
+%%TEXMFCONFIGDIR%%/texconfig/tcfmgr.map
+@dirrm %%TEXMFCONFIGDIR%%/texconfig
 @exec %%MKTEXLSR%%
 @unexec %%MKTEXLSR%%