Update luatex to 0.80.0

version from texlive 2015.
two years worth of bug fixes and other changes.

7 files changed, 58 insertions, 286 deletions

diff --git a/print/luatex/Makefile b/print/luatex/Makefile
index 1f38c0eabff..0f6b35d3ec5 100644
--- a/print/luatex/Makefile
+++ b/print/luatex/Makefile
@@ -1,143 +1,78 @@
-# $NetBSD: Makefile,v 1.40 2015/11/23 10:30:17 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2015/12/12 19:11:47 markd Exp $
 
-DISTNAME=	luatex-beta-0.76.0-source
-PKGNAME=	${DISTNAME:S/-beta//:S/-source//}
-PKGREVISION=	11
+DISTNAME=	texlive-20150521-source
+PKGNAME=	luatex-0.80.0
 CATEGORIES=	print
-MASTER_SITES=	https://foundry.supelec.fr/frs/download.php/file/15745/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.luatex.org/
 COMMENT=	Extended version of pdfTeX using Lua
 LICENSE=	gnu-gpl-v2
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
-
-MAKE_JOBS_SAFE=no
-
-CONFLICTS+=	web2c<=7.5.7nb3
-DEPENDS+=	kpathsea>=6.0.1:../../print/kpathsea
+EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
+			${DISTNAME}/libs/lua52 \
+			${DISTNAME}/texk/web2c
 
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake pkg-config
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-source//}/source
-
-CONFIGURE_ARGS+=--enable-build-in-source-tree \
-		--enable-cxx-runtime-hack \
-		--disable-afm2pl    \
-		--disable-aleph  \
-		--disable-bibtex   \
-		--disable-bibtex8   \
-		--disable-cfftot1 \
-		--disable-cjkutils  \
-		--disable-detex    \
-		--disable-devnag   \
-		--disable-dialog   \
-		--disable-dtl      \
-		--enable-dump-share  \
-		--disable-dvi2tty  \
-		--disable-dvidvi   \
-		--disable-dviljk   \
-		--disable-dvipdfm  \
-		--disable-dvipdfmx \
-		--disable-dvipos  \
-		--disable-dvipsk  \
-		--disable-gsftopk \
-		--disable-lacheck \
-		--disable-lcdf-typetools \
-		--enable-luatex \
-		--disable-makeindexk \
-		--disable-mf  \
-		--disable-mmafm \
-		--disable-mmpfb \
-		--enable-mp \
-		--disable-musixflx \
-		--disable-otfinfo \
-		--disable-otftotfm  \
-		--disable-pdfopen  \
-		--disable-pdftex  \
-		--disable-ptex \
-		--disable-ps2eps   \
-		--disable-ps2pkm \
-		--disable-psutils  \
-		--disable-seetexk \
-		--disable-t1dotlessj  \
-		--disable-t1lint \
-		--disable-t1rawafm \
-		--disable-t1reencode \
-		--disable-t1testpage \
-		--disable-t1utils  \
-		--disable-tex    \
-		--disable-tex4htk \
-		--disable-tpic2pdftex  \
-		--disable-ttf2pk \
-		--disable-ttfdump \
-		--disable-ttftotype42 \
-		--disable-vlna  \
-		--disable-web-progs \
-		--disable-xdv2pdf \
-		--disable-xdvipdfmx \
-		--disable-xetex \
-		--with-system-freetype2 \
-		--without-system-gd \
-		--without-system-teckit \
-		--without-system-t1lib \
-		--without-x \
-		--disable-native-texlive-build \
-		--disable-shared    \
-		--disable-largefile
-CONFIGURE_ARGS+=--with-system-cairo
-CONFIGURE_ARGS+=--with-system-kpathsea \
-		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
-		--with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
-CONFIGURE_ARGS+=--with-system-libpng
-CONFIGURE_ARGS+=--with-system-pixman
-CONFIGURE_ARGS+=--with-system-poppler
-CONFIGURE_ARGS+=--with-system-zlib \
-		--with-zlib-include=${BUILDLINK_PREFIX.zlib}/include \
-		--with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
-CONFIGURE_ARGS+=--with-system-zziplib
-CONFIGURE_DIRS+=. texk/web2c
-MAKE_FLAGS+=	LIBTOOL=${LIBTOOL:Q}
-
-CFLAGS+=	-I${BUILDLINK_PREFIX.kpathsea}/lib
+USE_TOOLS+=	gmake lex perl pkg-config yacc
+CONFIGURE_ARGS+=	--disable-aleph --disable-etex --disable-pdftex \
+			--enable-luatex --disable-mf --disable-mf-nowin \
+			--disable-luajittex \
+			--disable-mp --disable-pmp --disable-upmp \
+			--disable-ptex --disable-eptex --disable-uptex --disable-euptex \
+			--disable-web-progs \
+			--enable-web2c --disable-xetex
+CONFIGURE_ARGS+=	--with-system-poppler
+CONFIGURE_ARGS+=	--with-system-xpdf
+CONFIGURE_ARGS+= \
+	--with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include \
+	--with-fontconfig-libdir=${BUILDLINK_PREFIX.fontconfig}/lib
+CONFIGURE_ARGS+=	--with-system-kpathsea
+CONFIGURE_ARGS+=	--with-system-zlib \
+	--with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
+	--with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
+CONFIGURE_ARGS+=	--with-system-cairo
+CONFIGURE_ARGS+=	--with-system-pixman
+CONFIGURE_ARGS+=	--with-system-libpng
+CONFIGURE_ARGS+=	--with-system-freetype2
+CONFIGURE_ARGS+=	--with-system-zziplib
+CONFIGURE_ARGS+=	--with-system-mpfr \
+			--with-mpfr-includes=${BUILDLINK_PREFIX.mpfr}/include \
+			--with-mpfr-libdir=${BUILDLINK_PREFIX.mpfr}/lib
+CONFIGURE_ARGS+=	--with-system-gmp \
+			--with-gmp-includes=${BUILDLINK_PREFIX.gmp}/include \
+			--with-gmp-libdir=${BUILDLINK_PREFIX.gmp}/lib
+
+CONFIGURE_DIRS=		libs/lua52
+CONFIGURE_DIRS+=	texk/web2c
+
+INSTALLATION_DIRS+=	bin lib
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	post-configure
-SUBST_FILES.prefix=	texk/web2c/luatexdir/lua51/luaconf.h
+SUBST_FILES.prefix=	libs/lua52/lua-5.2.4/src/luaconf.h
 SUBST_VARS.prefix=	PREFIX
 
-INSTALLATION_DIRS+=	bin
-
-.include "../../mk/bsd.prefs.mk"
-
-# Native clang crashes on FreeBSD 10:
-.if $(OPSYS) == "FreeBSD"
-BUILDLINK_TRANSFORM+=	opt:-O*:-O0
-.endif
+CFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE_EXTENDED=0
 
 .include "../../archivers/zziplib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../math/mpfr/buildlink3.mk"
+BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
 .include "../../print/kpathsea/buildlink3.mk"
-.include "../../print/poppler-includes/buildlink3.mk"
 .include "../../print/poppler/buildlink3.mk"
+.include "../../print/poppler-includes/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 
-post-extract:
-	${RM} -rf ${WRKSRC}/libs/zziplib
-	${RM} -rf ${WRKSRC}/texk/kpathsea
-	${ECHO} '#define luatex_svn_revision 4630' \
-		> ${WRKSRC}/texk/web2c/luatexdir/luatex_svnversion.h
-
 do-install:
-.for f in luatex
-	${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/${f} ${DESTDIR}${PREFIX}/bin
-.endfor
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libs/lua52/libtexlua52.la ${DESTDIR}${PREFIX}/lib
+	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/luatex ${DESTDIR}${PREFIX}/bin
 .for f in texlua texluac
 	${LN} -s luatex ${DESTDIR}${PREFIX}/bin/${f}
 .endfor
diff --git a/print/luatex/PLIST b/print/luatex/PLIST
index cc703bb33cd..3ca70a0b925 100644
--- a/print/luatex/PLIST
+++ b/print/luatex/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2010/09/13 04:11:52 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/12/12 19:11:47 markd Exp $
 bin/luatex
 bin/texlua
 bin/texluac
+lib/libtexlua52.la
diff --git a/print/luatex/distinfo b/print/luatex/distinfo
index adbbb26f6e4..1891bb48f6f 100644
--- a/print/luatex/distinfo
+++ b/print/luatex/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.16 2015/11/04 01:01:35 agc Exp $
+$NetBSD: distinfo,v 1.17 2015/12/12 19:11:47 markd Exp $
 
-SHA1 (luatex-0.76.0/luatex-beta-0.76.0-source.tar.bz2) = f139e728a16ae332ce323e28e19940169540e549
-RMD160 (luatex-0.76.0/luatex-beta-0.76.0-source.tar.bz2) = 7eec8c90ea21b4db70a0b6b6e874e96732822fd1
-SHA512 (luatex-0.76.0/luatex-beta-0.76.0-source.tar.bz2) = 71ea789a95d419bf177f7f9f8d24d00a9d5639665feadac93cc30c86531e4942d29d848ef39ca3698de3efb1b8da9eb19890b1a06b45664641c7e47a79dd80b0
-Size (luatex-0.76.0/luatex-beta-0.76.0-source.tar.bz2) = 11748576 bytes
-SHA1 (patch-ab) = a3c2d7aecb3117c5d2394af9a6919d25833410be
-SHA1 (patch-ac) = c8f633462cff3ed73a198d980f85f54c3fad953e
-SHA1 (patch-texk_web2c_luatexdir_image_epdf.h) = 8d890f5a83491b08c32cddd97401a1a9de94ccf4
-SHA1 (patch-texk_web2c_luatexdir_lua_lepdflib.cc) = de9574587b6837afbb0e211042d2c5fe7ccce3d2
+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
diff --git a/print/luatex/patches/patch-ab b/print/luatex/patches/patch-ab
deleted file mode 100644
index e19f6607f71..00000000000
--- a/print/luatex/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2014/04/29 20:07:28 wiz Exp $
-
-Do not build tangle and ctangle for this package.
-(These are in the web2c package.)
-
---- texk/web2c/Makefile.in.orig	2013-04-05 10:58:38.000000000 +0000
-+++ texk/web2c/Makefile.in
-@@ -53,7 +53,7 @@ host_triplet = @host@
- EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \
- 	mf-nowin$(EXEEXT) mpost$(EXEEXT) luatex$(EXEEXT) \
- 	txt2zlib$(EXEEXT)
--bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_2) \
-+bin_PROGRAMS = $(am__EXEEXT_2) \
- 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_3) \
- 	$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
- 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9)
diff --git a/print/luatex/patches/patch-ac b/print/luatex/patches/patch-ac
index fb5ca3ec317..dd599f801f1 100644
--- a/print/luatex/patches/patch-ac
+++ b/print/luatex/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.5 2014/04/29 20:07:28 wiz Exp $
+$NetBSD: patch-ac,v 1.6 2015/12/12 19:11:47 markd Exp $
 
 Prepare @PREFIX@ for substituting the correct one in from the pkgsrc Makefile.
 
 Solaris portability fix.
 
