Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Aug 2014 11:04:23 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r365637 - in head: Mk devel/tex-kpathsea devel/tex-kpathsea/files devel/tex-web2c japanese/tex-ptex japanese/tex-ptex/files print/cm-super print/tex-aleph print/tex-aleph/files print/te...
Message-ID:  <201408221104.s7MB4Ns4077451@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Fri Aug 22 11:04:23 2014
New Revision: 365637
URL: http://svnweb.freebsd.org/changeset/ports/365637
QAT: https://qat.redports.org/buildarchive/r365637/

Log:
  Update TeXLive to 2014.
  
  - Note that full support of configuration tools such as tlmgr and texconfig
    is not ready yet.
  
  - Most of dviware now supports libpaper to choose the default papersize.
    Use paperconfig(8) utility or print/papersize-default-* packages.
  
  - Some quite old macros of the age of latex209 have been removed, and
    there are user-visible/invisible incompatibilities.  Please send a report
    to freebsd-tex@FreeBSD.org or file a PR if you have trouble.

Added:
  head/print/tex-aleph/files/patch-man-Makefile.in   (contents, props changed)
  head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-data-dvipdfmx.cfg
     - copied, changed from r365444, head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-dvipdfmx-20120420-data-dvipdfmx.cfg
  head/print/tex-ptexenc/files/patch-Makefile.in   (contents, props changed)
  head/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in   (contents, props changed)
  head/print/texlive-base/files/patch-texk-chktex-Makefile.in
     - copied, changed from r365466, head/print/texlive-base/files/patch-utils-chktex-Makefile.in
  head/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FileFinder.cpp   (contents, props changed)
  head/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Font.cpp   (contents, props changed)
  head/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-FontEncoding.cpp   (contents, props changed)
  head/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.60-src-Message.cpp   (contents, props changed)
  head/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-Makefile.in   (contents, props changed)
  head/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-cff.cc   (contents, props changed)
  head/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.100-libefont-t1interp.cc   (contents, props changed)
  head/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in
     - copied, changed from r365466, head/print/texlive-base/files/patch-texk-tetex-Makefile.in
  head/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil-sys.sh
     - copied, changed from r365466, head/print/texlive-base/files/patch-texk-tetex-fmtutil-sys
  head/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf
     - copied, changed from r365466, head/print/texlive-base/files/patch-texk-tetex-fmtutil.cnf
  head/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.sh
     - copied, changed from r365466, head/print/texlive-base/files/patch-texk-tetex-fmtutil
  head/print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh
     - copied, changed from r365466, head/print/texlive-base/files/patch-texk-tetex-texconfig-sys
  head/print/texlive-base/files/patch-texk-texlive-tl_scripts-updmap-sys.sh
     - copied, changed from r365466, head/print/texlive-base/files/patch-texk-tetex-updmap-sys.sh
  head/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in
     - copied, changed from r365466, head/print/texlive-base/files/patch-texk-ttf2pk-Makefile.in
Deleted:
  head/japanese/tex-ptex/files/patch-web2c-Makefile.in
  head/print/tex-aleph/files/patch-web2c-Makefile.in
  head/print/tex-dvipdfmx/files/m4-cho-libs.m4
  head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-Makefile.in
  head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-config.h.in
  head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-configure
  head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-configure.ac
  head/print/tex-dvipdfmx/files/patch-texk-dvipdfmx-dvipdfmx-20120420-data-dvipdfmx.cfg
  head/print/tex-luatex/files/patch-web2c-Makefile.in
  head/print/texlive-base/files/patch-libc++
  head/print/texlive-base/files/patch-texk-bibtex8-Makefile.in
  head/print/texlive-base/files/patch-texk-bibtexu-Makefile.in
  head/print/texlive-base/files/patch-texk-lcdf-typetools-Makefile.in
  head/print/texlive-base/files/patch-texk-tetex-Makefile.in
  head/print/texlive-base/files/patch-texk-tetex-fmtutil
  head/print/texlive-base/files/patch-texk-tetex-fmtutil-sys
  head/print/texlive-base/files/patch-texk-tetex-fmtutil.cnf
  head/print/texlive-base/files/patch-texk-tetex-texconfig-sys
  head/print/texlive-base/files/patch-texk-tetex-updmap-sys.sh
  head/print/texlive-base/files/patch-texk-ttf2pk-Makefile.in
  head/print/texlive-base/files/patch-utils-chktex-Makefile.in
Modified:
  head/Mk/bsd.tex.mk
  head/devel/tex-kpathsea/Makefile
  head/devel/tex-kpathsea/distinfo
  head/devel/tex-kpathsea/files/patch-Makefile.in
  head/devel/tex-kpathsea/files/patch-texmf.cnf
  head/devel/tex-kpathsea/pkg-plist
  head/devel/tex-web2c/Makefile
  head/devel/tex-web2c/distinfo
  head/devel/tex-web2c/pkg-plist
  head/japanese/tex-ptex/Makefile
  head/japanese/tex-ptex/distinfo
  head/japanese/tex-ptex/files/patch-Makefile.in
  head/japanese/tex-ptex/pkg-plist
  head/print/cm-super/Makefile
  head/print/tex-aleph/Makefile
  head/print/tex-aleph/distinfo
  head/print/tex-aleph/files/patch-Makefile.in
  head/print/tex-aleph/pkg-plist
  head/print/tex-dvipdfmx/Makefile
  head/print/tex-dvipdfmx/distinfo
  head/print/tex-dvipdfmx/pkg-plist
  head/print/tex-dvipsk/Makefile
  head/print/tex-dvipsk/distinfo
  head/print/tex-dvipsk/files/patch-texk-dvipsk-configure
  head/print/tex-dvipsk/pkg-plist
  head/print/tex-formats/Makefile
  head/print/tex-jadetex/Makefile
  head/print/tex-jadetex/distinfo
  head/print/tex-jadetex/pkg-plist
  head/print/tex-luatex/Makefile
  head/print/tex-luatex/distinfo
  head/print/tex-luatex/files/patch-Makefile.in
  head/print/tex-luatex/pkg-plist
  head/print/tex-ptexenc/Makefile
  head/print/tex-ptexenc/distinfo
  head/print/tex-ptexenc/files/patch-ptexenc.c
  head/print/tex-ptexenc/pkg-plist
  head/print/tex-xdvik/Makefile
  head/print/tex-xdvik/distinfo
  head/print/tex-xdvik/files/patch-texk-xdvik-Makefile.in
  head/print/tex-xdvik/pkg-plist
  head/print/tex-xetex/Makefile
  head/print/tex-xetex/distinfo
  head/print/tex-xetex/files/patch-Makefile.in
  head/print/tex-xetex/pkg-plist
  head/print/tex-xmltex/Makefile
  head/print/tex-xmltex/distinfo
  head/print/tex-xmltex/pkg-plist
  head/print/texlive-base/Makefile
  head/print/texlive-base/distinfo
  head/print/texlive-base/pkg-plist
  head/print/texlive-docs/Makefile
  head/print/texlive-docs/distinfo
  head/print/texlive-docs/pkg-plist
  head/print/texlive-full/Makefile
  head/print/texlive-infra/Makefile
  head/print/texlive-infra/distinfo
  head/print/texlive-infra/pkg-plist
  head/print/texlive-texmf/Makefile
  head/print/texlive-texmf/distinfo
  head/print/texlive-texmf/pkg-plist

