Update to texlive 2015.

pdfTEX: Support JPEG Exif as well as JFIF; do not even emit a warning if
 \pdfinclusionerrorlevel is negative; sync with xpdf 3.04.
LuaTEX: New library newtokenlib for scanning tokens; bug fixes in the normal
 random number generator and other places.
XeTEX: Image handling fixes; xdvipdfmx binary looked for first as a sibling
 to xetex; internal XDV opcodes changed.
MetaPost: New numbersystem binary; new Japanese-enabled upmpost and
 updvitomp programs, analogous to up*tex.
Infrastructure: The fmtutil script has been reimplemented to read
 fmtutil.cnf on a per-tree basis, analogous to updmap. Web2C mktex* scripts
 (including mktexlsr, mktextfm, mktexpk) now prefer programs in their own
 directory, instead of always using the existing PATH.

3 files changed, 80 insertions, 52 deletions

diff --git a/print/tex-context/Makefile b/print/tex-context/Makefile
index 7718fce3431..0e2fe0efb0e 100644
--- a/print/tex-context/Makefile
+++ b/print/tex-context/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2015/04/26 00:54:04 markd Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/14 12:50:01 markd Exp $
 
 DISTNAME=	context
-PKGNAME=	tex-${DISTNAME}-2014
-PKGREVISION=	1
-TEXLIVE_REV=	35839
+PKGNAME=	tex-${DISTNAME}-2015
+TEXLIVE_REV=	37464
 
 MAINTAINER=	minskim@NetBSD.org
+HOMEPAGE=	http://ctan.org/pkg/context
 COMMENT=	The ConTeXt macro package
 
 CONFLICTS+=	teTeX-bin<=3.0nb44
diff --git a/print/tex-context/PLIST b/print/tex-context/PLIST
index e9643b2b0a1..1c6517ad701 100644
--- a/print/tex-context/PLIST
+++ b/print/tex-context/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2015/04/25 03:39:06 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/06/14 12:50:01 markd Exp $
 bin/context
 bin/luatools
 bin/mtxrun
@@ -22,6 +22,7 @@ share/texmf-dist/context/data/scite/context/lexers/scite-context-lexer-bibtex.lu
 share/texmf-dist/context/data/scite/context/lexers/scite-context-lexer-cld.lua
 share/texmf-dist/context/data/scite/context/lexers/scite-context-lexer-cpp-web.lua
 share/texmf-dist/context/data/scite/context/lexers/scite-context-lexer-cpp.lua
+share/texmf-dist/context/data/scite/context/lexers/scite-context-lexer-dummy.lua
 share/texmf-dist/context/data/scite/context/lexers/scite-context-lexer-lua-longstring.lua
 share/texmf-dist/context/data/scite/context/lexers/scite-context-lexer-lua.lua
 share/texmf-dist/context/data/scite/context/lexers/scite-context-lexer-mps.lua
@@ -134,6 +135,7 @@ share/texmf-dist/metapost/context/base/mp-abck.mpiv
 share/texmf-dist/metapost/context/base/mp-apos.mpiv
 share/texmf-dist/metapost/context/base/mp-asnc.mpiv
 share/texmf-dist/metapost/context/base/mp-back.mp
+share/texmf-dist/metapost/context/base/mp-bare.mpiv
 share/texmf-dist/metapost/context/base/mp-base.mpii
 share/texmf-dist/metapost/context/base/mp-base.mpiv
 share/texmf-dist/metapost/context/base/mp-butt.mpii
@@ -395,6 +397,7 @@ share/texmf-dist/tex/context/base/char-def.lua
 share/texmf-dist/tex/context/base/char-enc.lua
 share/texmf-dist/tex/context/base/char-enc.mkiv
 share/texmf-dist/tex/context/base/char-ent.lua
+share/texmf-dist/tex/context/base/char-fio.lua
 share/texmf-dist/tex/context/base/char-ini.lua
 share/texmf-dist/tex/context/base/char-ini.mkiv
 share/texmf-dist/tex/context/base/char-map.lua
