Updated to TexLive 2016:

	Updated print/cjkutils to 4.8.4nb1
	Updated print/dviljk to 2.6.5nb7
	Updated print/dvipdfmx to 20160307
	Updated print/dvipsk to 5.996
	Updated print/kpathsea to 6.2.2
	Updated print/lacheck to 1.28nb1
	Updated print/luatex to 0.95
	Updated print/ptexenc to 1.3.4
	Updated print/seetexk to 1.1nb2
	Updated print/tex4ht to 0.0.20160522
	Updated print/vlna to 1.5nb2
	Updated print/web2c to 2016
	Updated print/xdvik to 22.87.03
	Updated print/xetex to 0.99996
	Updated print/xpdfopen to 0.86nb1
	Updated print/tex-IEEEtran{,-doc} to 1.8b
	Updated print/tex-abc{,-doc} to 2.0b
	Updated print/tex-aleph to 0.2.40768
	Updated print/tex-algorithm2e{,-doc} to 5.1
	Updated print/tex-algorithms{,-doc} to 0.1
	Updated print/tex-amsmath{,-doc} to 2.15b
	Updated print/tex-babel{,-doc} to 3.9r
	Updated print/tex-babel-bosnian to 1.1
	Updated print/tex-babel-estonian to 1.1a
	Updated print/tex-babel-french to 3.2c
	Updated print/tex-babel-friulan to 1.3
	Updated print/tex-babel-greek to 1.9f
	Updated print/tex-babel-hungarian to 1.5c
	Updated print/tex-babel-icelandic to 1.2b
	Updated print/tex-babel-latin to 3.5
	Updated print/tex-babel-russian to 1.3h
	Updated print/tex-babel-spanish to 5.0p
	Updated print/tex-babel-vietnamese to 1.4
	Updated print/tex-babel-welsh to 1.1a
	Updated print/tex-biblatex{,-doc} to 3.4
	Updated print/tex-booktabs{,-doc} to 1.618033
	Updated print/tex-breqn to 0.98d
	Updated print/tex-caption{,-doc} to 20160202
	Updated print/tex-chess-problem-diagrams{,-doc} to 1.12
	Updated print/tex-cjk-gs-integrate{,-doc} to 20160115.0
	Updated print/tex-cjk-ko{,-doc} to 1.8
	Updated print/tex-cjkpunct{,-doc} to 4.8.4
	Updated print/tex-context{,-doc} to 2016
	Updated print/tex-csplain to 2016
	Updated print/tex-csquotes{,-doc} to 5.1g
	Updated print/tex-ctable to 1.31
	Updated print/tex-cweb{,-doc} to 3.64af
	Updated print/tex-datatool{,-doc} to 2.25
	Updated print/tex-dvipdfmx{,-doc} to 2016
	Updated print/tex-dvipdfmx-def to 4.08
	Updated print/tex-dvips{,-doc} to 2016
	Updated print/tex-eplain{,-doc} to 3.8
	Updated print/tex-etex-pkg{,-doc} to 2.6
	Updated print/tex-europasscv{,-doc} to 2016
	Updated print/tex-fix2col{,-doc} to 0.04
	Updated print/tex-font-change{,-doc} to 2015.2
	Updated print/tex-glossaries{,-doc} to 4.23
	Updated print/tex-graphics{,-doc} to 1.0r
	Updated print/tex-hausarbeit-jura{,-doc} to 1.4
	Updated print/tex-hyperref{,-doc} to 6.83n
	Updated print/tex-hyph-utf8{,-doc} to 2016
	Updated print/tex-hyphen-afrikaans to 2016
	Updated print/tex-hyphen-ancientgreek to 2016
	Updated print/tex-hyphen-arabic to 2016
	Updated print/tex-hyphen-armenian to 2016
	Updated print/tex-hyphen-base to 2016
	Updated print/tex-hyphen-basque to 2016
	Updated print/tex-hyphen-bulgarian to 2016
	Updated print/tex-hyphen-catalan to 2016
	Updated print/tex-hyphen-chinese to 2016
	Updated print/tex-hyphen-coptic to 2016
	Updated print/tex-hyphen-croatian to 2016
	Updated print/tex-hyphen-czech to 2016
	Updated print/tex-hyphen-danish to 2016
	Updated print/tex-hyphen-dutch to 2016
	Updated print/tex-hyphen-english to 2016
	Updated print/tex-hyphen-esperanto to 2016
	Updated print/tex-hyphen-estonian to 2016
	Updated print/tex-hyphen-ethiopic to 2016
	Updated print/tex-hyphen-farsi to 2016
	Updated print/tex-hyphen-finnish to 2016
	Updated print/tex-hyphen-french to 2016
	Updated print/tex-hyphen-friulan to 2016
	Updated print/tex-hyphen-galician to 2016
	Updated print/tex-hyphen-georgian to 2016
	Updated print/tex-hyphen-german to 2016
	Updated print/tex-hyphen-greek to 2016
	Updated print/tex-hyphen-hungarian to 2016
	Updated print/tex-hyphen-icelandic to 2016
	Updated print/tex-hyphen-indic to 2016
	Updated print/tex-hyphen-indonesian to 2016
	Updated print/tex-hyphen-interlingua to 2016
	Updated print/tex-hyphen-irish to 2016
	Updated print/tex-hyphen-italian to 2016
	Updated print/tex-hyphen-kurmanji to 2016
	Updated print/tex-hyphen-latin to 3.1.2016
	Updated print/tex-hyphen-latvian to 2016
	Updated print/tex-hyphen-lithuanian to 2016
	Updated print/tex-hyphen-mongolian to 2016
	Updated print/tex-hyphen-norwegian to 2016
	Updated print/tex-hyphen-piedmontese to 2016
	Updated print/tex-hyphen-polish to 3.0a.2016
	Updated print/tex-hyphen-portuguese to 2016
	Updated print/tex-hyphen-romanian to 2016
	Updated print/tex-hyphen-romansh to 2016
	Updated print/tex-hyphen-russian to 2016
	Updated print/tex-hyphen-sanskrit to 2016
	Updated print/tex-hyphen-serbian to 1.0a.2016
	Updated print/tex-hyphen-slovak to 2016
	Updated print/tex-hyphen-slovenian to 2016
	Updated print/tex-hyphen-spanish to 4.5.2016
	Updated print/tex-hyphen-swedish to 2016
	Updated print/tex-hyphen-thai to 2016
	Updated print/tex-hyphen-turkish to 2016
	Updated print/tex-hyphen-turkmen to 2016
	Updated print/tex-hyphen-ukrainian to 2016
	Updated print/tex-hyphen-uppersorbian to 2016
	Updated print/tex-hyphen-welsh to 2016
	Updated print/tex-ifluatex{,-doc} to 1.4
	Updated print/tex-koma-script to 3.20
	Updated print/tex-kotex-oblivoir{,-doc} to 2.1.7
	Updated print/tex-kotex-plain{,-doc} to 2.1.1.a
	Updated print/tex-kotex-utf{,-doc} to 2.1.2
	Updated print/tex-kotex-utils{,-doc} to 2.1.0
	Updated print/tex-kpathsea{,-doc} to 2016
	Updated print/tex-latex{,-doc} to 2016
	Updated print/tex-latex-bin to 2016
	Updated print/tex-latexconfig to 2016
	Updated print/tex-leaflet{,-doc} to 1.1a
	Updated print/tex-lettrine{,-doc} to 1.9
	Updated print/tex-lollipop{,-doc} to 1.06
	Updated print/tex-luatex to 0.95
	Updated print/tex-mathtools to 1.18
	Updated print/tex-media9{,-doc} to 0.68
	Updated print/tex-memoir{,-doc} to 3.7f
	Updated print/tex-mhchem{,-doc} to 4.04
	Updated print/tex-microtype{,-doc} to 2.6a
	Updated print/tex-minted{,-doc} to 2.1
	Updated print/tex-musixtex{,-doc} to 1.22
	Updated print/tex-oberdiek{,-doc} to 2016
	Updated print/tex-pageslts to 1.2f
	Updated print/tex-paralist{,-doc} to 2.5
	Updated print/tex-pdfcomment{,-doc} to 2.3b
	Updated print/tex-pdfpages{,-doc} to 0.5f
	Updated print/tex-pdftex{,-doc} to 2016
	Updated print/tex-pgf{,-doc} to 3.0.1a
	Updated print/tex-pgfplots{,-doc} to 1.13
	Updated print/tex-pict2e{,-doc} to 0.3b
	Updated print/tex-plain to 3.141592653.40274
	Updated print/tex-polyglossia{,-doc} to 1.42.4
	Updated print/tex-powerdot to 1.5a
	Updated print/tex-preview{,-doc} to 11.89
	Updated print/tex-ptex to 3.2pl41220
	Updated print/tex-realscripts{,-doc} to 0.3d
	Updated print/tex-schwalbe-chess{,-doc} to 2.1
	Updated print/tex-showlabels{,-doc} to 1.7
	Updated print/tex-siunitx{,-doc} to 2.6q
	Updated print/tex-sttools{,-doc} to 1.8
	Updated print/tex-tetex{,-doc} to 3.0.41059
	Updated print/tex-tex4ht{,-doc} to 2016
	Updated print/tex-texinfo to 5.1.40618
	Updated print/tex-texlive-scripts to 2016
	Updated print/tex-texlive.infra to 2016
	Updated print/tex-titlesec{,-doc} to 2.10.2
	Updated print/tex-tools{,-doc} to 2016
	Updated print/tex-toptesi{,-doc} to 5.91
	Updated print/tex-udesoftec{,-doc} to 1.5.2
	Updated print/tex-xcjk2uni{,-doc} to 0.6
	Updated print/tex-xcolor{,-doc} to 2.12
	Updated print/tex-xetex{,-doc} to 2016
	Updated print/tex-xetex-def to 4.08
	Updated print/tex-xetexconfig to 2016
	Updated print/tex-xltxtra{,-doc} to 0.6
	Added print/tex-pbibtex-base{,-doc} version 0.0.2016
	Added print/tex-ptex-base{,-doc} version 0.0.2016
	Added print/tex-tex-ini-files{,-doc} version 2016
	Added print/tex-unicode-data{,-doc} version 1.4a
	Added print/tex-updmap-map version 2016