Modified: head/Mk/bsd.tex.mk
==============================================================================
--- head/Mk/bsd.tex.mk	Fri Aug 22 11:01:43 2014	(r365636)
+++ head/Mk/bsd.tex.mk	Fri Aug 22 11:04:23 2014	(r365637)
@@ -10,7 +10,7 @@ TEX_MAINTAINER=	hrs@FreeBSD.org
 # USE_TEX=	yes
 # imports variables only, and
 # USE_TEX=	full
-# means TeXLive dependency.
+# means full TeXLive dependency.
 #
 # The other valid keywords
 #
@@ -29,7 +29,7 @@ TEX_MAINTAINER=	hrs@FreeBSD.org
 #  gbklatex:	gbklatex
 #
 #  formats:	TeX, LaTeX, PDFTeX, AMSTeX, ConTeXT, CSLaTeX, EplainTeX,
-#		METAFONT, MLTeX, PDFTeX, TeXsis[*]
+#		CSplainTeX, METAFONT, MLTeX, PDFTeX, TeXsis
 #  tex:		TeX
 #  latex:	LaTeX
 #  pdftex:	PDFTeX
@@ -41,12 +41,12 @@ TEX_MAINTAINER=	hrs@FreeBSD.org
 #  xmltex:	XMLTeX
 #
 #  texhash:	directory search hash regeneration
-#  updmap:	font map regeneration[*]
-#  fmtutil:	format regeneration[*]
+#  updmap:	font map regeneration
+#  fmtutil:	format regeneration
 #
 # Examples:
 # USE_TEX=	latex:build
-# USE_TEX=	formats texlive
+# USE_TEX=	formats
 # USE_TEX=	latex:build dvipsk:build
 
 # default TeX distribution.  "texlive"