@@ -414,6 +417,7 @@ share/texmf-dist/tex/context/base/cldf-ini.mkiv
 share/texmf-dist/tex/context/base/cldf-int.lua
 share/texmf-dist/tex/context/base/cldf-int.mkiv
 share/texmf-dist/tex/context/base/cldf-prs.lua
+share/texmf-dist/tex/context/base/cldf-scn.lua
 share/texmf-dist/tex/context/base/cldf-ver.lua
 share/texmf-dist/tex/context/base/cldf-ver.mkiv
 share/texmf-dist/tex/context/base/colo-ema.mkii
@@ -461,6 +465,8 @@ share/texmf-dist/tex/context/base/cont-nop.mkiv
 share/texmf-dist/tex/context/base/cont-pe.mkiv
 share/texmf-dist/tex/context/base/cont-ro.mkii
 share/texmf-dist/tex/context/base/cont-ro.mkiv
+share/texmf-dist/tex/context/base/cont-run.lua
+share/texmf-dist/tex/context/base/cont-run.mkiv
 share/texmf-dist/tex/context/base/cont-sys.ori
 share/texmf-dist/tex/context/base/cont-yes.mkiv
 share/texmf-dist/tex/context/base/context-base.lmx
@@ -623,6 +629,7 @@ share/texmf-dist/tex/context/base/font-hsh.lua
 share/texmf-dist/tex/context/base/font-ini.lua
 share/texmf-dist/tex/context/base/font-ini.mkii
 share/texmf-dist/tex/context/base/font-ini.mkvi
+share/texmf-dist/tex/context/base/font-inj.lua
 share/texmf-dist/tex/context/base/font-jap.mkii
 share/texmf-dist/tex/context/base/font-ldr.lua
 share/texmf-dist/tex/context/base/font-lib.mkvi
@@ -644,7 +651,6 @@ share/texmf-dist/tex/context/base/font-oti.lua
 share/texmf-dist/tex/context/base/font-otn.lua
 share/texmf-dist/tex/context/base/font-otp.lua
 share/texmf-dist/tex/context/base/font-ott.lua
-share/texmf-dist/tex/context/base/font-otx.lua
 share/texmf-dist/tex/context/base/font-pat.lua
 share/texmf-dist/tex/context/base/font-pre.mkiv
 share/texmf-dist/tex/context/base/font-run.mkii
@@ -712,6 +718,7 @@ share/texmf-dist/tex/context/base/l-number.lua
 share/texmf-dist/tex/context/base/l-os.lua
 share/texmf-dist/tex/context/base/l-package.lua
 share/texmf-dist/tex/context/base/l-pdfview.lua
+share/texmf-dist/tex/context/base/l-sandbox.lua
 share/texmf-dist/tex/context/base/l-set.lua
 share/texmf-dist/tex/context/base/l-string.lua
 share/texmf-dist/tex/context/base/l-table.lua
@@ -729,6 +736,7 @@ share/texmf-dist/tex/context/base/lang-ctx.mkii
 share/texmf-dist/tex/context/base/lang-cyr.mkii
 share/texmf-dist/tex/context/base/lang-def.lua
 share/texmf-dist/tex/context/base/lang-def.mkiv
+share/texmf-dist/tex/context/base/lang-dis.lua
 share/texmf-dist/tex/context/base/lang-dis.mkii
 share/texmf-dist/tex/context/base/lang-frd.mkii
 share/texmf-dist/tex/context/base/lang-frd.mkiv
@@ -739,6 +747,8 @@ share/texmf-dist/tex/context/base/lang-frq.mkii
 share/texmf-dist/tex/context/base/lang-frq.mkiv
 share/texmf-dist/tex/context/base/lang-ger.mkii
 share/texmf-dist/tex/context/base/lang-grk.mkii
+share/texmf-dist/tex/context/base/lang-hyp.lua
+share/texmf-dist/tex/context/base/lang-hyp.mkiv
 share/texmf-dist/tex/context/base/lang-ind.mkii
 share/texmf-dist/tex/context/base/lang-ini.lua
 share/texmf-dist/tex/context/base/lang-ini.mkii