---- texk/web2c/luatexdir/lua52/luaconf.h.orig	2013-04-05 10:58:37.000000000 +0000
-+++ texk/web2c/luatexdir/lua52/luaconf.h
+--- 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
 @@ -102,7 +102,7 @@
  #else			/* }{ */
  
diff --git a/print/luatex/patches/patch-texk_web2c_luatexdir_image_epdf.h b/print/luatex/patches/patch-texk_web2c_luatexdir_image_epdf.h
deleted file mode 100644
index 1b8946b7b00..00000000000
--- a/print/luatex/patches/patch-texk_web2c_luatexdir_image_epdf.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-texk_web2c_luatexdir_image_epdf.h,v 1.1 2014/04/29 20:05:29 wiz Exp $
-
-Use changes from luatex-0.79 to fix build against poppler-0.26.
-
---- texk/web2c/luatexdir/image/epdf.h.orig	2014-04-29 19:50:55.000000000 +0000
-+++ texk/web2c/luatexdir/image/epdf.h
-@@ -37,6 +37,7 @@ extern "C" {
- #  include <sys/stat.h>
- #  include <dirent.h>
- #  include <poppler-config.h>
-+#  include <StructTreeRoot.h>
- #  include <goo/GooString.h>
- #  include <goo/gmem.h>
- #  include <goo/gfile.h>
diff --git a/print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc b/print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc
deleted file mode 100644
index 81e3ef65c0e..00000000000
--- a/print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc
+++ /dev/null
@@ -1,130 +0,0 @@
-$NetBSD: patch-texk_web2c_luatexdir_lua_lepdflib.cc,v 1.1 2014/04/29 20:05:29 wiz Exp $
-
-Use changes from luatex-0.79 to fix build against poppler-0.26.
-
---- texk/web2c/luatexdir/lua/lepdflib.cc.orig	2013-04-05 10:58:37.000000000 +0000
-+++ texk/web2c/luatexdir/lua/lepdflib.cc
-@@ -48,25 +48,26 @@ static const char *ErrorCodeNames[] = { 
- 
- //**********************************************************************
- 
--#define M_Annot            "Annot"
--#define M_Annots           "Annots"
--#define M_Array            "Array"
--#define M_Catalog          "Catalog"
--#define M_Dict             "Dict"
--#define M_EmbFile          "EmbFile"
--#define M_FileSpec         "FileSpec"
--#define M_GooString        "GooString"
--#define M_LinkDest         "LinkDest"
--#define M_Link             "Link"
--#define M_Links            "Links"
--#define M_Object           "Object"
--#define M_Page             "Page"
--#define M_PDFDoc           "PDFDoc"
--#define M_PDFRectangle     "PDFRectangle"
--#define M_Ref              "Ref"
--#define M_Stream           "Stream"
--#define M_XRefEntry        "XRefEntry"
--#define M_XRef             "XRef"
-+#define M_Annot            "epdf.Annot" /* ls-hh: epdf.* gives better protection in registry */
-+#define M_Annots           "epdf.Annots"
-+#define M_Array            "epdf.Array"
-+#define M_Catalog          "epdf.Catalog"
-+#define M_Dict             "epdf.Dict"
-+#define M_EmbFile          "epdf.EmbFile"
-+#define M_FileSpec         "epdf.FileSpec"
-+#define M_GooString        "epdf.GooString"
-+#define M_LinkDest         "epdf.LinkDest"
-+#define M_Link             "epdf.Link"
-+#define M_Links            "epdf.Links"
-+#define M_Object           "epdf.Object"
-+#define M_Page             "epdf.Page"
-+#define M_PDFDoc           "epdf.PDFDoc"
-+#define M_PDFRectangle     "epdf.PDFRectangle"
-+#define M_Ref              "epdf.Ref"
-+#define M_Stream           "epdf.Stream"
-+#define M_StructTreeRoot   "epdf.StructTreeRoot"
-+#define M_XRefEntry        "epdf.XRefEntry"
-+#define M_XRef             "epdf.XRef"
- 
- //**********************************************************************
- 
-@@ -96,6 +97,7 @@ new_poppler_userdata(Page);
- new_poppler_userdata(PDFRectangle);
- new_poppler_userdata(Ref);
- new_poppler_userdata(Stream);
-+new_poppler_userdata(StructTreeRoot);
- new_poppler_userdata(XRef);
- 
- //**********************************************************************
-@@ -573,7 +575,11 @@ static int m_Catalog_getPageRef(lua_Stat
- 
- m_poppler_get_GOOSTRING(Catalog, getBaseURI);
- m_poppler_get_GOOSTRING(Catalog, readMetadata);
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
- m_poppler_get_poppler(Catalog, Object, getStructTreeRoot);
-+#else
-+m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot);
-+#endif
- 
- static int m_Catalog_findPage(lua_State * L)
- {
-@@ -2146,14 +2152,22 @@ static int m_PDFDoc_readMetadata(lua_Sta
- 
- static int m_PDFDoc_getStructTreeRoot(lua_State * L)
- {
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
-     Object *obj;
-+#else
-+    StructTreeRoot *obj;
-+#endif
-     udstruct *uin, *uout;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
-     if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
-         obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
-         uout = new_Object_userdata(L);
-+#else
-+        uout = new_StructTreeRoot_userdata(L);
-+#endif
-         uout->d = obj;
-         uout->pc = uin->pc;
-         uout->pd = uin->pd;
-@@ -2617,6 +2631,15 @@ static const struct luaL_Reg XRefEntry_m
- 
- //**********************************************************************
- 
-+#ifdef LuajitTeX
-+#define setfuncs_meta(type)                 \
-+    luaL_newmetatable(L, M_##type);         \
-+    lua_pushvalue(L, -1);                   \
-+    lua_setfield(L, -2, "__index");         \
-+    lua_pushstring(L, "no user access");    \
-+    lua_setfield(L, -2, "__metatable");     \
-+    luaL_register(L, NULL, type##_m)
-+#else
- #define setfuncs_meta(type)                 \
-     luaL_newmetatable(L, M_##type);         \
-     lua_pushvalue(L, -1);                   \
-@@ -2624,6 +2647,7 @@ static const struct luaL_Reg XRefEntry_m
-     lua_pushstring(L, "no user access");    \
-     lua_setfield(L, -2, "__metatable");     \
-     luaL_setfuncs(L, type##_m, 0)
-+#endif
- 
- int luaopen_epdf(lua_State * L)
- {
-@@ -2646,6 +2670,10 @@ int luaopen_epdf(lua_State * L)
-     setfuncs_meta(XRef);
-     setfuncs_meta(XRefEntry);
- 
-+#ifdef LuajitTeX
-+    luaL_register(L, "epdf", epdflib_f);
-+#else
-     luaL_newlib(L, epdflib_f);
-+#endif
-     return 1;
- }