@@ -68,58 +68,24 @@ TEXHASHDIRS?=	${TEXMFDIR} ${TEXMFDISTDIR
 PLIST_SUB+=	$V="${$V}"
 .endfor
 
-CONFLICTS_TEXLIVE= \
-	texlive-[0-9]* tex-web2c-[0-9]* \
-	tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
-	tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
-CONFLICTS_TETEX= \
-	teTeX-[0-9]* *-teTeX-[0-9]* \
-	teTeX-*-[0-9]* *-teTeX-*-[0-9]* \
-	latex2e-[0-9]*
-
-# override the user configuration
 .if !empty(USE_TEX:tu:MTEXLIVE)
-TEX_DEFAULT=	texlive
-.endif
-
-.if !empty(TEX_DEFAULT:tu:MTETEX)
-CONFLICTS_INSTALL+=	${CONFLICTS_TEXLIVE}
-.elif !empty(TEX_DEFAULT:tu:MTEXLIVE)
-CONFLICTS_INSTALL+=	${CONFLICTS_TETEX}
-.else
-.error malformed TEX_DEFAULT: ${TEX_DEFAULT}
+IGNORE=		"texlive" must not be defined in USE_TEX 
 .endif
 
-_TEX_LABEL:=	${TEX_DEFAULT:tu:S/TEXLIVE/TEX/}
-
 _USE_TEX_TEXMF=		${LOCALBASE}/${TEXMFDISTDIR}/README:${PORTSDIR}/print/texlive-texmf
-
 _USE_TEX_BASE=		tlmgr:${PORTSDIR}/print/texlive-base
-
 _USE_TEX_GBKLATEX=	gbklatex:${PORTSDIR}/print/texlive-base
-
-_USE_TEX_DOCS=		${LOCALBASE}/${TEXMFDIR}/doc/texlive/texlive-en/README:${PORTSDIR}/print/texlive-docs
-
+_USE_TEX_DOCS=		${LOCALBASE}/${TEXMFDISTDIR}/doc/texlive/texlive-en/README:${PORTSDIR}/print/texlive-docs
 _USE_TEX_INFRA=		texlive-infra>=0:${PORTSDIR}/print/texlive-infra
-
 _USE_TEX_DVIPSK=	dvips:${PORTSDIR}/print/tex-dvipsk
-
 _USE_TEX_XDVIK=		xdvi:${PORTSDIR}/print/tex-xdvik
-
 _USE_TEX_DVIPDFMX=	dvipdfmx:${PORTSDIR}/print/tex-dvipdfmx
-
 _USE_TEX_TEX=		${_USE_TEX_FORMATS}
-
 _USE_TEX_LATEX=		${_USE_TEX_FORMATS}
-
 _USE_TEX_PDFTEX=	${_USE_TEX_FORMATS}
-
 _USE_TEX_JADETEX=	jadetex:${PORTSDIR}/print/tex-jadetex
-
 _USE_TEX_XMLTEX=	xmltex:${PORTSDIR}/print/tex-xmltex
-
 _USE_TEX_PTEX=		ptex:${PORTSDIR}/japanese/tex-ptex
-
 _USE_TEX_WEB2C=		weave:${PORTSDIR}/devel/tex-web2c
 _USE_TEX_KPATHSEA=	libkpathsea.so:${PORTSDIR}/devel/tex-kpathsea
 _USE_TEX_PTEXENC=	libptexenc.so:${PORTSDIR}/print/tex-ptexenc
@@ -128,13 +94,13 @@ _USE_TEX_ALEPH=		aleph:${PORTSDIR}/print
 _USE_TEX_LUATEX=	luatex:${PORTSDIR}/print/tex-luatex
 _USE_TEX_XETEX=		xetex:${PORTSDIR}/print/tex-xetex
 
-_USE_TEX_FULL=	texmf base web2c infra \
+_USE_TEX_FULLLIST=	texmf base web2c infra \
 		formats aleph xetex jadetex luatex xmltex ptex \
 		dvipsk dvipdfmx xdvik \
 		kpathsea:lib ptexenc:lib
 
 .if !empty(USE_TEX:tu:MFULL)
-USE_TEX:=	${_USE_${_TEX_LABEL}_FULL}
+USE_TEX:=	${USE_TEX:tu:NFULL} ${_USE_TEX_FULLLIST:tu}
 .endif
 
 .for _UU in ${USE_TEX:tu}
@@ -148,7 +114,7 @@ _C:=	BUILD RUN
 _C:=	${_U:C/.*://}
 . endif
 . for _CC in ${_C:tu}
-TEX_${_CC}_DEPENDS+=${_USE_${_TEX_LABEL}_${_UU:C/:.*$//}}
+TEX_${_CC}_DEPENDS+=${_USE_TEX_${_UU:C/:.*$//}}
 . endfor
 .endfor
 
@@ -196,50 +162,39 @@ post-install-script: do-texhash
 .if !empty(USE_TEX:Mfmtutil)
 .PHONY:	do-fmtutil
 . for F in ${TEX_FORMATS}
-do-fmtutil: do-fmtutil-$F post-install-$F
+do-fmtutil: post-install-$F do-fmtutil-$F
 do-fmtutil-$F:
-.if !defined(NO_STAGE)
-	@${ECHO_CMD} "@fmtutil ${TEX_FORMAT_${F:tu}_FILES:S@^@${LOCALBASE}/@}" >> ${TMPPLIST}
-.endif
-.if defined(NO_STAGE)
-	@${TEST} -n '${TEX_FORMAT_${F:tu}}'
-	@${TEST} -r ${LOCALBASE}/${FMTUTIL_CNF}
-	@exec < ${LOCALBASE}/${FMTUTIL_CNF} && \
-		${RM} ${LOCALBASE}/${FMTUTIL_CNF} && \
-		(${GREP} -v "\#$F\$$"; \
-			${PRINTF} "%s\t\#$F\n" ${TEX_FORMAT_${F:tu}}) \
-			> ${LOCALBASE}/${FMTUTIL_CNF}
-	@${PRINTF} "%s\t\#$F\n" ${TEX_FORMAT_${F:tu}} | \
+	${TEST} -n '${TEX_FORMAT_${F:tu}}'
+	${PRINTF} "%s\t#$F\n" ${TEX_FORMAT_${F:tu}} \
+	    > ${WRKDIR}/fmtutil.cnf
+	${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFVARDIR}/web2c \
+	    ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c
+	${LN} -f -s ${LOCALBASE}/${TEXMFDISTDIR}/web2c/texmf.cnf \
+	    ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/texmf.cnf
+	${LOCALBASE}/bin/mktexlsr ${TEXHASHDIRS:S,^,${STAGEDIR}${PREFIX}/,}
+	${CAT} ${WRKDIR}/fmtutil.cnf | \
 		while read format dum; do \
-		${SETENV} PATH=${PATH}:${LOCALBASE}/bin \
-			TEXMFMAIN=${LOCALBASE}/${TEXMFDIR} \
-			${LOCALBASE}/bin/fmtutil-sys --byfmt $$format; \
+		${SETENV} PATH=${PATH}:${STAGEDIR}${PREFIX}/bin:${LOCALBASE}/bin \
+		    TEXMFDIST=${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}:${LOCALBASE}/${TEXMFDISTDIR} \
+		    ${LOCALBASE}/bin/fmtutil-sys \
+			--byfmt $$format \
+			--fmtdir ${STAGEDIR}${PREFIX}/${TEXMFVARDIR}/web2c \
+			--cnffile ${WRKDIR}/fmtutil.cnf; \
 		done
-	@${LOCALBASE}/bin/mktexlsr ${TEXMFVARDIR:S,^,${PREFIX}/,}
-.endif
-	@${ECHO_CMD} "@exec exec < ${LOCALBASE}/${FMTUTIL_CNF} && " \
-		"${RM} ${LOCALBASE}/${FMTUTIL_CNF} && " \
-		"(${GREP} -v \"\#$F\$$\"; ${PRINTF} \"%%s\t\#$F\n\" " \
-		"${TEX_FORMAT_${F:tu}:S,",\\",g}) " \
-		"> ${LOCALBASE}/${FMTUTIL_CNF}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec exec < ${LOCALBASE}/${FMTUTIL_CNF} && " \
-		"${RM} ${LOCALBASE}/${FMTUTIL_CNF} && " \
-		"${GREP} -v \"\#$F\$$\" " \
-		"> ${LOCALBASE}/${FMTUTIL_CNF}" >> ${TMPPLIST}
-.if defined(NO_STAGE)
+	# XXX
+	#cd ${STAGEDIR}${PREFIX}/${TEXMFVARDIR}/web2c && \
+	#	${FIND} . -name "*.log" | ${XARGS} \
+	#	    ${REINPLACE_CMD:S/.bak/ ""/} "s,${STAGEDIR},,g"
+	${RM} ${TEXHASHDIRS:S,^,${STAGEDIR}${PREFIX}/,:S,$,/ls-R,} \
+	    ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/texmf.cnf
+	${RMDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c || ${TRUE}
 _PLIST_FILES+=	${TEX_FORMAT_${F:tu}_FILES}
 _PLIST_DIRSTRY+=${TEX_FORMAT_${F:tu}_DIRS}
-.endif
 _PLIST_FILES+=	${TEX_FORMAT_${F:tu}_BIN}
 . endfor
 post-install-script: do-fmtutil
-
 PLIST_FILES=	${_PLIST_FILES:O:u}
-PLIST_DIRSTRY=	${_PLIST_DIRSTRY:O:u} 
-.if defined(NO_STAGE)
-PLIST_DIRSTRY=	${TEXMFVARDIR}/web2c \
-		${TEXMFVARDIR}
-.endif
+PLIST_DIRSTRY=	${_PLIST_DIRSTRY:O:u} ${TEXMFVARDIR}/web2c
 .endif
 
 .if !empty(USE_TEX:Mupdmap)
@@ -288,7 +243,7 @@ post-install-amstex:
 	${LN} -fs pdftex ${STAGEDIR}${PREFIX}/bin/amstex
 
 TEX_FORMAT_CONTEXT?= \
-	"cont-en pdftex cont-usr.tex -8bit *cont-en.ini"
+	"cont-en pdftex cont-usr.tex -8bit *cont-en.mkii"
 # XXX
 #	"metafun mpost - metafun.mp"
 TEX_FORMAT_CONTEXT_FILES=	\
@@ -302,8 +257,8 @@ post-install-context:
 #	${LN} -sf mpost ${PREFIX}/bin/metafun
 
 TEX_FORMAT_CSLATEX?= \
-	"cslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini" \
-	"pdfcslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini"
+	"cslatex pdftex - -etex cslatex.ini" \
+	"pdfcslatex pdftex - -etex cslatex.ini"
 TEX_FORMAT_CSLATEX_FILES= \
 	${TEXMFVARDIR}/web2c/pdftex/cslatex.log \
 	${TEXMFVARDIR}/web2c/pdftex/cslatex.fmt \
@@ -318,6 +273,21 @@ post-install-cslatex:
 	${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/cslatex
 	${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/pdfcslatex
 
+TEX_FORMAT_CSPLAIN?= \
+	"csplain pdftex - -etex -enc csplain-utf8.ini" \
+	"pdfcsplain pdftex - -etex -enc csplain-utf8.ini"
+TEX_FORMAT_CSPLAIN_FILES= \
+	${TEXMFVARDIR}/web2c/pdftex/csplain.log \
+	${TEXMFVARDIR}/web2c/pdftex/csplain.fmt \
+	${TEXMFVARDIR}/web2c/pdftex/pdfcsplain.log \
+	${TEXMFVARDIR}/web2c/pdftex/pdfcsplain.fmt
+TEX_FORMAT_CSPLAIN_BIN= \
+	bin/csplain
+TEX_FORMAT_CSPLAIN_DIRS= \
+	${TEXMFVARDIR}/web2c/pdftex
+post-install-csplain:
+	${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/csplain
+
 TEX_FORMAT_EPLAIN?= \
 	"eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini"
 TEX_FORMAT_EPLAIN_FILES= \
@@ -368,7 +338,10 @@ TEX_FORMAT_LUATEX?= \
 	"luatex luatex language.def,language.dat.lua luatex.ini" \
 	"dviluatex luatex language.def,language.dat.lua dviluatex.ini" \
 	"dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini" \
-	"lualatex luatex language.dat,language.dat.lua lualatex.ini"
+	"lualatex luatex language.dat,language.dat.lua lualatex.ini" \
+	"luajittex luajittex language.def,language.dat.lua luatex.ini" \
+	"pdfcsplain luatex - -etex csplain.ini" \
+	"lualollipop luatex - lualollipop.in"
 TEX_FORMAT_LUATEX_FILES= \
 	${TEXMFVARDIR}/web2c/luatex/dviluatex.log \
 	${TEXMFVARDIR}/web2c/luatex/dviluatex.fmt \
@@ -377,17 +350,46 @@ TEX_FORMAT_LUATEX_FILES= \
 	${TEXMFVARDIR}/web2c/luatex/luatex.log \
 	${TEXMFVARDIR}/web2c/luatex/luatex.fmt \
 	${TEXMFVARDIR}/web2c/luatex/lualatex.log \
-	${TEXMFVARDIR}/web2c/luatex/lualatex.fmt
+	${TEXMFVARDIR}/web2c/luatex/lualatex.fmt \
+	${TEXMFVARDIR}/web2c/luatex/pdfcsplain.log \
+	${TEXMFVARDIR}/web2c/luatex/pdfcsplain.fmt \
+	${TEXMFVARDIR}/web2c/luajittex/luajittex.log \
+	${TEXMFVARDIR}/web2c/luajittex/luajittex.fmt
 TEX_FORMAT_LUATEX_BIN= \
 	bin/dviluatex \
 	bin/dvilualatex \
-	bin/lualatex
+	bin/luajittex \
+	bin/lualatex \
+	bin/lualollipop \
+	bin/luatex \
+	bin/texlua \
+	bin/texluac \
+	bin/texluajit \
+	bin/texluajitc
 TEX_FORMAT_LUATEX_DIRS=	\
-	${TEXMFVARDIR}/web2c/luatex
+	${TEXMFVARDIR}/web2c/luatex \
+	${TEXMFVARDIR}/web2c/luajittex
 post-install-luatex:
 	${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/dviluatex
 	${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/dvilualatex
 	${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/lualatex
+	${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/lualollipop
+	${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/texlua
+	${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/texluac
+	${LN} -sf luajittex ${STAGEDIR}${PREFIX}/bin/texluajit
+	${LN} -sf luajittex ${STAGEDIR}${PREFIX}/bin/texluajitc
+
+TEX_FORMAT_LOLLIPOP?= \
+	"lollipop pdftex - -translate-file=cp227.tcx *lollipop.ini"
+TEX_FORMAT_LOLLIPOP_FILES= \
+	${TEXMFVARDIR}/web2c/pdftex/lollipop.log \
+	${TEXMFVARDIR}/web2c/pdftex/lollipop.fmt
+TEX_FORMAT_LOLLIPOP_BIN= \
+	bin/lollipop
+TEX_FORMAT_LOLLIPOP_DIRS= \
+	${TEXMFVARDIR}/web2c/pdftex
+post-install-lollipop-bin:
+	${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/lollipop
 
 TEX_FORMAT_METAFONT?= \
 	"mf mf-nowin - -translate-file=cp227.tcx mf.ini"
@@ -478,6 +480,8 @@ TEX_FORMAT_PTEX_FILES= \
 	${TEXMFVARDIR}/web2c/eptex/platex.log \
 	${TEXMFVARDIR}/web2c/eptex/platex.fmt
 TEX_FORMAT_PTEX_BIN= \
+	bin/eptex \
+	bin/ptex \
 	bin/platex
 TEX_FORMAT_PTEX_DIRS= \
 	${TEXMFVARDIR}/web2c/ptex \
@@ -519,6 +523,8 @@ TEX_FORMAT_UPTEX_FILES=	\
 	${TEXMFVARDIR}/web2c/euptex/uplatex.log \
 	${TEXMFVARDIR}/web2c/euptex/uplatex.fmt
 TEX_FORMAT_UPTEX_BIN= \
+	bin/euptex \
+	bin/uptex \
 	bin/uplatex
 TEX_FORMAT_UPTEX_DIRS=	\
 	${TEXMFVARDIR}/web2c/euptex \
@@ -529,20 +535,29 @@ post-install-uptex:
 TEX_FORMAT_XETEX?= \
 	"xetex xetex language.def -etex xetex.ini" \
 	"xelatex xetex language.dat -etex xelatex.ini" \
-	"cont-en xetex cont-usr.tex -8bit *cont-en.ini"
+	"pdfcsplain xetex - -etex csplain.ini" \
+	"cont-en xetex cont-usr.tex -8bit *cont-en.mkii" \
+	"xelollipop xetex - -etex xelollipop.ini"
 TEX_FORMAT_XETEX_FILES=	\
+	${TEXMFVARDIR}/web2c/xetex/cont-en.log \
+	${TEXMFVARDIR}/web2c/xetex/cont-en.fmt \
+	${TEXMFVARDIR}/web2c/xetex/pdfcsplain.log \
+	${TEXMFVARDIR}/web2c/xetex/pdfcsplain.fmt \
 	${TEXMFVARDIR}/web2c/xetex/xetex.log \
 	${TEXMFVARDIR}/web2c/xetex/xetex.fmt \
 	${TEXMFVARDIR}/web2c/xetex/xelatex.log \
 	${TEXMFVARDIR}/web2c/xetex/xelatex.fmt \
-	${TEXMFVARDIR}/web2c/xetex/cont-en.log \
-	${TEXMFVARDIR}/web2c/xetex/cont-en.fmt
+	${TEXMFVARDIR}/web2c/xetex/xelollipop.log \
+	${TEXMFVARDIR}/web2c/xetex/xelollipop.fmt
 TEX_FORMAT_XETEX_BIN=	\
-	bin/xelatex
+	bin/xetex \
+	bin/xelatex \
+	bin/xelollipop
 TEX_FORMAT_XETEX_DIRS=	\
 	${TEXMFVARDIR}/web2c/xetex
 post-install-xetex:
 	${LN} -sf xetex ${STAGEDIR}${PREFIX}/bin/xelatex
+	${LN} -sf xetex ${STAGEDIR}${PREFIX}/bin/xelollipop
 
 TEX_FORMAT_XMLTEX?= \
 	"xmltex pdftex language.dat *xmltex.ini" \

Modified: head/devel/tex-kpathsea/Makefile
==============================================================================
--- head/devel/tex-kpathsea/Makefile	Fri Aug 22 11:01:43 2014	(r365636)
+++ head/devel/tex-kpathsea/Makefile	Fri Aug 22 11:04:23 2014	(r365637)
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	kpathsea
-PORTVERSION=	6.1.0
-PORTREVISION=	3
+PORTVERSION=	6.2.0
 CATEGORIES=	devel
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2014/
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-20120701-source
+DISTNAME=	texlive-20140525-source
 DIST_SUBDIR=	TeX
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -14,7 +13,7 @@ COMMENT=	Path searching library for TeX
 
 USES=		gmake tar:xz libtool
 USE_LDCONFIG=	yes
-USE_TEX=	texlive
+USE_TEX=	yes
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES}
 EXTRACT_FILES=	${DISTNAME}/build-aux \
 		${DISTNAME}/texk/kpathsea

Modified: head/devel/tex-kpathsea/distinfo
==============================================================================
--- head/devel/tex-kpathsea/distinfo	Fri Aug 22 11:01:43 2014	(r365636)
+++ head/devel/tex-kpathsea/distinfo	Fri Aug 22 11:04:23 2014	(r365637)
@@ -1,2 +1,2 @@
-SHA256 (TeX/texlive-20120701-source.tar.xz) = 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81
-SIZE (TeX/texlive-20120701-source.tar.xz) = 131904044
+SHA256 (TeX/texlive-20140525-source.tar.xz) = 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be
+SIZE (TeX/texlive-20140525-source.tar.xz) = 41657688

Modified: head/devel/tex-kpathsea/files/patch-Makefile.in
==============================================================================
--- head/devel/tex-kpathsea/files/patch-Makefile.in	Fri Aug 22 11:01:43 2014	(r365636)
+++ head/devel/tex-kpathsea/files/patch-Makefile.in	Fri Aug 22 11:04:23 2014	(r365637)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2012-05-16 16:44:41.000000000 +0900
-+++ Makefile.in	2013-05-22 15:09:13.000000000 +0900
-@@ -127,7 +127,7 @@
+--- Makefile.in.orig	2014-05-21 08:10:30.000000000 +0900
++++ Makefile.in	2014-08-20 22:10:45.000000000 +0900
+@@ -175,7 +175,7 @@
           $(am__cd) "$$dir" && rm -f $$files; }; \
    }
  am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
@@ -9,7 +9,7 @@
  	"$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"
  LTLIBRARIES = $(lib_LTLIBRARIES)
  libkpathsea_la_DEPENDENCIES = $(LTLIBOBJS)
-@@ -1749,7 +1749,7 @@
+@@ -2044,7 +2044,7 @@
  
  installdirs: installdirs-recursive
  installdirs-am:
@@ -18,12 +18,29 @@
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: $(BUILT_SOURCES)
-@@ -1809,7 +1809,7 @@
+@@ -2108,8 +2108,7 @@
  
  info-am:
  
--install-data-am: install-dist_web2cDATA install-dist_web2cSCRIPTS \
-+install-data-am: installdirs-am \
- 	install-kpseincludeHEADERS install-nodist_kpseincludeHEADERS
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+-install-data-am: install-data-local install-dist_web2cDATA \
+-	install-dist_web2cSCRIPTS install-kpseincludeHEADERS \
++install-data-am: install-data-local install-kpseincludeHEADERS \
+ 	install-nodist_kpseincludeHEADERS
+ 
+ install-dvi: install-dvi-recursive
+@@ -2256,13 +2255,13 @@
+ uninstall-local:
+ @WIN32_FALSE@	@for f in $(dist_noinst_SCRIPTS); do \
+ @WIN32_FALSE@	  if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \
+-@WIN32_FALSE@	    echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
++@WIN32_FALSE@	    echo " rm ­f '$(DESTDIR)$(bindir)/$$f'"; \
+ @WIN32_FALSE@	    rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ @WIN32_FALSE@	  else :; fi; \
+ @WIN32_FALSE@	done
+ 	@for f in $(dist_noinst_DATA); do \
+ 	  if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1; then \
+-	    echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \
++	    echo " rm ­f '$(DESTDIR)$(web2cdir)/$$f'"; \
+ 	    rm -f "$(DESTDIR)$(web2cdir)/$$f"; \
+ 	  else :; fi; \
+ 	done

Modified: head/devel/tex-kpathsea/files/patch-texmf.cnf
==============================================================================
--- head/devel/tex-kpathsea/files/patch-texmf.cnf	Fri Aug 22 11:01:43 2014	(r365636)
+++ head/devel/tex-kpathsea/files/patch-texmf.cnf	Fri Aug 22 11:04:23 2014	(r365637)
@@ -1,5 +1,5 @@
---- texmf.cnf.orig	2012-05-13 08:34:52.000000000 +0900
-+++ texmf.cnf	2013-03-03 03:22:42.000000000 +0900
+--- texmf.cnf.orig	2014-04-23 06:07:54.000000000 +0900
++++ texmf.cnf	2014-08-20 21:50:36.000000000 +0900
 @@ -51,7 +51,7 @@
  % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
  % Kpathsea sets SELFAUTOLOC (the directory with the binary),
@@ -7,19 +7,19 @@
 -TEXMFROOT = $SELFAUTOPARENT
 +TEXMFROOT = $SELFAUTODIR/share
  
- % The tree containing runtime files related to the specific
- % distribution and version.
-@@ -61,7 +61,7 @@
+ % The main tree of distributed packages and programs:
  TEXMFDIST = $TEXMFROOT/texmf-dist
+@@ -61,7 +61,7 @@
+ TEXMFMAIN = $TEXMFDIST
  
  % Local additions to the distribution trees.
--TEXMFLOCAL = $TEXMFROOT/../texmf-local
+-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local
 +TEXMFLOCAL = $TEXMFROOT/texmf-local
  
  % TEXMFSYSVAR, where *-sys store cached runtime data.
  TEXMFSYSVAR = $TEXMFROOT/texmf-var
-@@ -698,7 +698,7 @@
- pool_size = 3250000
+@@ -713,7 +713,7 @@
+ pool_size = 6250000
  % Minimum pool space after TeX's own strings; must be at least
  % 25000 less than pool_size, but doesn't need to be nearly that large.
 -string_vacancies = 90000
@@ -27,7 +27,7 @@
  % Maximum number of strings.
  max_strings = 500000
  % min pool space left after loading .fmt
-@@ -708,7 +708,7 @@
+@@ -723,7 +723,7 @@
  % expansion works by writing material into the buffer and reparsing the
  % line.  As a consequence, certain constructs require the buffer to be
  % very large, even though most documents can be handled with a small value.
@@ -36,7 +36,7 @@
  
  % Hyphenation trie.  The maximum possible is 4194303 (ssup_trie_size in
  % the sources), but we don't need that much.  The value here suffices
-@@ -719,7 +719,7 @@
+@@ -734,7 +734,7 @@
  
  hyph_size = 8191        % prime number of hyphenation exceptions, >610, <32767.
                          % http://primes.utm.edu/curios/page.php/8191.html

Modified: head/devel/tex-kpathsea/pkg-plist
==============================================================================
--- head/devel/tex-kpathsea/pkg-plist	Fri Aug 22 11:01:43 2014	(r365636)
+++ head/devel/tex-kpathsea/pkg-plist	Fri Aug 22 11:04:23 2014	(r365637)
@@ -41,6 +41,7 @@ include/kpathsea/pathsearch.h
 include/kpathsea/proginit.h
 include/kpathsea/progname.h
 include/kpathsea/readable.h
+include/kpathsea/simpletypes.h
 include/kpathsea/str-list.h
 include/kpathsea/str-llist.h
 include/kpathsea/systypes.h
@@ -65,7 +66,7 @@ man/man1/texhash.1.gz
 lib/libkpathsea.a
 lib/libkpathsea.so
 lib/libkpathsea.so.6
-lib/libkpathsea.so.6.1.0
-%%TEXMFDIR%%/web2c/texmf.cnf
-@dirrmtry %%TEXMFDIR%%/web2c
-@dirrmtry %%TEXMFDIR%%
+lib/libkpathsea.so.6.2.0
+%%TEXMFDISTDIR%%/web2c/texmf.cnf
+@dirrmtry %%TEXMFDISTDIR%%/web2c
+@dirrmtry %%TEXMFDISTDIR%%

Modified: head/devel/tex-web2c/Makefile
==============================================================================
--- head/devel/tex-web2c/Makefile	Fri Aug 22 11:01:43 2014	(r365636)
+++ head/devel/tex-web2c/Makefile	Fri Aug 22 11:04:23 2014	(r365637)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	web2c
-PORTVERSION=	20120701
-PORTREVISION=	3
+PORTVERSION=	20140525
 CATEGORIES=	devel
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2014/
 PKGNAMEPREFIX=	tex-
 DISTNAME=	texlive-${PORTVERSION}-source
 DIST_SUBDIR=	TeX
@@ -16,17 +15,20 @@ LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/
 		libpng15.so:${PORTSDIR}/graphics/png \
 		libzzip.so:${PORTSDIR}/devel/zziplib
 
-USE_TEX=	texlive kpathsea
+USE_TEX=	kpathsea
+USE_XORG=	pixman
 USES=		pkgconfig gmake tar:xz
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES}
 EXTRACT_FILES=	${DISTNAME}/build-aux \
-		${DISTNAME}/libs/obsdcompat \
 		${DISTNAME}/libs/xpdf \
+		${DISTNAME}/libs/cairo \
+		${DISTNAME}/libs/pixman \
 		${DISTNAME}/texk/web2c
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OBSDCOMPAT_INCLUDES=-I${WRKSRC}/../../libs/obsdcompat
-CONFIGURE_ARGS= --disable-luatex \
+CONFIGURE_ARGS=	--disable-luatex \
+		--disable-luajittex \
 		--disable-xetex \
 		--disable-aleph \
 		--disable-ptex \
@@ -44,6 +46,7 @@ CONFIGURE_ARGS= --disable-luatex \
 		--with-system-libpng \
 		--with-libpng-includes=${LOCALBASE}/include \
 		--with-libpng-libdir=${LOCALBASE}/lib \
+		--with-system-pixman \
 		--with-system-zlib \
 		--with-system-zziplib
 CFLAGS+=	-I${LOCALBASE}/include
@@ -51,7 +54,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 INFO=	web2c
 
 pre-configure:
-	for D in libs/obsdcompat libs/xpdf; do \
+	for D in libs/xpdf libs/cairo; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
 	done

Modified: head/devel/tex-web2c/distinfo
==============================================================================
--- head/devel/tex-web2c/distinfo	Fri Aug 22 11:01:43 2014	(r365636)
+++ head/devel/tex-web2c/distinfo	Fri Aug 22 11:04:23 2014	(r365637)
@@ -1,2 +1,2 @@
-SHA256 (TeX/texlive-20120701-source.tar.xz) = 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81
-SIZE (TeX/texlive-20120701-source.tar.xz) = 131904044
+SHA256 (TeX/texlive-20140525-source.tar.xz) = 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be
+SIZE (TeX/texlive-20140525-source.tar.xz) = 41657688

Modified: head/devel/tex-web2c/pkg-plist
==============================================================================
--- head/devel/tex-web2c/pkg-plist	Fri Aug 22 11:01:43 2014	(r365636)
+++ head/devel/tex-web2c/pkg-plist	Fri Aug 22 11:04:23 2014	(r365637)
@@ -40,7 +40,6 @@ man/man1/cweb.1.gz
 man/man1/dvicopy.1.gz
 man/man1/dvitomp.1.gz
 man/man1/dvitype.1.gz
-man/man1/eplain.1.gz
 man/man1/gftodvi.1.gz
 man/man1/gftopk.1.gz
 man/man1/gftype.1.gz

Modified: head/japanese/tex-ptex/Makefile
==============================================================================
--- head/japanese/tex-ptex/Makefile	Fri Aug 22 11:01:43 2014	(r365636)
+++ head/japanese/tex-ptex/Makefile	Fri Aug 22 11:04:23 2014	(r365637)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	ptex
-PORTVERSION=	3.3
-PORTREVISION=	5
+PORTVERSION=	3.5
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2014/
 PKGNAMEPREFIX=	ja-tex-
 DISTNAME=	texlive-${DISTVERSION_TEXLIVE}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -12,22 +11,21 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 DIST_SUBDIR=	TeX
 EXTRACT_ONLY=	texlive-${DISTVERSION_TEXLIVE}-source${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	ASCII Japanese pTeX
 
 USES=		tar:xz gmake
-USE_TEX=	texlive kpathsea web2c ptexenc texmf formats fmtutil
+USE_TEX=	kpathsea web2c ptexenc texmf formats fmtutil
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
 EXTRACT_FILES=	\
 	build-aux \
-	libs/obsdcompat \
 	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=	20120701
+DISTVERSION_TEXLIVE=	20140525
 DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXLIVE}-texmf
 EXTRACT_FILES_TEXMF= \
 	texmf-dist/doc/ptex \
@@ -60,22 +58,19 @@ EXTRACT_FILES_TEXMF= \
 	texmf-dist/tex/uplatex \
 	texmf-dist/tex/generic/hyph-utf8/patterns/ptex \
 	texmf-dist/fonts/map/dvipdfmx/ptex \
-	texmf-dist/fonts/map/dvipdfmx/uptex \
-	texmf-dist/fonts/map/dvipdfmx/japanese-otf-uptex \
 	texmf-dist/fonts/map/dvipdfmx/japanese-otf \
 	texmf-dist/fonts/map/dvipdfmx/jfontmaps \
-	texmf/fonts/map/dvipdfmx/updmap/kanjix.map \
+	texmf-dist/fonts/map/dvipdfmx/updmap/kanjix.map \
 	texmf-dist/fonts/cmap/uptex
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OBSDCOMPAT_INCLUDES=-I${WRKSRC}/../../libs/obsdcompat
-EXCLUDE_ENGINES= aleph etex luatex pdftex mf mf-nowin xetex
+EXCLUDE_ENGINES= aleph etex luatex luajittex pdftex mf mf-nowin mp xetex tex
 CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--enable-ptex \
 		--enable-eptex \
 		--enable-uptex \
 		--enable-euptex \
-		--disable-mp \
 		--enable-web2c \
 		--enable-web-progs \
 		--with-system-kpathsea \
@@ -90,7 +85,7 @@ MAKE_JOBS_UNSAFE=	yes
 TEX_FORMATS=	ptex uptex
 
 pre-configure:
-	for D in libs/obsdcompat libs/xpdf; do \
+	for D in libs/xpdf; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
 	done

Modified: head/japanese/tex-ptex/distinfo
==============================================================================
--- head/japanese/tex-ptex/distinfo	Fri Aug 22 11:01:43 2014	(r365636)
+++ head/japanese/tex-ptex/distinfo	Fri Aug 22 11:04:23 2014	(r365637)
@@ -1,4 +1,4 @@
-SHA256 (TeX/texlive-20120701-source.tar.xz) = 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81
-SIZE (TeX/texlive-20120701-source.tar.xz) = 131904044
-SHA256 (TeX/texlive-20120701-texmf.tar.xz) = 987bdd2d4844e2791b185a132e18611e5b97d7747f08099042d0de33d36bc1ba
-SIZE (TeX/texlive-20120701-texmf.tar.xz) = 1428125120
+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

Modified: head/japanese/tex-ptex/files/patch-Makefile.in
==============================================================================
--- head/japanese/tex-ptex/files/patch-Makefile.in	Fri Aug 22 11:01:43 2014	(r365636)
+++ head/japanese/tex-ptex/files/patch-Makefile.in	Fri Aug 22 11:04:23 2014	(r365637)
@@ -1,15 +1,16 @@
---- Makefile.in.orig	2012-05-21 16:59:29.000000000 +0900
-+++ Makefile.in	2013-05-06 07:14:34.000000000 +0900
-@@ -57,6 +57,8 @@
- 	euptex$(EXEEXT) pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
- 	pdftosrc$(EXEEXT) luatex$(EXEEXT) txt2zlib$(EXEEXT) \
- 	xetex$(EXEEXT) $(am__EXEEXT_6) aleph$(EXEEXT)
-+inst_bin_PROGRAMS = ptex$(EXEEXT) eptex$(EXEEXT) uptex$(EXEEXT) \
-+	euptex$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3)
+--- 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) \
-@@ -1380,7 +1382,7 @@
+@@ -1973,7 +1976,7 @@
  AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
  AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
  version = $(WEB2CVERSION)
@@ -18,18 +19,18 @@
  proglib = lib/lib.a
  dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
  nodist_man_MANS = 
-@@ -1690,8 +1692,7 @@
+@@ -2298,8 +2301,7 @@
  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)
 -bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \
--	$(am__append_63)
+-	$(am__append_63) $(am__append_68)
 +bin_links =
- install_exe_links = $(am__append_20) $(am__append_61)
- uninstall_exe_links = $(am__append_21) $(am__append_62)
- web2c = $(SHELL) ./web2c-sh $@
-@@ -2946,7 +2947,7 @@
- 	$(RANLIB) libxetexmm.a
+ 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)
  	@$(NORMAL_INSTALL)
 -	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -37,7 +38,7 @@
  	if test -n "$$list"; then \
  	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
  	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-@@ -2974,7 +2975,7 @@
+@@ -4469,7 +4471,7 @@
  
  uninstall-binPROGRAMS:
  	@$(NORMAL_UNINSTALL)
@@ -45,28 +46,8 @@
 +	@list='$(inst_bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
  	files=`for p in $$list; do echo "$$p"; done | \
  	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- 	      -e 's/$$/$(EXEEXT)/' `; \
-@@ -3596,8 +3597,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-xetexini.Po@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< && $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
-@@ -3610,8 +3610,7 @@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< && $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -9311,7 +9310,7 @@
+ 	      -e 's/$$/$(EXEEXT)/' \
+@@ -13649,7 +13651,7 @@
  uninstall: uninstall-recursive
  
  install-am: all-am

Modified: head/japanese/tex-ptex/pkg-plist
==============================================================================
--- head/japanese/tex-ptex/pkg-plist	Fri Aug 22 11:01:43 2014	(r365636)
+++ head/japanese/tex-ptex/pkg-plist	Fri Aug 22 11:04:23 2014	(r365637)
@@ -1,7 +1,3 @@
-bin/ptex
-bin/eptex
-bin/uptex
-bin/euptex
 bin/pbibtex
 bin/pdvitype
 bin/ppltotf
@@ -10,3692 +6,4242 @@ bin/upbibtex
 bin/updvitype
 bin/uppltotf
 bin/uptftopl
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/COPYRIGHT
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/README
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/fontmap.zip
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/otfscale.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/sp_cns_utf.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/sp_gb_utf.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_text.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/sp_kr_utf.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/uotf-sp-utf8.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf-uptex/test/uplatex/uotftest-utf8.tex
+%%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/COPYRIGHT
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf/fontmap.zip
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf/otf-script-gteb.diff
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf/readme.en.txt
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf/readme.txt
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf/test/brsgtest.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf/test/jis2004.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf/test/koreanexample.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf/test/otftest.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf/test/pkanatest.tex
+%%TEXMFDISTDIR%%/doc/fonts/japanese-otf/test/pkanatest2.tex
+%%TEXMFDISTDIR%%/doc/fonts/jfontmaps/ChangeLog
+%%TEXMFDISTDIR%%/doc/fonts/jfontmaps/ChangeLog.pre-git
+%%TEXMFDISTDIR%%/doc/fonts/jfontmaps/README
+%%TEXMFDISTDIR%%/doc/fonts/jfontmaps/examples/otf-sample-04.tex
+%%TEXMFDISTDIR%%/doc/fonts/jfontmaps/examples/otf-sample.tex
+%%TEXMFDISTDIR%%/doc/fonts/jfontmaps/examples/ptex-sample.tex
+%%TEXMFDISTDIR%%/doc/fonts/jfontmaps/examples/series-compare.tex
+%%TEXMFDISTDIR%%/doc/platex/japanese/README
+%%TEXMFDISTDIR%%/doc/platex/japanese/sample.pdf
+%%TEXMFDISTDIR%%/doc/platex/japanese/sample.tex
+%%TEXMFDISTDIR%%/doc/platex/jsclasses/README
+%%TEXMFDISTDIR%%/doc/platex/jsclasses/jsclasses.pdf
+%%TEXMFDISTDIR%%/doc/platex/jsclasses/jsverb.pdf
+%%TEXMFDISTDIR%%/doc/platex/jsclasses/morisawa.pdf
+%%TEXMFDISTDIR%%/doc/platex/jsclasses/okumacro.pdf
+%%TEXMFDISTDIR%%/doc/platex/jsclasses/okuverb.pdf
+%%TEXMFDISTDIR%%/doc/platex/pxbase/LICENSE
+%%TEXMFDISTDIR%%/doc/platex/pxbase/README
+%%TEXMFDISTDIR%%/doc/platex/pxbase/README-pxbabel
+%%TEXMFDISTDIR%%/doc/platex/pxbase/README-pxcjkcat
+%%TEXMFDISTDIR%%/doc/platex/pxchfon/LICENSE
+%%TEXMFDISTDIR%%/doc/platex/pxchfon/README-ja
+%%TEXMFDISTDIR%%/doc/platex/pxchfon/pxchfon.pdf
+%%TEXMFDISTDIR%%/doc/platex/pxchfon/pxchfon.tex
+%%TEXMFDISTDIR%%/doc/platex/pxchfon/sample-2000jis.pdf
+%%TEXMFDISTDIR%%/doc/platex/pxchfon/sample-2000jis.tex
+%%TEXMFDISTDIR%%/doc/platex/pxchfon/sample-2004jis.pdf
+%%TEXMFDISTDIR%%/doc/platex/pxchfon/sample-2004jis.tex
+%%TEXMFDISTDIR%%/doc/platex/pxchfon/sample-pxchfon.pdf
+%%TEXMFDISTDIR%%/doc/platex/pxchfon/sample-pxchfon.tex
+%%TEXMFDISTDIR%%/doc/platex/pxjahyper/LICENSE
+%%TEXMFDISTDIR%%/doc/platex/pxjahyper/README
+%%TEXMFDISTDIR%%/doc/platex/pxjahyper/pxjahyper.pdf
+%%TEXMFDISTDIR%%/doc/platex/pxjahyper/pxjahyper.tex
+%%TEXMFDISTDIR%%/doc/platex/pxrubrica/LICENSE
+%%TEXMFDISTDIR%%/doc/platex/pxrubrica/README
+%%TEXMFDISTDIR%%/doc/platex/pxrubrica/pxrubrica-en.pdf
+%%TEXMFDISTDIR%%/doc/platex/pxrubrica/pxrubrica-en.tex
+%%TEXMFDISTDIR%%/doc/platex/pxrubrica/pxrubrica.pdf
+%%TEXMFDISTDIR%%/doc/platex/pxrubrica/sample/test-jlreq.pdf
+%%TEXMFDISTDIR%%/doc/platex/pxrubrica/sample/test-jlreq.tex
+%%TEXMFDISTDIR%%/doc/platex/pxrubrica/sample/test-sf.pdf
+%%TEXMFDISTDIR%%/doc/platex/pxrubrica/sample/test-sf.tex
+%%TEXMFDISTDIR%%/doc/platex/pxrubrica/sample/test-toc.pdf
+%%TEXMFDISTDIR%%/doc/platex/pxrubrica/sample/test-toc.tex
+%%TEXMFDISTDIR%%/doc/ptex/base/COPYRIGHT
+%%TEXMFDISTDIR%%/doc/ptex/base/COPYRIGHT.txt
 %%TEXMFDISTDIR%%/doc/ptex/base/Changes.txt
-%%TEXMFDISTDIR%%/doc/ptex/base/ptexdoc.tex
-%%TEXMFDISTDIR%%/doc/ptex/base/ptexskip.pdf
-%%TEXMFDISTDIR%%/doc/ptex/base/ptexskip.tex
-%%TEXMFDISTDIR%%/doc/ptex/base/jtex.tex
-%%TEXMFDISTDIR%%/doc/ptex/base/jtexdoc.tex
-%%TEXMFDISTDIR%%/doc/ptex/base/jfm.tex
-%%TEXMFDISTDIR%%/doc/ptex/base/ptexdoc.pdf
 %%TEXMFDISTDIR%%/doc/ptex/base/INSTALL.txt
 %%TEXMFDISTDIR%%/doc/ptex/base/README.txt
 %%TEXMFDISTDIR%%/doc/ptex/base/jfm.pdf
-%%TEXMFDISTDIR%%/doc/ptex/base/COPYRIGHT
+%%TEXMFDISTDIR%%/doc/ptex/base/jfm.tex
 %%TEXMFDISTDIR%%/doc/ptex/base/jtex.pdf
+%%TEXMFDISTDIR%%/doc/ptex/base/jtex.tex
 %%TEXMFDISTDIR%%/doc/ptex/base/jtexdoc.pdf
-%%TEXMFDISTDIR%%/doc/ptex/base/COPYRIGHT.txt
-%%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbtxbst.doc
-%%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbtxdoc.tex
+%%TEXMFDISTDIR%%/doc/ptex/base/jtexdoc.tex
+%%TEXMFDISTDIR%%/doc/ptex/base/ptexdoc.pdf
+%%TEXMFDISTDIR%%/doc/ptex/base/ptexdoc.tex
+%%TEXMFDISTDIR%%/doc/ptex/base/ptexskip.pdf
+%%TEXMFDISTDIR%%/doc/ptex/base/ptexskip.tex
+%%TEXMFDISTDIR%%/doc/ptex/jvf/COPYRIGHT
+%%TEXMFDISTDIR%%/doc/ptex/jvf/Changes.txt
+%%TEXMFDISTDIR%%/doc/ptex/jvf/README.txt
 %%TEXMFDISTDIR%%/doc/ptex/pbibtex/README
+%%TEXMFDISTDIR%%/doc/ptex/pbibtex/cpp.awk
 %%TEXMFDISTDIR%%/doc/ptex/pbibtex/generate.sh
-%%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbtxhak.pdf
+%%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbibtex.bib
+%%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbibtex.pdf
+%%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbibtex.tex
+%%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbtxbst.doc
 %%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbtxdoc.bib
 %%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbtxdoc.pdf
-%%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbibtex.pdf
-%%TEXMFDISTDIR%%/doc/ptex/pbibtex/cpp.awk
+%%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbtxdoc.tex
+%%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbtxhak.pdf
 %%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbtxhak.tex
-%%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbibtex.tex
-%%TEXMFDISTDIR%%/doc/ptex/pbibtex/jbibtex.bib
-%%TEXMFDISTDIR%%/doc/ptex/jvf/Changes.txt
-%%TEXMFDISTDIR%%/doc/ptex/jvf/README.txt
-%%TEXMFDISTDIR%%/doc/ptex/jvf/COPYRIGHT
-@dirrm %%TEXMFDISTDIR%%/doc/ptex/pbibtex
-@dirrm %%TEXMFDISTDIR%%/doc/ptex/jvf
-@dirrm %%TEXMFDISTDIR%%/doc/ptex/base
-@dirrm %%TEXMFDISTDIR%%/doc/ptex
-%%TEXMFDISTDIR%%/doc/platex/japanese/sample.pdf
-%%TEXMFDISTDIR%%/doc/platex/japanese/sample.tex
-%%TEXMFDISTDIR%%/doc/platex/japanese/README
-@dirrm %%TEXMFDISTDIR%%/doc/platex/japanese
-@dirrm %%TEXMFDISTDIR%%/doc/platex
+%%TEXMFDISTDIR%%/doc/uplatex/base/README_uplatex.txt
+%%TEXMFDISTDIR%%/doc/uptex/base/00readme_uptex.txt
+%%TEXMFDISTDIR%%/doc/uptex/base/01uptex_doc_utf8.txt
 %%TEXMFDISTDIR%%/doc/uptex/base/02uptex_changelog_utf8.txt
 %%TEXMFDISTDIR%%/doc/uptex/base/README_uptex.txt
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/console_io.tex
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/box-utf8.eps
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/simple-utf8.tex
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/cjk_babel.tex
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/sangoku-uplatex.tex
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/misc-check-h-utf8.tex
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/simple-euc.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/00readme_uptex_samples.txt
 %%TEXMFDISTDIR%%/doc/uptex/base/samples/Makefile
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/adobe-cid.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/adobe-cns-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/adobe-gb-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/adobe-jp-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/adobe-kr-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/aozora-ujarticle-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/aozora-ujbook-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/aozora-ujreport-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/aozora-utarticle-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/aozora-utbook-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/aozora-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/aozora-utreport-utf8.tex
 %%TEXMFDISTDIR%%/doc/uptex/base/samples/area-euc-incl.tex
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/testrun.bat
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/area-euc.mp
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/area-jis-incl.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/area-jis.mp
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/area-sjis-incl.tex
 %%TEXMFDISTDIR%%/doc/uptex/base/samples/area-sjis.mp
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/area-uptex-incl.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/area-uptex.mp
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/area-utf8-incl.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/area-utf8.mp
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/bkmk-docinfo.txt
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/bkmk-jis.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/bkmk-utf8.tex
 %%TEXMFDISTDIR%%/doc/uptex/base/samples/box-euc.eps
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/box-jis.eps
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/box-sjis.eps
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/box-utf8.eps
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/check_enc.pl
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/cjk_babel.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/console_io.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/greek-uplatex.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/iotext.txt
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/jbib1-jis.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/jbib2-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/jbtest.bib
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/jis_uni_variation.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/jstr-euc-incl.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/jstr-euc.mp
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/jstr-jis-incl.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/jstr-jis.mp
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/jstr-sjis-incl.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/jstr-sjis.mp
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/jstr-uptex-incl.tex
 %%TEXMFDISTDIR%%/doc/uptex/base/samples/jstr-uptex.mp
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/umin10x.tfm
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/jstr-utf8-incl.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/jstr-utf8.mp
 %%TEXMFDISTDIR%%/doc/uptex/base/samples/kinsoku-chk-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/linebreak.bib
 %%TEXMFDISTDIR%%/doc/uptex/base/samples/min10x.tfm
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/misc-check-h-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/misc-check-v-utf8.tex
 %%TEXMFDISTDIR%%/doc/uptex/base/samples/otfsmpl-uplatex.tex
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/jbib2-utf8.tex
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/box-jis.eps
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/area-utf8-incl.tex
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/jstr-sjis-incl.tex
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/area-sjis-incl.tex
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/adobe-gb-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/sangoku-uplatex.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/sangoku-uptex.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/set3-check-h-utf8.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/simple-euc.tex
+%%TEXMFDISTDIR%%/doc/uptex/base/samples/simple-jis.tex
 %%TEXMFDISTDIR%%/doc/uptex/base/samples/simple-sjis.tex
-%%TEXMFDISTDIR%%/doc/uptex/base/samples/aozora-ujreport-utf8.tex

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408221104.s7MB4Ns4077451>