@@ -807,6 +817,8 @@ share/texmf-dist/tex/context/base/luat-run.lua
 share/texmf-dist/tex/context/base/luat-soc.lua
 share/texmf-dist/tex/context/base/luat-sta.lua
 share/texmf-dist/tex/context/base/luat-sto.lua
+share/texmf-dist/tex/context/base/luat-usr.lua
+share/texmf-dist/tex/context/base/luat-usr.mkiv
 share/texmf-dist/tex/context/base/lxml-aux.lua
 share/texmf-dist/tex/context/base/lxml-css.lua
 share/texmf-dist/tex/context/base/lxml-css.mkiv
@@ -815,6 +827,7 @@ share/texmf-dist/tex/context/base/lxml-ctx.mkiv
 share/texmf-dist/tex/context/base/lxml-dir.lua
 share/texmf-dist/tex/context/base/lxml-ent.lua
 share/texmf-dist/tex/context/base/lxml-inf.lua
+share/texmf-dist/tex/context/base/lxml-ini.lua
 share/texmf-dist/tex/context/base/lxml-ini.mkiv
 share/texmf-dist/tex/context/base/lxml-lpt.lua
 share/texmf-dist/tex/context/base/lxml-mis.lua
@@ -852,9 +865,9 @@ share/texmf-dist/tex/context/base/m-logcategories.mkiv
 share/texmf-dist/tex/context/base/m-markdown.lua
 share/texmf-dist/tex/context/base/m-markdown.mkiv
 share/texmf-dist/tex/context/base/m-mathcrap.mkiv
+share/texmf-dist/tex/context/base/m-matrix.mkiv
 share/texmf-dist/tex/context/base/m-mkii.mkiv
 share/texmf-dist/tex/context/base/m-mkivhacks.mkiv
-share/texmf-dist/tex/context/base/m-morse.mkvi
 share/texmf-dist/tex/context/base/m-narrowtt.tex
 share/texmf-dist/tex/context/base/m-newmat.tex
 share/texmf-dist/tex/context/base/m-nodechart.lua
@@ -949,6 +962,7 @@ share/texmf-dist/tex/context/base/meta-imp-fen.mkiv
 share/texmf-dist/tex/context/base/meta-imp-mis.mkiv
 share/texmf-dist/tex/context/base/meta-imp-nav.mkiv
 share/texmf-dist/tex/context/base/meta-imp-pre.mkiv
+share/texmf-dist/tex/context/base/meta-imp-tab.mkiv
 share/texmf-dist/tex/context/base/meta-imp-txt.mkiv
 share/texmf-dist/tex/context/base/meta-ini.lua
 share/texmf-dist/tex/context/base/meta-ini.mkii
@@ -973,6 +987,7 @@ share/texmf-dist/tex/context/base/metatex.lus
 share/texmf-dist/tex/context/base/metatex.tex
 share/texmf-dist/tex/context/base/mlib-ctx.lua
 share/texmf-dist/tex/context/base/mlib-ctx.mkiv
+share/texmf-dist/tex/context/base/mlib-int.lua
 share/texmf-dist/tex/context/base/mlib-lua.lua
 share/texmf-dist/tex/context/base/mlib-pdf.lua
 share/texmf-dist/tex/context/base/mlib-pdf.mkiv
@@ -986,6 +1001,7 @@ share/texmf-dist/tex/context/base/mtx-context-copy.tex
 share/texmf-dist/tex/context/base/mtx-context-ideas.tex
 share/texmf-dist/tex/context/base/mtx-context-listing.tex
 share/texmf-dist/tex/context/base/mtx-context-markdown.tex
+share/texmf-dist/tex/context/base/mtx-context-precache.tex
 share/texmf-dist/tex/context/base/mtx-context-select.tex
 share/texmf-dist/tex/context/base/mtx-context-sql.tex
 share/texmf-dist/tex/context/base/mtx-context-timing.tex
