Update TeXLive to TL2015.

- print/texlive-infra was renamed with print/texlive-tlmgr.
  Note that currently tlmgr(1) does not work because of
  lack of TLPDB.  This will be fixed.

- Lua libraries used in LuaTeX are separated into
  devel/tex-libtexlua and devel/texlibtexluajit.
  USE_TEX supports them via keywords "texlua" and "texluajit".

- libsynctex is currently installed by devel/tex-web2c.
  This will be separated into a single port.

- Add graphics/libpotrace and use installed libpotrace
  and libharfbuzz.

4 files changed, 97 insertions, 66 deletions

diff --git a/japanese/tex-ptex/Makefile b/japanese/tex-ptex/Makefile
index b92b2524f012..ba80ccbd5a50 100644
--- a/japanese/tex-ptex/Makefile
+++ b/japanese/tex-ptex/Makefile
@@ -1,32 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	ptex
-PORTVERSION=	3.5
+PORTVERSION=	3.6
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2014/
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	ja-tex-
-DISTNAME=	texlive-${DISTVERSION_TEXLIVE}-source
+DISTNAME=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}
 DIST_SUBDIR=	TeX
-EXTRACT_ONLY=	texlive-${DISTVERSION_TEXLIVE}-source${EXTRACT_SUFX}
+EXTRACT_ONLY=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	ASCII Japanese pTeX
 
 USES=		tar:xz gmake
 USE_TEX=	kpathsea web2c ptexenc texmf formats fmtutil
+USE_XORG=	pixman
+USE_GNOME=	cairo
+TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES=	\
-	build-aux \
-	libs/xpdf \
-	texk/web2c
+EXTRACT_FILES=	build-aux \
+		libs/xpdf \
+		texk/web2c
 EXTRACT_AFTER_ARGS_TEXMF= \
 	| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
-		--strip-components 1 --no-same-permission --no-same-owner \
-		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXLIVE=	20140525
-DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXLIVE}-texmf
+	    --strip-components 1 --no-same-permission --no-same-owner \
+	    ${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
+DISTVERSION_TEXLIVE_SOURCE=	20150521
+DISTVERSION_TEXLIVE_TEXMF=	20150523
+DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
 EXTRACT_FILES_TEXMF= \
 	texmf-dist/doc/ptex \
 	texmf-dist/doc/platex \
@@ -65,7 +68,8 @@ EXTRACT_FILES_TEXMF= \
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OBSDCOMPAT_INCLUDES=-I${WRKSRC}/../../libs/obsdcompat
-EXCLUDE_ENGINES= aleph etex luatex luajittex pdftex mf mf-nowin mp xetex tex
+EXCLUDE_ENGINES= aleph etex luatex luajittex pdftex mf mf-nowin mp xetex tex \
+		 synctex
 CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--enable-ptex \
 		--enable-eptex \
@@ -73,13 +77,12 @@ CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--enable-euptex \
 		--enable-web2c \
 		--enable-web-progs \
-		--with-system-kpathsea \
-		--with-kpathsea-includes=${LOCALBASE}/include \
-		--with-kpathsea-libdir=${LOCALBASE}/lib \
-		--with-system-ptexenc \
-		--with-ptexenc-includes=${LOCALBASE}/include \
-		--with-ptexenc-libdir=${LOCALBASE}/lib \
 		--with-system-zlib
+.for L in cairo gmp kpathsea libpng mpfr pixman ptexenc icu
+CONFIGURE_ARGS+=--with-system-$L \
+		--with-$L-include=${LOCALBASE}/include \
+		--with-$L-libdir=${LOCALBASE}/lib
+.endfor
 CFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 TEX_FORMATS=	ptex uptex
@@ -91,7 +94,7 @@ pre-configure:
 	done
 
 pre-install:
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE}-texmf${EXTRACT_SUFX} \
-		${EXTRACT_AFTER_ARGS_TEXMF}
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf${EXTRACT_SUFX} \
+	    ${EXTRACT_AFTER_ARGS_TEXMF}
 
 .include <bsd.port.mk>