3 files changed, 16 insertions, 14 deletions

diff --git a/print/luatex/Makefile b/print/luatex/Makefile
index 0d41a9acbfc..52b0abb6683 100644
--- a/print/luatex/Makefile
+++ b/print/luatex/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2016/05/22 18:20:48 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2016/06/16 04:06:19 markd Exp $
 
-DISTNAME=	texlive-20150521-source
-PKGNAME=	luatex-0.80.0
-PKGREVISION=	3
+DISTNAME=	texlive-20160523-source
+PKGNAME=	luatex-0.95
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2016/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
@@ -14,6 +13,7 @@ LICENSE=	gnu-gpl-v2
 
 EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 			${DISTNAME}/libs/lua52 \
+			${DISTNAME}/libs/luajit \
 			${DISTNAME}/texk/web2c
 
 GNU_CONFIGURE=	yes
@@ -50,13 +50,14 @@ CONFIGURE_ARGS+=	--with-system-gmp \
 			--with-gmp-libdir=${BUILDLINK_PREFIX.gmp}/lib
 
 CONFIGURE_DIRS=		libs/lua52
+CONFIGURE_DIRS+=	libs/luajit
 CONFIGURE_DIRS+=	texk/web2c
 
 INSTALLATION_DIRS+=	bin lib
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	post-configure
-SUBST_FILES.prefix=	libs/lua52/lua-5.2.4/src/luaconf.h
+SUBST_FILES.prefix=	libs/lua52/lua52-src/src/luaconf.h
 SUBST_VARS.prefix=	PREFIX
 
 CFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE_EXTENDED=0