@@ -1169,14 +1185,27 @@ share/texmf-dist/tex/context/base/prop-mis.mkii
 share/texmf-dist/tex/context/base/publ-aut.lua
 share/texmf-dist/tex/context/base/publ-dat.lua
 share/texmf-dist/tex/context/base/publ-fnd.lua
-share/texmf-dist/tex/context/base/publ-imp-apa.mkiv
-share/texmf-dist/tex/context/base/publ-imp-cite.mkiv
-share/texmf-dist/tex/context/base/publ-imp-commands.mkiv
-share/texmf-dist/tex/context/base/publ-imp-definitions.mkiv
+share/texmf-dist/tex/context/base/publ-imp-apa.lua
+share/texmf-dist/tex/context/base/publ-imp-apa.mkvi
+share/texmf-dist/tex/context/base/publ-imp-aps.lua
+share/texmf-dist/tex/context/base/publ-imp-aps.mkvi
+share/texmf-dist/tex/context/base/publ-imp-author.mkvi
+share/texmf-dist/tex/context/base/publ-imp-cite.mkvi
+share/texmf-dist/tex/context/base/publ-imp-commands.mkvi
+share/texmf-dist/tex/context/base/publ-imp-default.lua
+share/texmf-dist/tex/context/base/publ-imp-default.mkvi
+share/texmf-dist/tex/context/base/publ-imp-definitions.mkvi
+share/texmf-dist/tex/context/base/publ-imp-list.mkvi
+share/texmf-dist/tex/context/base/publ-imp-page.mkvi
+share/texmf-dist/tex/context/base/publ-imp-replacements.lua
+share/texmf-dist/tex/context/base/publ-imp-test.bib
 share/texmf-dist/tex/context/base/publ-ini.lua
 share/texmf-dist/tex/context/base/publ-ini.mkiv
+share/texmf-dist/tex/context/base/publ-jrn.lua
 share/texmf-dist/tex/context/base/publ-old.mkiv
 share/texmf-dist/tex/context/base/publ-oth.lua
+share/texmf-dist/tex/context/base/publ-reg.lua
+share/texmf-dist/tex/context/base/publ-sor.lua
 share/texmf-dist/tex/context/base/publ-tra.lua
 share/texmf-dist/tex/context/base/publ-tra.mkiv
 share/texmf-dist/tex/context/base/publ-usr.lua
@@ -1232,6 +1261,7 @@ share/texmf-dist/tex/context/base/regi-ini.lua
 share/texmf-dist/tex/context/base/regi-ini.mkii
 share/texmf-dist/tex/context/base/regi-ini.mkiv
 share/texmf-dist/tex/context/base/regi-mac.mkii
+share/texmf-dist/tex/context/base/regi-pdfdoc.lua
 share/texmf-dist/tex/context/base/regi-syn.mkii
 share/texmf-dist/tex/context/base/regi-uni.mkii
 share/texmf-dist/tex/context/base/regi-utf.mkii
@@ -1250,6 +1280,7 @@ share/texmf-dist/tex/context/base/s-faq-00.tex
 share/texmf-dist/tex/context/base/s-faq-01.tex
 share/texmf-dist/tex/context/base/s-faq-02.tex
 share/texmf-dist/tex/context/base/s-faq-03.tex
+share/texmf-dist/tex/context/base/s-figures-names.mkiv
 share/texmf-dist/tex/context/base/s-fnt-01.mkii
 share/texmf-dist/tex/context/base/s-fnt-02.mkii
 share/texmf-dist/tex/context/base/s-fnt-10.mkiv
@@ -1262,6 +1293,7 @@ share/texmf-dist/tex/context/base/s-fonts-features.lua
 share/texmf-dist/tex/context/base/s-fonts-features.mkiv
 share/texmf-dist/tex/context/base/s-fonts-goodies.lua
 share/texmf-dist/tex/context/base/s-fonts-goodies.mkiv