diff --git a/japanese/tex-ptex/distinfo b/japanese/tex-ptex/distinfo
index 656ebc2679e3..bf8979f82957 100644
--- a/japanese/tex-ptex/distinfo
+++ b/japanese/tex-ptex/distinfo
@@ -1,4 +1,4 @@
-SHA256 (TeX/texlive-20140525-source.tar.xz) = 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be
-SIZE (TeX/texlive-20140525-source.tar.xz) = 41657688
-SHA256 (TeX/texlive-20140525-texmf.tar.xz) = e0227251c5aa23f8b88973c298cc80b03bd238c645f7f82a6ce888a06b295963
-SIZE (TeX/texlive-20140525-texmf.tar.xz) = 1742817996
+SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
+SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
+SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
diff --git a/japanese/tex-ptex/files/patch-Makefile.in b/japanese/tex-ptex/files/patch-Makefile.in
index 17ace739c3a3..a537115d05ab 100644
--- a/japanese/tex-ptex/files/patch-Makefile.in
+++ b/japanese/tex-ptex/files/patch-Makefile.in
@@ -1,44 +1,47 @@
---- Makefile.in.orig	2014-03-17 20:00:59.000000000 +0900
-+++ Makefile.in	2014-08-22 14:48:17.000000000 +0900
-@@ -85,6 +85,9 @@
- 	pdftosrc$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT) \
- 	txt2zlib$(EXEEXT) xetex$(EXEEXT) $(am__EXEEXT_6) \
- 	aleph$(EXEEXT)
-+inst_bin_PROGRAMS = etex$(EXEEXT) ptex$(EXEEXT) \
-+	$(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) \
-+	euptex$(EXEEXT)
- bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_7) \
- 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_8) \
- 	$(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \
-@@ -1973,7 +1976,7 @@
+--- Makefile.in.orig	2015-04-16 19:53:45 UTC
++++ Makefile.in
+@@ -99,6 +99,8 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EX
+ 	pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
+ 	luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \
+ 	xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT)
++inst_bin_PROGRAMS = ptex$(EXEEXT) $(am__EXEEXT_2) \
++	eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) euptex$(EXEEXT)
+ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
+ 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
+ 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
+@@ -2081,7 +2083,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
  AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
  AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
  version = $(WEB2CVERSION)
 -SUBDIRS = doc lib man web2c . window omegafonts otps
 +SUBDIRS = .
  proglib = lib/lib.a
- dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
- nodist_man_MANS = 
-@@ -2298,8 +2301,7 @@
+ EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
+ 	libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
+@@ -2431,9 +2433,7 @@ TRIPTRAP_CLEAN = $(am__append_9) $(am__a
  TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \
- 	$(am__append_30) $(am__append_36) $(am__append_42) \
- 	$(am__append_48) $(am__append_54)
+ 	$(am__append_42) $(am__append_48) $(am__append_54) \
+ 	$(am__append_60) $(am__append_66)
 -bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \
--	$(am__append_63) $(am__append_68)
+-	$(am__append_31) $(am__append_36) $(am__append_75) \
+-	$(am__append_80)
 +bin_links =
- install_exe_links = $(am__append_20) $(am__append_61) $(am__append_66)
- uninstall_exe_links = $(am__append_21) $(am__append_62) \
- 	$(am__append_67)
-@@ -4439,7 +4441,7 @@
- 	$(AM_V_at)$(RANLIB) libxetex.a
- install-binPROGRAMS: $(bin_PROGRAMS)
+ install_exe_links = $(am__append_20) $(am__append_29) $(am__append_34) \
+ 	$(am__append_73) $(am__append_78)
+ uninstall_exe_links = $(am__append_21) $(am__append_30) \
+@@ -4739,9 +4739,9 @@ synctexdir/libsynctex_la-synctex_parser_
+ 
+ libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(libsynctex_la_LINK)  $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
+-install-binPROGRAMS: $(bin_PROGRAMS)
++install-binPROGRAMS: $(inst_bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 -	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 +	@list='$(inst_bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
  	if test -n "$$list"; then \
  	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
  	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-@@ -4469,7 +4471,7 @@
+@@ -4771,7 +4771,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
  
  uninstall-binPROGRAMS:
  	@$(NORMAL_UNINSTALL)
@@ -47,7 +50,7 @@
  	files=`for p in $$list; do echo "$$p"; done | \
  	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
  	      -e 's/$$/$(EXEEXT)/' \
-@@ -13649,7 +13651,7 @@
+@@ -14447,7 +14447,7 @@ install-data: install-data-recursive
  uninstall: uninstall-recursive
  
  install-am: all-am
diff --git a/japanese/tex-ptex/pkg-plist b/japanese/tex-ptex/pkg-plist
index 5c93c8ed1629..dcc07579ef47 100644
--- a/japanese/tex-ptex/pkg-plist
+++ b/japanese/tex-ptex/pkg-plist
@@ -22,6 +22,8 @@ bin/uptftopl
 %%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/uotftest.tex
 %%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/upbrsgtest.tex
 %%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/upjis2004.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest1.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest2.tex
 %%TEXMFDISTDIR%%/doc/fonts/japanese-otf/COPYRIGHT
 %%TEXMFDISTDIR%%/doc/fonts/japanese-otf/fontmap.zip
 %%TEXMFDISTDIR%%/doc/fonts/japanese-otf/otf-script-gteb.diff
@@ -54,6 +56,7 @@ bin/uptftopl
 %%TEXMFDISTDIR%%/doc/platex/pxbase/README-pxbabel
 %%TEXMFDISTDIR%%/doc/platex/pxbase/README-pxcjkcat
 %%TEXMFDISTDIR%%/doc/platex/pxchfon/LICENSE
+%%TEXMFDISTDIR%%/doc/platex/pxchfon/README
 %%TEXMFDISTDIR%%/doc/platex/pxchfon/README-ja
 %%TEXMFDISTDIR%%/doc/platex/pxchfon/pxchfon.pdf
 %%TEXMFDISTDIR%%/doc/platex/pxchfon/pxchfon.tex
@@ -69,6 +72,7 @@ bin/uptftopl
 %%TEXMFDISTDIR%%/doc/platex/pxjahyper/pxjahyper.tex
 %%TEXMFDISTDIR%%/doc/platex/pxrubrica/LICENSE
 %%TEXMFDISTDIR%%/doc/platex/pxrubrica/README
+%%TEXMFDISTDIR%%/doc/platex/pxrubrica/README-ja
 %%TEXMFDISTDIR%%/doc/platex/pxrubrica/pxrubrica-en.pdf
 %%TEXMFDISTDIR%%/doc/platex/pxrubrica/pxrubrica-en.tex
 %%TEXMFDISTDIR%%/doc/platex/pxrubrica/pxrubrica.pdf
@@ -285,6 +289,16 @@ bin/uptftopl
 %%TEXMFDISTDIR%%/fonts/ofm/public/japanese-otf/otf-cjml-v.ofm
 %%TEXMFDISTDIR%%/fonts/ofm/public/japanese-otf/otf-cjmr-h.ofm
 %%TEXMFDISTDIR%%/fonts/ofm/public/japanese-otf/otf-cjmr-v.ofm
+%%TEXMFDISTDIR%%/fonts/ovp/public/japanese-otf-uptex/upphirakakuw3-h.ovp
+%%TEXMFDISTDIR%%/fonts/ovp/public/japanese-otf-uptex/upphirakakuw3-v.ovp
+%%TEXMFDISTDIR%%/fonts/ovp/public/japanese-otf-uptex/upphirakakuw6-h.ovp
+%%TEXMFDISTDIR%%/fonts/ovp/public/japanese-otf-uptex/upphirakakuw6-v.ovp
+%%TEXMFDISTDIR%%/fonts/ovp/public/japanese-otf-uptex/upphiramaruw4-h.ovp
+%%TEXMFDISTDIR%%/fonts/ovp/public/japanese-otf-uptex/upphiramaruw4-v.ovp
+%%TEXMFDISTDIR%%/fonts/ovp/public/japanese-otf-uptex/upphiraminw3-h.ovp
+%%TEXMFDISTDIR%%/fonts/ovp/public/japanese-otf-uptex/upphiraminw3-v.ovp
+%%TEXMFDISTDIR%%/fonts/ovp/public/japanese-otf-uptex/upphiraminw6-h.ovp
+%%TEXMFDISTDIR%%/fonts/ovp/public/japanese-otf-uptex/upphiraminw6-v.ovp
 %%TEXMFDISTDIR%%/fonts/ovp/public/japanese-otf-uptex/utfcgrk-h.ovp
 %%TEXMFDISTDIR%%/fonts/ovp/public/japanese-otf-uptex/utfcgrk-v.ovp
 %%TEXMFDISTDIR%%/fonts/ovp/public/japanese-otf-uptex/utfcgrl-h.ovp
@@ -859,6 +873,16 @@ bin/uptftopl
 %%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/upnmlminr-v.tfm
 %%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-h.tfm
 %%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-v.tfm
+%%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/upphirakakuw3-h.tfm
+%%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/upphirakakuw3-v.tfm
+%%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/upphirakakuw6-h.tfm
+%%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/upphirakakuw6-v.tfm
+%%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/upphiramaruw4-h.tfm
+%%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/upphiramaruw4-v.tfm
+%%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/upphiraminw3-h.tfm
+%%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/upphiraminw3-v.tfm
+%%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/upphiraminw6-h.tfm
+%%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/upphiraminw6-v.tfm
 %%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/uprubygothb-h.tfm
 %%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/uprubygothb-v.tfm
 %%TEXMFDISTDIR%%/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-h.tfm
@@ -2511,6 +2535,16 @@ bin/uptftopl
 %%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/upnmlminr-v.vf
 %%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/upnmlminrn-h.vf
 %%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/upnmlminrn-v.vf
+%%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/upphirakakuw3-h.vf
+%%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/upphirakakuw3-v.vf
+%%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/upphirakakuw6-h.vf
+%%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/upphirakakuw6-v.vf
+%%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/upphiramaruw4-h.vf
+%%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/upphiramaruw4-v.vf
+%%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/upphiraminw3-h.vf
+%%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/upphiraminw3-v.vf
+%%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/upphiraminw6-h.vf
+%%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/upphiraminw6-v.vf
 %%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/uprubygothb-h.vf
 %%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/uprubygothb-v.vf
 %%TEXMFDISTDIR%%/fonts/vf/public/japanese-otf-uptex/uprubygotheb-h.vf
@@ -3867,7 +3901,8 @@ bin/uptftopl
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl
-%%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.13.patch
+%%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.17.patch
+%%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/script/MakeSPList.pm
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/script/mkutf32list.pl
@@ -3876,9 +3911,12 @@ bin/uptftopl
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/script/sp_list_j.txt
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/script/sp_list_k.txt
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/script/sp_list_t.txt
+%%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/script/umkpkana.pl
+%%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/script/umkvpkana.pl
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/umakeotf
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/umakeotf_brsg
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/umakeotf_jis04
+%%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/umakeotf_prop
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf-uptex/umkjvf
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf/basepl/base-h.pl
 %%TEXMFDISTDIR%%/source/fonts/japanese-otf/basepl/base-v.pl
@@ -3952,19 +3990,6 @@ bin/uptftopl
 %%TEXMFDISTDIR%%/source/platex/jsclasses/okumacro.ins
 %%TEXMFDISTDIR%%/source/platex/jsclasses/okuverb.dtx
 %%TEXMFDISTDIR%%/source/platex/jsclasses/okuverb.ins
-%%TEXMFDISTDIR%%/source/platex/pxchfon/cfjar-b-l0j.vpl
-%%TEXMFDISTDIR%%/source/platex/pxchfon/cfjar-l-l0j.vpl
-%%TEXMFDISTDIR%%/source/platex/pxchfon/cfjar-r-l0j.vpl
-%%TEXMFDISTDIR%%/source/platex/pxchfon/cfjas-b-l0j.vpl
-%%TEXMFDISTDIR%%/source/platex/pxchfon/cfjas-r-l0j.vpl
-%%TEXMFDISTDIR%%/source/platex/pxchfon/cfjas-x-l0j.vpl
-%%TEXMFDISTDIR%%/source/platex/pxchfon/gen-cfja.bat
-%%TEXMFDISTDIR%%/source/platex/pxchfon/r-cfjar-b-l0j.pl
-%%TEXMFDISTDIR%%/source/platex/pxchfon/r-cfjar-l-l0j.pl
-%%TEXMFDISTDIR%%/source/platex/pxchfon/r-cfjar-r-l0j.pl
-%%TEXMFDISTDIR%%/source/platex/pxchfon/r-cfjas-b-l0j.pl
-%%TEXMFDISTDIR%%/source/platex/pxchfon/r-cfjas-r-l0j.pl
-%%TEXMFDISTDIR%%/source/platex/pxchfon/r-cfjas-x-l0j.pl
 %%TEXMFDISTDIR%%/source/platex/pxrubrica/pxrubrica.dtx
 %%TEXMFDISTDIR%%/source/platex/pxrubrica/pxrubrica.ins
 %%TEXMFDISTDIR%%/source/uplatex/base/ujclasses.dtx