diff --git a/print/luatex/distinfo b/print/luatex/distinfo
index 1891bb48f6f..ca745114d7b 100644
--- a/print/luatex/distinfo
+++ b/print/luatex/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.17 2015/12/12 19:11:47 markd Exp $
+$NetBSD: distinfo,v 1.18 2016/06/16 04:06:19 markd Exp $
 
-SHA1 (texlive-20150521-source.tar.xz) = a32df8d5d6b61f87f7dab907e864fb51b14f4143
-RMD160 (texlive-20150521-source.tar.xz) = fced0e58a7bd15d19e11d72baed23ac14fd2be13
-Size (texlive-20150521-source.tar.xz) = 45459552 bytes
-SHA1 (patch-ac) = 554c3236775f1ce6eac39434efd72f2ed3b14287
+SHA1 (texlive-20160523-source.tar.xz) = 8cdcc00492fc642db59a9a07f9ea080ff6765460
+RMD160 (texlive-20160523-source.tar.xz) = 4ffc4d92f8c6408c23a34815e2d4b0f4877d9c3f
+SHA512 (texlive-20160523-source.tar.xz) = 9fdd69d237238385240e918456f54791a38e57b573edf5df839c57e56a0009012b68b7b92298c3e137181325e2be84d7a84e9c7cf41ae9739bb3329d84194564
+Size (texlive-20160523-source.tar.xz) = 258176464 bytes
+SHA1 (patch-ac) = 1ee83833a03eace2eada892130ddb2198e829f3d
diff --git a/print/luatex/patches/patch-ac b/print/luatex/patches/patch-ac
index dd599f801f1..0f8483fdcf0 100644
--- a/print/luatex/patches/patch-ac
+++ b/print/luatex/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.6 2015/12/12 19:11:47 markd Exp $
+$NetBSD: patch-ac,v 1.7 2016/06/16 04:06:19 markd Exp $
 
 Prepare @PREFIX@ for substituting the correct one in from the pkgsrc Makefile.
 
 Solaris portability fix.
 
---- libs/lua52/lua-5.2.4/src/luaconf.h.orig	2013-04-05 10:58:37.000000000 +0000
-+++ libs/lua52/lua-5.2.4/src/luaconf.h
+--- libs/lua52/lua52-src/src/luaconf.h.orig	2013-04-05 10:58:37.000000000 +0000
++++ libs/lua52/lua52-src/src/luaconf.h
 @@ -102,7 +102,7 @@
  #else			/* }{ */