+share/texmf-dist/tex/context/base/s-fonts-ligatures.mkiv
 share/texmf-dist/tex/context/base/s-fonts-missing.lua
 share/texmf-dist/tex/context/base/s-fonts-missing.mkiv
 share/texmf-dist/tex/context/base/s-fonts-shapes.lua
@@ -1288,6 +1320,8 @@ share/texmf-dist/tex/context/base/s-languages-sorting.lua
 share/texmf-dist/tex/context/base/s-languages-sorting.mkiv
 share/texmf-dist/tex/context/base/s-languages-system.lua
 share/texmf-dist/tex/context/base/s-languages-system.mkiv
+share/texmf-dist/tex/context/base/s-languages-words.lua
+share/texmf-dist/tex/context/base/s-languages-words.mkiv
 share/texmf-dist/tex/context/base/s-mag-01.tex
 share/texmf-dist/tex/context/base/s-map-10.mkii
 share/texmf-dist/tex/context/base/s-map-10.mkiv
@@ -1354,11 +1388,15 @@ share/texmf-dist/tex/context/base/s-pre-93.tex
 share/texmf-dist/tex/context/base/s-pre-96.tex
 share/texmf-dist/tex/context/base/s-present-tiles.mkiv
 share/texmf-dist/tex/context/base/s-ptj-01.tex
+share/texmf-dist/tex/context/base/s-references-show.mkiv
 share/texmf-dist/tex/context/base/s-reg-01.mkiv
 share/texmf-dist/tex/context/base/s-set-31.mkiv
 share/texmf-dist/tex/context/base/s-sql-tables.lua
 share/texmf-dist/tex/context/base/s-sql-tables.mkiv
-share/texmf-dist/tex/context/base/s-syn-01.tex
+share/texmf-dist/tex/context/base/s-structure-sections.mkiv
+share/texmf-dist/tex/context/base/s-syntax.mkii
+share/texmf-dist/tex/context/base/s-syntax.mkiv
+share/texmf-dist/tex/context/base/s-typesetting-kerning.mkiv
 share/texmf-dist/tex/context/base/s-youless.mkiv
 share/texmf-dist/tex/context/base/scrn-bar.mkvi
 share/texmf-dist/tex/context/base/scrn-but.lua
@@ -1406,6 +1444,7 @@ share/texmf-dist/tex/context/base/spac-hor.mkiv
 share/texmf-dist/tex/context/base/spac-lin.mkiv
 share/texmf-dist/tex/context/base/spac-pag.mkiv
 share/texmf-dist/tex/context/base/spac-par.mkiv
+share/texmf-dist/tex/context/base/spac-prf.mkiv
 share/texmf-dist/tex/context/base/spac-ver.lua
 share/texmf-dist/tex/context/base/spac-ver.mkiv
 share/texmf-dist/tex/context/base/spec-def.mkii
@@ -1589,6 +1628,11 @@ share/texmf-dist/tex/context/base/thrd-tab.mkii
 share/texmf-dist/tex/context/base/thrd-trg.mkii
 share/texmf-dist/tex/context/base/toks-ini.lua
 share/texmf-dist/tex/context/base/toks-ini.mkiv
+share/texmf-dist/tex/context/base/toks-map.lua
+share/texmf-dist/tex/context/base/toks-map.mkiv
+share/texmf-dist/tex/context/base/toks-scn.lua
+share/texmf-dist/tex/context/base/toks-tra.lua
+share/texmf-dist/tex/context/base/toks-tra.mkiv
 share/texmf-dist/tex/context/base/trac-ctx.lua
 share/texmf-dist/tex/context/base/trac-ctx.mkiv
 share/texmf-dist/tex/context/base/trac-deb.lua
@@ -1639,6 +1683,7 @@ share/texmf-dist/tex/context/base/type-imp-husayni.mkiv
 share/texmf-dist/tex/context/base/type-imp-hvmath.mkiv
 share/texmf-dist/tex/context/base/type-imp-inconsolata.mkiv
 share/texmf-dist/tex/context/base/type-imp-informal.mkiv
+share/texmf-dist/tex/context/base/type-imp-ipaex.mkiv
 share/texmf-dist/tex/context/base/type-imp-iwona.mkiv
 share/texmf-dist/tex/context/base/type-imp-kurier.mkiv
 share/texmf-dist/tex/context/base/type-imp-latinmodern.mkiv
@@ -1687,6 +1732,8 @@ share/texmf-dist/tex/context/base/typo-brk.lua
 share/texmf-dist/tex/context/base/typo-brk.mkiv
 share/texmf-dist/tex/context/base/typo-cap.lua
 share/texmf-dist/tex/context/base/typo-cap.mkiv
+share/texmf-dist/tex/context/base/typo-chr.lua
+share/texmf-dist/tex/context/base/typo-chr.mkiv
 share/texmf-dist/tex/context/base/typo-cln.lua
 share/texmf-dist/tex/context/base/typo-cln.mkiv
 share/texmf-dist/tex/context/base/typo-del.mkiv
@@ -1704,6 +1751,8 @@ share/texmf-dist/tex/context/base/typo-fln.mkiv
 share/texmf-dist/tex/context/base/typo-ini.lua
 share/texmf-dist/tex/context/base/typo-ini.mkii
 share/texmf-dist/tex/context/base/typo-ini.mkiv
+share/texmf-dist/tex/context/base/typo-inj.lua
+share/texmf-dist/tex/context/base/typo-inj.mkiv
 share/texmf-dist/tex/context/base/typo-itc.lua
 share/texmf-dist/tex/context/base/typo-itc.mkvi
 share/texmf-dist/tex/context/base/typo-itm.mkiv
@@ -1711,6 +1760,8 @@ share/texmf-dist/tex/context/base/typo-krn.lua
 share/texmf-dist/tex/context/base/typo-krn.mkiv
 share/texmf-dist/tex/context/base/typo-lan.lua
 share/texmf-dist/tex/context/base/typo-lan.mkiv
+share/texmf-dist/tex/context/base/typo-lig.mkiv
+share/texmf-dist/tex/context/base/typo-man.lua
 share/texmf-dist/tex/context/base/typo-mar.lua
 share/texmf-dist/tex/context/base/typo-mar.mkiv
 share/texmf-dist/tex/context/base/typo-pag.lua
@@ -1723,9 +1774,13 @@ share/texmf-dist/tex/context/base/typo-rep.mkiv
 share/texmf-dist/tex/context/base/typo-scr.mkiv
 share/texmf-dist/tex/context/base/typo-spa.lua
 share/texmf-dist/tex/context/base/typo-spa.mkiv
+share/texmf-dist/tex/context/base/typo-sus.lua
+share/texmf-dist/tex/context/base/typo-sus.mkiv
 share/texmf-dist/tex/context/base/typo-tal.lua
 share/texmf-dist/tex/context/base/typo-tal.mkiv
 share/texmf-dist/tex/context/base/typo-txt.mkvi
+share/texmf-dist/tex/context/base/typo-wrp.lua
+share/texmf-dist/tex/context/base/typo-wrp.mkiv
 share/texmf-dist/tex/context/base/unic-000.mkii
 share/texmf-dist/tex/context/base/unic-001.mkii
 share/texmf-dist/tex/context/base/unic-002.mkii
@@ -1758,6 +1813,7 @@ share/texmf-dist/tex/context/base/util-mrg.lua
 share/texmf-dist/tex/context/base/util-pck.lua
 share/texmf-dist/tex/context/base/util-prs.lua
 share/texmf-dist/tex/context/base/util-ran.lua
+share/texmf-dist/tex/context/base/util-sbx.lua
 share/texmf-dist/tex/context/base/util-sci.lua
 share/texmf-dist/tex/context/base/util-seq.lua
 share/texmf-dist/tex/context/base/util-soc.lua
@@ -1820,9 +1876,12 @@ share/texmf-dist/tex/context/base/x-fig-03.mkii
 share/texmf-dist/tex/context/base/x-fo.mkii
 share/texmf-dist/tex/context/base/x-foxet.mkii
 share/texmf-dist/tex/context/base/x-foxet.mkiv
+share/texmf-dist/tex/context/base/x-html.mkiv
 share/texmf-dist/tex/context/base/x-ldx.ctx
 share/texmf-dist/tex/context/base/x-ldx.lua
 share/texmf-dist/tex/context/base/x-ldx.mkiv
+share/texmf-dist/tex/context/base/x-math-svg.lua
+share/texmf-dist/tex/context/base/x-mathml-basics.mkiv
 share/texmf-dist/tex/context/base/x-mathml-html.mkiv
 share/texmf-dist/tex/context/base/x-mathml.lua
 share/texmf-dist/tex/context/base/x-mathml.mkii
@@ -1915,6 +1974,7 @@ share/texmf-dist/tex/context/base/xtag-xsl.mkii
 share/texmf-dist/tex/context/bib/bibl-ams.tex
 share/texmf-dist/tex/context/bib/bibl-apa-de.tex
 share/texmf-dist/tex/context/bib/bibl-apa-fr.tex
+share/texmf-dist/tex/context/bib/bibl-apa-it.tex
 share/texmf-dist/tex/context/bib/bibl-apa.tex
 share/texmf-dist/tex/context/bib/bibl-aps.tex
 share/texmf-dist/tex/context/bib/bibl-num-fr.tex
@@ -1925,7 +1985,6 @@ share/texmf-dist/tex/context/colors/icc/context/colorprofiles.lua
 share/texmf-dist/tex/context/colors/icc/context/colorprofiles.xml
 share/texmf-dist/tex/context/extra/mag-0000.tex
 share/texmf-dist/tex/context/extra/setup-qr.tex
-share/texmf-dist/tex/context/extra/showunic.tex
 share/texmf-dist/tex/context/fonts/antykwa-math.lfg
 share/texmf-dist/tex/context/fonts/antykwapoltawskiego.lfg
 share/texmf-dist/tex/context/fonts/asana-math.lfg
@@ -1959,41 +2018,6 @@ share/texmf-dist/tex/context/fonts/treatments.lfg
 share/texmf-dist/tex/context/fonts/tx-math.lfg
 share/texmf-dist/tex/context/fonts/unifraktur.lfg
 share/texmf-dist/tex/context/fonts/xits-math.lfg
-share/texmf-dist/tex/context/foxet/fe-bryson.xml
-share/texmf-dist/tex/context/foxet/fe-ward.xml
-share/texmf-dist/tex/context/foxet/fe-zapf.xml
-share/texmf-dist/tex/context/foxet/fo-0101.fo
-share/texmf-dist/tex/context/foxet/fo-0102.fo
-share/texmf-dist/tex/context/foxet/fo-0103.fo
-share/texmf-dist/tex/context/foxet/fo-0201.fo
-share/texmf-dist/tex/context/foxet/fo-0301.fo
-share/texmf-dist/tex/context/foxet/fo-0601.fo
-share/texmf-dist/tex/context/foxet/fo-0602.fo
-share/texmf-dist/tex/context/foxet/fo-0603.fo
-share/texmf-dist/tex/context/foxet/fo-0604.fo
-share/texmf-dist/tex/context/foxet/fo-0611.fo
-share/texmf-dist/tex/context/foxet/fo-0612.fo
-share/texmf-dist/tex/context/foxet/fo-0613.fo
-share/texmf-dist/tex/context/foxet/fo-0621.fo
-share/texmf-dist/tex/context/foxet/fo-0641.fo
-share/texmf-dist/tex/context/foxet/fo-0642.fo
-share/texmf-dist/tex/context/foxet/fo-0643.fo
-share/texmf-dist/tex/context/foxet/fo-0644.fo
-share/texmf-dist/tex/context/foxet/fo-0650.fo
-share/texmf-dist/tex/context/foxet/fo-0651.fo
-share/texmf-dist/tex/context/foxet/fo-0701.fo
-share/texmf-dist/tex/context/foxet/fo-0801.fo
-share/texmf-dist/tex/context/foxet/fo-0901.fo
-share/texmf-dist/tex/context/foxet/fo-0902.fo
-share/texmf-dist/tex/context/foxet/fo-1001.fo
-share/texmf-dist/tex/context/foxet/fo-1002.fo
-share/texmf-dist/tex/context/foxet/fo-1003.fo
-share/texmf-dist/tex/context/foxet/fo-1004.fo
-share/texmf-dist/tex/context/foxet/fo-1101.fo
-share/texmf-dist/tex/context/foxet/fo-1102.fo
-share/texmf-dist/tex/context/foxet/fo-1103.fo
-share/texmf-dist/tex/context/foxet/fo-1104.fo
-share/texmf-dist/tex/context/foxet/fo-1201.fo
 share/texmf-dist/tex/context/interface/cont-cs.xml
 share/texmf-dist/tex/context/interface/cont-de.xml
 share/texmf-dist/tex/context/interface/cont-en.xml
@@ -2181,6 +2205,7 @@ share/texmf-dist/tex/context/sample/bryson.tex
 share/texmf-dist/tex/context/sample/cervantes-es.tex
 share/texmf-dist/tex/context/sample/cow.pdf
 share/texmf-dist/tex/context/sample/d-res-01.xml
+share/texmf-dist/tex/context/sample/darwin.tex
 share/texmf-dist/tex/context/sample/davis.tex
 share/texmf-dist/tex/context/sample/dawkins.tex
 share/texmf-dist/tex/context/sample/demo-mps.tex
@@ -2200,6 +2225,8 @@ share/texmf-dist/tex/context/sample/montgomery.tex
 share/texmf-dist/tex/context/sample/quevedo-es.tex
 share/texmf-dist/tex/context/sample/reich.tex
 share/texmf-dist/tex/context/sample/sample.tex
+share/texmf-dist/tex/context/sample/samples.bib
+share/texmf-dist/tex/context/sample/samples.tex
 share/texmf-dist/tex/context/sample/spider.eps
 share/texmf-dist/tex/context/sample/thuan.tex
 share/texmf-dist/tex/context/sample/tufte.tex
@@ -2228,6 +2255,7 @@ share/texmf-dist/tex/generic/context/luatex/luatex-fonts-ext.lua
 share/texmf-dist/tex/generic/context/luatex/luatex-fonts-inj.lua
 share/texmf-dist/tex/generic/context/luatex/luatex-fonts-lua.lua
 share/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua
+share/texmf-dist/tex/generic/context/luatex/luatex-fonts-ota.lua
 share/texmf-dist/tex/generic/context/luatex/luatex-fonts-otn.lua
 share/texmf-dist/tex/generic/context/luatex/luatex-fonts-syn.lua
 share/texmf-dist/tex/generic/context/luatex/luatex-fonts-tfm.lua
diff --git a/print/tex-context/distinfo b/print/tex-context/distinfo
index db8737d88b7..b05a156a7d9 100644
--- a/print/tex-context/distinfo
+++ b/print/tex-context/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2015/04/25 03:39:06 markd Exp $
+$NetBSD: distinfo,v 1.6 2015/06/14 12:50:01 markd Exp $
 
-SHA1 (tex-context-35839/context.tar.xz) = 6ede6d648fcd7e27254c75595fe2c60e779dbdd1
-RMD160 (tex-context-35839/context.tar.xz) = 7d3c8f2de29da3c94bb5cf1226a109007cab6d64
-Size (tex-context-35839/context.tar.xz) = 5747860 bytes
+SHA1 (tex-context-37464/context.tar.xz) = 78792df2e9ace135e14c3fdf95110eca8ac83f30
+RMD160 (tex-context-37464/context.tar.xz) = 71aa21946d7f8e383a94b246d8936c12fd9010ac
+Size (tex-context-37464/context.tar.xz) = 5991856 bytes