texlive: updated to 20190410

20190410: Kpathsea: More consistent brace expansion and path splitting; new variable TEXMFDOTDIR instead of hard-coded . in paths allows for easily searching additional or sub-directories (see comments in texmf.cnf). epTEX, eupTEX: New primitives \readpapersizespecial and \expanded. LuaTEX: Lua 5.3 now used, with concomitant arithmetic and interface changes. The homegrown library pplib is used to read pdf files, thus eliminating the dependency on poppler (and the need for C++); Lua interface changed accordingly. MetaPost: r-mpost command name recognized as an alias for invocation with the –restricted option, and added to the list of restricted commands available by default. Minimum precision now 2 for decimal and binary mode. Binary mode no longer available in MPlib but still available in standalone MetaPost. pdfTEX: New primitive \expanded; if new primitive parameter \pdfomitcharset is set to 1, the /CharSet string omitted from the PDF output, since it cannot feasibly be guaranteed correct, as required by PDF/A-2 and PDF/A-3. XeTEX: New primitives \expanded, \creationdate, \elapsedtime, \filedump, \filemoddate, \filesize, \resettimer, \normaldeviate, \uniformdeviate, \randomseed; extend \Ucharcat to produce active characters. tlmgr: Support curl as a download program; use lz4 and gzip before xz for local backups, if available; prefer system-provided binaries over binaries provided with TEX Live for compressor and download programs, unless the environment variable TEXLIVE_PREFER_OWN is set. install-tl: New option -gui (with no argument) is the default on Windows and Macs, and invokes a new Tcl/TK GUI (see sections 1.3 and 3.1.6). Utilities: cwebbin (https://ctan.org/pkg/cwebbin) is now the CWEB implementation in TEX Live, with support for more language dialects, and including the ctwill program to make mini-indexes. chkdvifont: report font information from DVI files, also from tfm/ofm, vf, gf, pk. dvispc: make a DVI file page-independent with respect to specials. MacTEX: x86_64-darwin now supports 10.12 and higher (Sierra, High Sierra, Mojave); x86_64-darwinlegacy still supports 10.6 and newer. The spell checker Excalibur is no longer included, since it requires 32-bit support. Platforms: removed sparc-solaris.
author: adam <adam@pkgsrc.org> 2019-05-09 09:47:34 +0000
committer: adam <adam@pkgsrc.org> 2019-05-09 09:47:34 +0000
commit: 986656d34c35c7f478a481b7c3cf66e265113132 (patch)
tree: f204f2fc6109c43594a52133b6e1e272d0a8fa1b
parent: efe6a82b83640e5463562f6be37f855c6ded97f6 (diff)
download: pkgsrc-986656d34c35c7f478a481b7c3cf66e265113132.tar.gz
63 files changed, 452 insertions, 1115 deletions
diff --git a/converters/dvi2tty/Makefile b/converters/dvi2tty/Makefile
index 1bf6997bc22..915098bf577 100644
--- a/converters/dvi2tty/Makefile
+++ b/converters/dvi2tty/Makefile
@@ -1,28 +1,19 @@
-# $NetBSD: Makefile,v 1.19 2018/05/13 12:01:26 markd Exp $
-#
+# $NetBSD: Makefile,v 1.20 2019/05/09 09:47:34 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	dvi2tty-6.0.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	converters
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Program for previewing DVI files
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/dvi2tty
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/dvi2tty
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/dvi2tty
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
 CONFIGURE_ARGS+=	--with-system-kpathsea
 CONFIGURE_ARGS+=	--with-system-ptexenc
 
diff --git a/converters/dvi2tty/distinfo b/converters/dvi2tty/distinfo
index cd1e5edcb9f..ba2a9003abd 100644
--- a/converters/dvi2tty/distinfo
+++ b/converters/dvi2tty/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2018/05/13 12:01:26 markd Exp $
+$NetBSD: distinfo,v 1.10 2019/05/09 09:47:34 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/fonts/afm2pl/Makefile b/fonts/afm2pl/Makefile
index 4e05efeb179..057ba7aa109 100644
--- a/fonts/afm2pl/Makefile
+++ b/fonts/afm2pl/Makefile
@@ -1,28 +1,20 @@
-# $NetBSD: Makefile,v 1.5 2018/05/13 12:03:52 markd Exp $
+# $NetBSD: Makefile,v 1.6 2019/05/09 09:47:34 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	afm2pl-0.7.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	fonts
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	Convert an Adobe font metric file to a TeX font property list
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/afm2pl
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/afm2pl
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/afm2pl
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
 CONFIGURE_ARGS+=	--with-system-kpathsea
 
 BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
diff --git a/fonts/afm2pl/distinfo b/fonts/afm2pl/distinfo
index 73d891af153..6b7e9072857 100644
--- a/fonts/afm2pl/distinfo
+++ b/fonts/afm2pl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2018/05/13 12:03:52 markd Exp $
+$NetBSD: distinfo,v 1.7 2019/05/09 09:47:34 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/fonts/gsftopkk/Makefile b/fonts/gsftopkk/Makefile
index aa114be1753..a04d645dc4f 100644
--- a/fonts/gsftopkk/Makefile
+++ b/fonts/gsftopkk/Makefile
@@ -1,30 +1,22 @@
-# $NetBSD: Makefile,v 1.14 2018/05/13 12:06:11 markd Exp $
+# $NetBSD: Makefile,v 1.15 2019/05/09 09:47:34 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	gsftopkk-1.19.2
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://math.berkeley.edu/~vojta/gsftopk.html
 COMMENT=	Tool to convert bitmaps to .pk format
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/gsftopk
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/gsftopk
 
-GNU_CONFIGURE=	yes
-INFO_FILES=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gs:run pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/gsftopk
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
+USE_TOOLS+=		gs:run
 CONFIGURE_ARGS+=	--with-system-kpathsea
-CPPFLAGS+=	-DGS_PATH='"${TOOLS_PATH.gs}"'
+CPPFLAGS+=		-DGS_PATH='"${TOOLS_PATH.gs}"'
+INFO_FILES=		yes
 
 TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf-dist
 
diff --git a/fonts/gsftopkk/distinfo b/fonts/gsftopkk/distinfo
index 6714f89dcfc..d544ed02368 100644
--- a/fonts/gsftopkk/distinfo
+++ b/fonts/gsftopkk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2018/05/13 12:06:11 markd Exp $
+$NetBSD: distinfo,v 1.12 2019/05/09 09:47:34 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/fonts/lcdftypetools/Makefile b/fonts/lcdftypetools/Makefile
index d47a8fd5978..322afe96ba4 100644
--- a/fonts/lcdftypetools/Makefile
+++ b/fonts/lcdftypetools/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2018/05/13 12:09:31 markd Exp $
+# $NetBSD: Makefile,v 1.8 2019/05/09 09:47:34 adam Exp $
 
-DISTNAME=	texlive-20180414-source
-PKGNAME=	lcdftypetools-2.107
+.include "../../print/texlive/Makefile.common"
+
+PKGNAME=	lcdftypetools-2.108
 CATEGORIES=	fonts
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ctan.org/pkg/lcdf-typetools
@@ -13,18 +12,11 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	tex-glyphlist-[0-9]*:../../fonts/tex-glyphlist
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/lcdf-typetools
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/lcdf-typetools
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_LANGUAGES=	c c++11
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/lcdf-typetools
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
+USE_LANGUAGES=		c c++11
 CONFIGURE_ARGS+=	--with-system-kpathsea
 
 BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
diff --git a/fonts/lcdftypetools/distinfo b/fonts/lcdftypetools/distinfo
index 8f230b374f5..b3a2b9f2a14 100644
--- a/fonts/lcdftypetools/distinfo
+++ b/fonts/lcdftypetools/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2018/05/13 12:09:31 markd Exp $
+$NetBSD: distinfo,v 1.7 2019/05/09 09:47:34 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
 SHA1 (patch-lcdf-typetools-2.100_Makefile.in) = a9094c3e9561d6eaefd643d99c9eb9c90281b9a6
diff --git a/fonts/ps2pkm/Makefile b/fonts/ps2pkm/Makefile
index 1497ad1c26d..10ae63eaa98 100644
--- a/fonts/ps2pkm/Makefile
+++ b/fonts/ps2pkm/Makefile
@@ -1,27 +1,19 @@
-# $NetBSD: Makefile,v 1.13 2018/05/13 12:11:46 markd Exp $
+# $NetBSD: Makefile,v 1.14 2019/05/09 09:47:34 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	ps2pkm-1.8
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	Tool to convert PostSCript fonts into TeX PK fonts
 
 DEPENDS+=	kpathsea>=6.0.1:../../print/kpathsea
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/ps2pk
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/ps2pk
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ps2pk
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
 
 CONFIGURE_ARGS+=	--with-system-kpathsea
 
diff --git a/fonts/ps2pkm/distinfo b/fonts/ps2pkm/distinfo
index 84baa8b5099..d88fcbd1846 100644
--- a/fonts/ps2pkm/distinfo
+++ b/fonts/ps2pkm/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.13 2018/05/13 12:11:46 markd Exp $
+$NetBSD: distinfo,v 1.14 2019/05/09 09:47:34 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
-SHA1 (patch-type1.c) = bb51988a641764440cb66b14d1e68c748e83e572
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/fonts/ttf2pk/Makefile b/fonts/ttf2pk/Makefile
index 891d3253661..a6003baa12f 100644
--- a/fonts/ttf2pk/Makefile
+++ b/fonts/ttf2pk/Makefile
@@ -1,34 +1,24 @@
-# $NetBSD: Makefile,v 1.36 2018/05/13 12:14:17 markd Exp $
+# $NetBSD: Makefile,v 1.37 2019/05/09 09:47:34 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	ttf2pk-2.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	fonts print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	bernhard@SDG.de
 HOMEPAGE=	https://www.freetype.org/
 COMMENT=	TrueType to TeX PK font converter
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/ttf2pk2
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/ttf2pk2
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ttf2pk2
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
 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-zlib
+CONFIGURE_ARGS+=	--with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+=	--with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
 CONFIGURE_ARGS+=	--with-system-freetype2
-CONFIGURE_ENV+=		FT2_CONFIG=pkg-config \
-			PKG_CONFIG=${TOOLS_CMD.pkg-config}
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/fonts/ttf2pk/distinfo b/fonts/ttf2pk/distinfo
index ddef38f244e..ef55c850ff0 100644
--- a/fonts/ttf2pk/distinfo
+++ b/fonts/ttf2pk/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.12 2018/05/13 12:14:17 markd Exp $
+$NetBSD: distinfo,v 1.13 2019/05/09 09:47:34 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
 SHA1 (patch-Makefile.in) = 99eca5218f4ac6ac33302d0f06c168f9a2208ca7
-SHA1 (patch-configure) = 5b345f05cb3c76acb6668e04338ea8f8054b5eae
diff --git a/fonts/ttf2pk/patches/patch-configure b/fonts/ttf2pk/patches/patch-configure
deleted file mode 100644
index 937cd86e95d..00000000000
--- a/fonts/ttf2pk/patches/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2018/05/05 12:31:25 minskim Exp $
-
-freetype-config is deprecated.
-
---- configure.orig	2017-01-10 23:13:02.000000000 +0000
-+++ configure
-@@ -15165,9 +15165,9 @@ esac
- else
-   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
- fi
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
--  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
--  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
-+if $PKG_CONFIG --version >/dev/null 2>&1; then
-+  FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
-+  FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
- elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
-   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
- fi
diff --git a/fonts/ttfdump/Makefile b/fonts/ttfdump/Makefile
index 7a2a5ddf180..aa64a61246c 100644
--- a/fonts/ttfdump/Makefile
+++ b/fonts/ttfdump/Makefile
@@ -1,28 +1,19 @@
-# $NetBSD: Makefile,v 1.8 2018/05/13 12:16:18 markd Exp $
+# $NetBSD: Makefile,v 1.9 2019/05/09 09:47:35 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	ttfdump-0.5.5
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	fonts
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	https://www.freetype.org/
 COMMENT=	TrueType font dumper
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/ttfdump
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/ttfdump
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ttfdump
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
 CONFIGURE_ARGS+=	--with-system-kpathsea
 
 BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
diff --git a/fonts/ttfdump/distinfo b/fonts/ttfdump/distinfo
index ca76eb91ce5..0cdd653fc5f 100644
--- a/fonts/ttfdump/distinfo
+++ b/fonts/ttfdump/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2018/05/13 12:16:18 markd Exp $
+$NetBSD: distinfo,v 1.8 2019/05/09 09:47:35 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/print/cjkutils/Makefile b/print/cjkutils/Makefile
index 99569139ec9..a6dc5985e7d 100644
--- a/print/cjkutils/Makefile
+++ b/print/cjkutils/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2018/05/13 12:22:46 markd Exp $
+# $NetBSD: Makefile,v 1.11 2019/05/09 09:47:35 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	cjkutils-4.8.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	rxg@NetBSD.org,hubertf@NetBSD.org
 HOMEPAGE=	https://cjk.ffii.org/
@@ -13,19 +12,12 @@ COMMENT=	Utilities for CJK LaTeX
 
 DEPENDS+=	tex-cjkutils>=4.8.3:../../print/tex-cjkutils
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/cjkutils
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/cjkutils
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/cjkutils
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
 CONFIGURE_ARGS+=	--with-system-kpathsea
-
-INSTALL_TARGET=	install-exec-am install-man
+INSTALL_TARGET=		install-exec-am install-man
 
 BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
 .include "../../print/kpathsea/buildlink3.mk"
diff --git a/print/cjkutils/distinfo b/print/cjkutils/distinfo
index 115ebbd1286..dcfe44a7d8a 100644
--- a/print/cjkutils/distinfo
+++ b/print/cjkutils/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2018/05/13 12:22:46 markd Exp $
+$NetBSD: distinfo,v 1.9 2019/05/09 09:47:35 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/print/dvidvi/Makefile b/print/dvidvi/Makefile
index 74eb16a3859..676ad9bdf73 100644
--- a/print/dvidvi/Makefile
+++ b/print/dvidvi/Makefile
@@ -1,27 +1,18 @@
-# $NetBSD: Makefile,v 1.15 2018/05/13 12:24:31 markd Exp $
-#
+# $NetBSD: Makefile,v 1.16 2019/05/09 09:47:35 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	dvidvi-1.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Select and/or rearrange pages in a TeX dvi file
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/dvidvi
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/dvidvi
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/dvidvi
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
 CONFIGURE_ARGS+=	--with-system-kpathsea
 
 BUILDLINK_DEPMETHOD.kpathsea=	build
diff --git a/print/dvidvi/distinfo b/print/dvidvi/distinfo
index 8314ad64764..0d31b615131 100644
--- a/print/dvidvi/distinfo
+++ b/print/dvidvi/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2018/05/13 12:24:31 markd Exp $
+$NetBSD: distinfo,v 1.7 2019/05/09 09:47:35 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/print/dviljk/Makefile b/print/dviljk/Makefile
index 9e10cac1d53..5dc620d673d 100644
--- a/print/dviljk/Makefile
+++ b/print/dviljk/Makefile
@@ -1,27 +1,18 @@
-# $NetBSD: Makefile,v 1.14 2018/05/13 12:26:15 markd Exp $
+# $NetBSD: Makefile,v 1.15 2019/05/09 09:47:35 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	dviljk-2.6.5
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	DVI driver for the LaserJet printers using kpathsea
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/dviljk
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/dviljk
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/dviljk
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
 CONFIGURE_ARGS+=	--with-system-kpathsea
 
 BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
diff --git a/print/dviljk/distinfo b/print/dviljk/distinfo
index 8aef83aa11b..5982596cdd3 100644
--- a/print/dviljk/distinfo
+++ b/print/dviljk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2018/05/13 12:26:15 markd Exp $
+$NetBSD: distinfo,v 1.12 2019/05/09 09:47:35 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index c7ddfcb37cd..886fac2ba38 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.50 2018/05/13 12:29:00 markd Exp $
+# $NetBSD: Makefile,v 1.51 2019/05/09 09:47:35 adam Exp $
 
-DISTNAME=	texlive-20180414-source
-PKGNAME=	dvipdfmx-20180217
+.include "../../print/texlive/Makefile.common"
+
+PKGNAME=	dvipdfmx-20190225
 CATEGORIES=	print converters
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://project.ktug.or.kr/dvipdfmx/
 COMMENT=	DVI to PDF converter with CID-keyed font support
+LICENSE=	gnu-gpl-v2
 
 CONFLICTS+=	dvipdfm-[0-9]*
 CONFLICTS+=	ja-dvipdfm-[0-9]*
@@ -17,24 +16,18 @@ DEPENDS+=	tex-dvipdfmx-[0-9]*:../../print/tex-dvipdfmx
 DEPENDS+=	tex-pdftex-[0-9]*:../../print/tex-pdftex
 DEPENDS+=	tex-texlive-scripts-[0-9]*:../../print/tex-texlive-scripts
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/dvipdfm-x
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/dvipdfm-x
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/dvipdfm-x
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
 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-zlib
+CONFIGURE_ARGS+=	--with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+=	--with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
 CONFIGURE_ARGS+=	--with-system-libpng
-CONFIGURE_ARGS+=	--with-system-libpaper \
-		--with-libpaper-includes=${BUILDLINK_PREFIX.libpaper}/include \
-		--with-libpaper-libdir=${BUILDLINK_PREFIX.libpaper}/lib
+CONFIGURE_ARGS+=	--with-system-libpaper
+CONFIGURE_ARGS+=	--with-libpaper-includes=${BUILDLINK_PREFIX.libpaper}/include
+CONFIGURE_ARGS+=	--with-libpaper-libdir=${BUILDLINK_PREFIX.libpaper}/lib
 
 PKG_SYSCONFSUBDIR=	texmf
 
@@ -47,13 +40,13 @@ SUBST_MESSAGE.paths=	Setting paths to commands.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	data/dvipdfmx.cfg src/dvipdft
 SUBST_SED.paths=	-e 's,@DVIPDFM@,${PREFIX}/bin/dvipdfm,g'
-SUBST_SED.paths+=	-e 's,@RUNGS@,${LOCALBASE}/bin/rungs,g'
+SUBST_SED.paths+=	-e 's,@RUNGS@,${PREFIX}/bin/rungs,g'
 
 TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR}
 TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf-dist
 
-.include "../../graphics/png/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
 .include "../../print/kpathsea/buildlink3.mk"
 .include "../../print/kpathsea/texmf.mk"
diff --git a/print/dvipdfmx/distinfo b/print/dvipdfmx/distinfo
index b02ca2ea07a..ebb553e27a4 100644
--- a/print/dvipdfmx/distinfo
+++ b/print/dvipdfmx/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2018/05/13 12:29:00 markd Exp $
+$NetBSD: distinfo,v 1.18 2019/05/09 09:47:35 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
 SHA1 (patch-Makefile.in) = 526a2eab50395bcc9c0f2aa11a0d20034f93a02b
 SHA1 (patch-ac) = 2bbaa28a6cf16c8a14b0f190387d6443c6b260d9
 SHA1 (patch-ad) = a9d724566920535e28204cf8014467297f3f7bcb
diff --git a/print/dvipdfmx/map.mk b/print/dvipdfmx/map.mk
index bc53f826f9d..ffd102fa0e6 100644
--- a/print/dvipdfmx/map.mk
+++ b/print/dvipdfmx/map.mk
@@ -1,4 +1,4 @@
-# $NetBSD: map.mk,v 1.9 2010/01/16 03:52:41 minskim Exp $
+# $NetBSD: map.mk,v 1.10 2019/05/09 09:47:35 adam Exp $
 # This Makefile fragment is intended to be included by packages that
 # install font maps used by dvipdfmx.  It takes care of adding and
 # removing font map entires in dvipdfmx.cfg.
@@ -19,7 +19,7 @@ DEPENDS+=		dvipdfmx>=0.0.0.20070518:../../print/dvipdfmx
 .endif
 
 FILES_SUBST+=		DVIPDFMX_FONTMAPS=${DVIPDFMX_FONTMAPS:Q}
-FILES_SUBST+=		DVIPDFMX_CONFIG_DIR="${LOCALBASE}/share/texmf/dvipdfmx"
+FILES_SUBST+=		DVIPDFMX_CONFIG_DIR="${PREFIX}/share/texmf/dvipdfmx"
 INSTALL_TEMPLATES+=	../../print/dvipdfmx/files/map.tmpl
 DEINSTALL_TEMPLATES+=	../../print/dvipdfmx/files/map.tmpl
 
diff --git a/print/dvipsk/Makefile b/print/dvipsk/Makefile
index f8ff55e8ea6..ca80cc563eb 100644
--- a/print/dvipsk/Makefile
+++ b/print/dvipsk/Makefile
@@ -1,27 +1,20 @@
-# $NetBSD: Makefile,v 1.22 2019/04/28 11:31:13 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2019/05/09 09:47:35 adam Exp $
 
-DISTNAME=	texlive-20180414-source
-PKGNAME=	dvipsk-5.998
-PKGREVISION=	1
+.include "../../print/texlive/Makefile.common"
+
+PKGNAME=	dvipsk-5.999
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.radicaleye.com/dvips.html
 COMMENT=	DVI-to-PostScript translator
 
 BUILD_DEPENDS+=	tex-tetex-[0-9]*:../../print/tex-tetex
 DEPENDS+=	tex-dvips>=2013:../../print/tex-dvips
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/dvipsk
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/dvipsk
 
 INFO_FILES=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 
-GNU_CONFIGURE=		yes
 # texk/dvipsk/squeeze/configure doesn't know --with-system-kpathsea
 GNU_CONFIGURE_STRICT=	no
 CONFIGURE_DIRS=		texk/dvipsk
@@ -42,15 +35,11 @@ INSTALLATION_DIRS+=	share/examples/dvipsk
 TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR}
 TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf-dist
 
-BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
-.include "../../print/kpathsea/buildlink3.mk"
-.include "../../print/kpathsea/texmf.mk"
-
 post-build:
-	${MKDIR} -p ${WRKSRC}/texk/dvipsk/texmf-dist/dvips/config
+	${MKDIR} ${WRKSRC}/texk/dvipsk/texmf-dist/dvips/config
 	${CP} ${LOCALBASE}/share/texmf-dist/dvips/config/config.ps \
 		${WRKSRC}/texk/dvipsk/texmf-dist/dvips/config
-	env TEXMFCONFIG=${LOCALBASE}/share/texmf-dist \
+	${SETENV} TEXMFCONFIG=${LOCALBASE}/share/texmf-dist \
 		TFC_TEXMFCONFIG=${WRKSRC}/texk/dvipsk/texmf \
 		configPsFile=${WRKSRC}/texk/dvipsk/texmf-dist/dvips/config/config.ps \
 		${LOCALBASE}/bin/texconfig dvips paper ${LOWER_PAPERSIZE}
@@ -59,4 +48,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/texk/dvipsk/texmf-dist/dvips/config/config.ps \
 		${DESTDIR}${PREFIX}/share/examples/dvipsk
 
+BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
+.include "../../print/kpathsea/buildlink3.mk"
+.include "../../print/kpathsea/texmf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/dvipsk/distinfo b/print/dvipsk/distinfo
index 28e5c4b744d..b620b040c5e 100644
--- a/print/dvipsk/distinfo
+++ b/print/dvipsk/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.17 2018/11/01 10:55:57 markd Exp $
+$NetBSD: distinfo,v 1.18 2019/05/09 09:47:35 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
-SHA1 (patch-texk_dvipsk_writet1.c) = dee47f8382a33c0b246163e248d42df544b315d2
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/print/dvipsk/patches/patch-texk_dvipsk_writet1.c b/print/dvipsk/patches/patch-texk_dvipsk_writet1.c
deleted file mode 100644
index 0e34684da36..00000000000
--- a/print/dvipsk/patches/patch-texk_dvipsk_writet1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-texk_dvipsk_writet1.c,v 1.1 2018/11/01 10:55:57 markd Exp $
-
-writet1 protection against buffer overflow
-
-git-svn-id: svn://tug.org/texlive/trunk/Build/source@48697 c570f23f-e606-0410-a88d-b1316a301751
-
---- texk/dvipsk/writet1.c.orig	2016-11-25 18:24:26.000000000 +0000
-+++ texk/dvipsk/writet1.c
-@@ -1449,7 +1449,9 @@ static void t1_check_unusual_charstring(
-         *(strend(t1_buf_array) - 1) = ' ';
- 
-         t1_getline();
-+	alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE);
-         strcat(t1_buf_array, t1_line_array);
-+	alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE);
-         strcpy(t1_line_array, t1_buf_array);
-         t1_line_ptr = eol(t1_line_array);
-     }
diff --git a/print/kpathsea/Makefile b/print/kpathsea/Makefile
index 7379690073b..f3a449b2dc3 100644
--- a/print/kpathsea/Makefile
+++ b/print/kpathsea/Makefile
@@ -1,32 +1,24 @@
-# $NetBSD: Makefile,v 1.30 2018/05/13 12:36:28 markd Exp $
+# $NetBSD: Makefile,v 1.31 2019/05/09 09:47:35 adam Exp $
 
-DISTNAME=	texlive-20180414-source
-PKGNAME=	kpathsea-6.3.0
+.include "../../print/texlive/Makefile.common"
+
+PKGNAME=	kpathsea-6.3.1
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://ctan.org/pkg/kpathsea
 COMMENT=	Path searching library for TeX-related files
 LICENSE=	gnu-lgpl-v2.1
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/kpathsea
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/kpathsea
 
-GNU_CONFIGURE=	yes
-INFO_FILES=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/kpathsea
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
+USE_TOOLS+=		gmake
 PKGCONFIG_OVERRIDE=	kpathsea.pc.in
+INFO_FILES=		yes
 
 MAKE_FLAGS+=	LIBTOOL=${LIBTOOL:Q}
 
-#
 # A double-slash (//) in the kpathsea paths has a special
 # interpretation, it will cause kpathsea to consider all
 # subdirectories recursively at that point in the path.  Normally
diff --git a/print/kpathsea/distinfo b/print/kpathsea/distinfo
index 06c2678c83d..0ea6f1917c2 100644
--- a/print/kpathsea/distinfo
+++ b/print/kpathsea/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2018/05/13 12:36:28 markd Exp $
+$NetBSD: distinfo,v 1.24 2019/05/09 09:47:35 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
 SHA1 (patch-aa) = 049aa9e8655c749ba168316fe6a4af453c3c9194
 SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0
 SHA1 (patch-ad) = 3c2629948dca3157c64078220537e96f66956289
diff --git a/print/kpathsea/texmf.mk b/print/kpathsea/texmf.mk
index 066a0fab4f5..34978ed0887 100644
--- a/print/kpathsea/texmf.mk
+++ b/print/kpathsea/texmf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texmf.mk,v 1.9 2018/07/19 12:57:38 leot Exp $
+# $NetBSD: texmf.mk,v 1.10 2019/05/09 09:47:35 adam Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install TeX packages.  It rebuilds the ls-R databases at
@@ -27,18 +27,18 @@ TEX_TEXMF_MK=		# defined
 DEPENDS+=		kpathsea>=3.5.7:../../print/kpathsea
 
 TEX_TEXMF_DIRS?=	${PREFIX}/share/texmf-dist
-FILES_SUBST+=		MKTEXLSR=${LOCALBASE}/bin/mktexlsr
+FILES_SUBST+=		MKTEXLSR=${PREFIX}/bin/mktexlsr
 FILES_SUBST+=		TEXMF_DIRS=${TEX_TEXMF_DIRS:Q}
 .if !empty(TEX_TEXMF_DIRS)
 INSTALL_TEMPLATES+=	../../print/kpathsea/files/texmf-install.tmpl
 DEINSTALL_TEMPLATES+=	../../print/kpathsea/files/texmf-deinstall.tmpl
 .endif
 
-.  if !empty(TEX_CONFIG_NAMES)
+.if !empty(TEX_CONFIG_NAMES)
 FILES_SUBST+=		CONFIG_NAMES=${TEX_CONFIG_NAMES:Q}
 INSTALL_TEMPLATES+=	../../print/kpathsea/files/config-install.tmpl
 DEINSTALL_TEMPLATES+=	../../print/kpathsea/files/config-deinstall.tmpl
-.  endif
+.endif
 
 .if !empty(TEX_FORMATS)
 .  include "../../print/tex-tetex/format.mk"
diff --git a/print/lacheck/Makefile b/print/lacheck/Makefile
index a3621f6117a..586f5356545 100644
--- a/print/lacheck/Makefile
+++ b/print/lacheck/Makefile
@@ -1,25 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2018/05/13 12:39:23 markd Exp $
+# $NetBSD: Makefile,v 1.6 2019/05/09 09:47:35 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	lacheck-1.28
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	LaTeX checker
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/utils/lacheck
+EXTRACT_ELEMENTS+=	${DISTNAME}/utils/lacheck
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/utils/lacheck
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/lacheck/distinfo b/print/lacheck/distinfo
index 8fc8ddc4986..0d31b615131 100644
--- a/print/lacheck/distinfo
+++ b/print/lacheck/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2018/05/13 12:39:23 markd Exp $
+$NetBSD: distinfo,v 1.7 2019/05/09 09:47:35 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/print/luatex/Makefile b/print/luatex/Makefile
index c636791d902..8d0aab364ff 100644
--- a/print/luatex/Makefile
+++ b/print/luatex/Makefile
@@ -1,67 +1,81 @@
-# $NetBSD: Makefile,v 1.84 2019/04/28 13:15:25 rillig Exp $
+# $NetBSD: Makefile,v 1.85 2019/05/09 09:47:35 adam Exp $
 
-DISTNAME=	texlive-20180414-source
-PKGNAME=	luatex-1.07.0
-PKGREVISION=	12
+.include "../../print/texlive/Makefile.common"
+
+PKGNAME=	luatex-1.10.0
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
-HOMEPAGE=	http://www.luatex.org/
+HOMEPAGE=	http://www.tug.org/web2c/
 COMMENT=	Extended version of pdfTeX using Lua
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/libs/lua52 \
-			${DISTNAME}/libs/luajit \
-			${DISTNAME}/texk/web2c
+EXTRACT_ELEMENTS+=	${DISTNAME}/libs/lua53
+EXTRACT_ELEMENTS+=	${DISTNAME}/libs/luajit
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/web2c
 
-GNU_CONFIGURE=		yes
-GNU_CONFIGURE_STRICT=	no # libs/lua52 doesn't know all the below options
 USE_LANGUAGES=		c99 c++11
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake gsed lex perl pkg-config yacc
-CONFIGURE_ARGS+=	--disable-aleph --disable-etex --disable-pdftex \
-			--enable-luatex --disable-mf --disable-mf-nowin \
-			--with-x=no \
-			--disable-luatex53 --disable-luajittex --disable-mfluajit \
-			--disable-mp --disable-pmp --disable-upmp \
-			--disable-ptex --disable-eptex --disable-uptex --disable-euptex \
-			--disable-web-progs \
-			--enable-web2c --disable-xetex
+USE_TOOLS+=		gmake gsed lex perl yacc
+GNU_CONFIGURE_STRICT=	no # libs
+CONFIGURE_ARGS+=	--disable-aleph
+CONFIGURE_ARGS+=	--disable-eptex
+CONFIGURE_ARGS+=	--disable-etex
+CONFIGURE_ARGS+=	--disable-euptex
+CONFIGURE_ARGS+=	--disable-mf
+CONFIGURE_ARGS+=	--disable-mf-nowin
+CONFIGURE_ARGS+=	--disable-luajittex
+CONFIGURE_ARGS+=	--disable-mfluajit
+CONFIGURE_ARGS+=	--disable-mp
+CONFIGURE_ARGS+=	--disable-pdftex
+CONFIGURE_ARGS+=	--disable-pmp
+CONFIGURE_ARGS+=	--disable-ptex
+CONFIGURE_ARGS+=	--disable-upmp
+CONFIGURE_ARGS+=	--disable-uptex
+CONFIGURE_ARGS+=	--disable-web-progs
+CONFIGURE_ARGS+=	--disable-xetex
+CONFIGURE_ARGS+=	--enable-luatex
+CONFIGURE_ARGS+=	--enable-web2c
 CONFIGURE_ARGS+=	--with-system-poppler
-CONFIGURE_ARGS+= \
-	--with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include \
-	--with-fontconfig-libdir=${BUILDLINK_PREFIX.fontconfig}/lib
+CONFIGURE_ARGS+=	--with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include
+CONFIGURE_ARGS+=	--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-zlib
+CONFIGURE_ARGS+=	--with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+=	--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_ARGS+=	--with-system-mpfr
+CONFIGURE_ARGS+=	--with-mpfr-includes=${BUILDLINK_PREFIX.mpfr}/include
+CONFIGURE_ARGS+=	--with-mpfr-libdir=${BUILDLINK_PREFIX.mpfr}/lib
+CONFIGURE_ARGS+=	--with-system-gmp
+CONFIGURE_ARGS+=	--with-gmp-includes=${BUILDLINK_PREFIX.gmp}/include
+CONFIGURE_ARGS+=	--with-gmp-libdir=${BUILDLINK_PREFIX.gmp}/lib
+CONFIGURE_ARGS+=	--without-x
 
-CONFIGURE_DIRS=		libs/lua52
+CONFIGURE_DIRS=		libs/lua53
 CONFIGURE_DIRS+=	texk/web2c
 
 INSTALLATION_DIRS+=	bin lib
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	post-configure
-SUBST_FILES.prefix=	libs/lua52/lua52-src/src/luaconf.h
+SUBST_FILES.prefix=	libs/lua53/lua53-src/src/luaconf.h
 SUBST_VARS.prefix=	PREFIX
 
 CPPFLAGS.SunOS+=	-D_XOPEN_SOURCE_EXTENDED=0
 
+pre-configure:
+	# Ensure we generate our patched version
+	${RM} -f libs/luajit/lj_vm_asm.S
+
+do-install:
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libs/lua53/libtexlua53.la ${DESTDIR}${PREFIX}/lib
+	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/luatex ${DESTDIR}${PREFIX}/bin
+	${LN} -f -s luatex ${DESTDIR}${PREFIX}/bin/texlua
+	${LN} -f -s luatex ${DESTDIR}${PREFIX}/bin/texluac
+
 .include "../../archivers/zziplib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
@@ -72,16 +86,4 @@ BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
 .include "../../print/poppler/buildlink3.mk"
 .include "../../print/poppler-includes/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
-
-pre-configure:
-	# Ensure we generate our patched version
-	${RM} -f libs/luajit/lj_vm_asm.S
-
-do-install:
-	${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
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/luatex/PLIST b/print/luatex/PLIST
index 3ca70a0b925..55d262cb8a6 100644
--- a/print/luatex/PLIST
+++ b/print/luatex/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2015/12/12 19:11:47 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/05/09 09:47:35 adam Exp $
 bin/luatex
 bin/texlua
 bin/texluac
-lib/libtexlua52.la
+lib/libtexlua53.la
diff --git a/print/luatex/distinfo b/print/luatex/distinfo
index 61e0e9d962f..fb571e609f7 100644
--- a/print/luatex/distinfo
+++ b/print/luatex/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.34 2019/02/17 11:17:37 tnn Exp $
+$NetBSD: distinfo,v 1.35 2019/05/09 09:47:35 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
-SHA1 (patch-ac) = 1ee83833a03eace2eada892130ddb2198e829f3d
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
+SHA1 (patch-libs_lua53_lua53-src_src_luaconf.h) = 824ee4ba2c324e1e01967b82a54621b6b6f3edd3
 SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69
 SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 491d33adbbaab8b2b81a65a8d7ba30aee775b75f
-SHA1 (patch-texk_web2c_luatexdir_font_writet1.w) = c5d9b0bf411ff67028cbeee629bebc95f05c94e3
-SHA1 (patch-texk_web2c_luatexdir_image_pdftoepdf.w) = d3e5d16e75acefbb5a2bad56074d86928dd23061
-SHA1 (patch-texk_web2c_luatexdir_lua_lepdflib.cc) = e1dafa2bdc0a92e485839b86006bd4b1a8076ee8
diff --git a/print/luatex/patches/patch-ac b/print/luatex/patches/patch-libs_lua53_lua53-src_src_luaconf.h
index 0f8483fdcf0..c9588c559c0 100644
--- a/print/luatex/patches/patch-ac
+++ b/print/luatex/patches/patch-libs_lua53_lua53-src_src_luaconf.h
@@ -1,26 +1,25 @@
-$NetBSD: patch-ac,v 1.7 2016/06/16 04:06:19 markd Exp $
+$NetBSD: patch-libs_lua53_lua53-src_src_luaconf.h,v 1.1 2019/05/09 09:47:36 adam Exp $
 
 Prepare @PREFIX@ for substituting the correct one in from the pkgsrc Makefile.
-
 Solaris portability fix.
 
---- 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 @@
+--- libs/lua53/lua53-src/src/luaconf.h.orig	2018-09-05 21:30:41.000000000 +0000
++++ libs/lua53/lua53-src/src/luaconf.h
+@@ -200,7 +200,7 @@
+ 
  #else			/* }{ */
  
- #define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
 -#define LUA_ROOT	"/usr/local/"
 +#define LUA_ROOT	"@PREFIX@"
- #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR
- #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR
+ #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
+ #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
  #define LUA_PATH_DEFAULT  \
-@@ -177,7 +177,7 @@
+@@ -276,7 +276,7 @@
  ** default definition.
  */
  #if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
 -    defined(__ELF__)		/* { */
 +    defined(__ELF__) && !defined(__sun)		/* { */
  #define LUAI_FUNC	__attribute__((visibility("hidden"))) extern
- #define LUAI_DDEC	LUAI_FUNC
- #define LUAI_DDEF	/* empty */
+ #else				/* }{ */
+ #define LUAI_FUNC	extern
diff --git a/print/luatex/patches/patch-texk_web2c_luatexdir_font_writet1.w b/print/luatex/patches/patch-texk_web2c_luatexdir_font_writet1.w
deleted file mode 100644
index 39d250affc9..00000000000
--- a/print/luatex/patches/patch-texk_web2c_luatexdir_font_writet1.w
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-texk_web2c_luatexdir_font_writet1.w,v 1.1 2018/11/01 10:59:15 markd Exp $
-
-writet1 protection against buffer overflow
-
-git-svn-id: svn://tug.org/texlive/trunk/Build/source@48697 c570f23f-e606-0410-a88d-b1316a301751
-
---- texk/web2c/luatexdir/font/writet1.w.orig	2016-11-25 18:24:34.000000000 +0000
-+++ texk/web2c/luatexdir/font/writet1.w
-@@ -1625,7 +1625,9 @@ static void t1_check_unusual_charstring(
-     if (sscanf(p, "%i", &i) != 1) {
-         strcpy(t1_buf_array, t1_line_array);
-         t1_getline();
-+	alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE);
-         strcat(t1_buf_array, t1_line_array);
-+	alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE);
-         strcpy(t1_line_array, t1_buf_array);
-         t1_line_ptr = eol(t1_line_array);
-     }
diff --git a/print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w b/print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w
deleted file mode 100644
index 5bcb6673b40..00000000000
--- a/print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD: patch-texk_web2c_luatexdir_image_pdftoepdf.w,v 1.8 2019/02/17 11:17:37 tnn Exp $
-
---- texk/web2c/luatexdir/image/pdftoepdf.w.orig	2018-01-17 18:00:12.000000000 +0000
-+++ texk/web2c/luatexdir/image/pdftoepdf.w
-@@ -33,9 +33,9 @@
- 
- */
- 
--extern void md5(Guchar *msg, int msgLen, Guchar *digest);
-+extern void md5(unsigned char *msg, int msgLen, unsigned char *digest);
- 
--static GBool isInit = gFalse;
-+static bool isInit = false;
- 
- /* Maintain AVL tree of all PDF files for embedding */
- 
-@@ -361,12 +361,12 @@ void copyReal(PDF pdf, double d)
-     pdf->cave = true;
- }
- 
--static void copyString(PDF pdf, GooString * string)
-+static void copyString(PDF pdf, const GooString * string)
- {
--    char *p;
-+    const char *p;
-     unsigned char c;
-     size_t i, l;
--    p = string->getCString();
-+    p = string->c_str();
-     l = (size_t) string->getLength();
-     if (pdf->cave)
-         pdf_out(pdf, ' ');
-@@ -393,7 +393,7 @@ static void copyString(PDF pdf, GooStrin
-     pdf->cave = true;
- }
- 
--static void copyName(PDF pdf, char *s)
-+static void copyName(PDF pdf, const char *s)
- {
-     pdf_out(pdf, '/');
-     for (; *s != 0; s++) {
-@@ -468,7 +468,7 @@ static void copyObject(PDF pdf, PdfDocum
-         break;
-     /*
-     case objNum:
--        GBool isNum() { return type == objInt || type == objReal; }
-+        bool isNum() { return type == objInt || type == objReal; }
-         break;
-     */
-     case objString:
-@@ -529,26 +529,30 @@ static void writeRefs(PDF pdf, PdfDocume
- 
- static PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
- {
-+    const PDFRectangle *ret;
-+
-     switch (pagebox_spec) {
-         case PDF_BOX_SPEC_MEDIA:
--            return page->getMediaBox();
-+            ret = page->getMediaBox();
-             break;
-         case PDF_BOX_SPEC_CROP:
--            return page->getCropBox();
-+            ret = page->getCropBox();
-             break;
-         case PDF_BOX_SPEC_BLEED:
--            return page->getBleedBox();
-+            ret = page->getBleedBox();
-             break;
-         case PDF_BOX_SPEC_TRIM:
--            return page->getTrimBox();
-+            ret = page->getTrimBox();
-             break;
-         case PDF_BOX_SPEC_ART:
--            return page->getArtBox();
-+            ret = page->getArtBox();
-             break;
-         default:
--            return page->getMediaBox();
-+            ret = page->getMediaBox();
-             break;
-     }
-+
-+    return const_cast<PDFRectangle *>(ret);
- }
- 
- /*
-@@ -587,11 +591,11 @@ void read_pdf_info(image_dict * idict)
-     PDFRectangle *pagebox;
-     int pdf_major_version_found, pdf_minor_version_found;
-     float xsize, ysize, xorig, yorig;
--    if (isInit == gFalse) {
-+    if (isInit == false) {
-         if (!(globalParams))
-             globalParams = new GlobalParams();
--        globalParams->setErrQuiet(gFalse);
--        isInit = gTrue;
-+        globalParams->setErrQuiet(false);
-+        isInit = true;
-     }
-     if (img_type(idict) == IMG_TYPE_PDF)
-         pdf_doc = refPdfDocument(img_filepath(idict), FE_FAIL);
-@@ -966,7 +970,7 @@ void epdf_free()
-     if (PdfDocumentTree != NULL)
-         avl_destroy(PdfDocumentTree, destroyPdfDocument);
-     PdfDocumentTree = NULL;
--    if (isInit == gTrue)
-+    if (isInit == true)
-         delete globalParams;
--    isInit = gFalse;
-+    isInit = false;
- }
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 bdcf3895e9f..00000000000
--- a/print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc
+++ /dev/null
@@ -1,284 +0,0 @@
-$NetBSD: patch-texk_web2c_luatexdir_lua_lepdflib.cc,v 1.8 2019/02/17 11:17:37 tnn Exp $
-
---- texk/web2c/luatexdir/lua/lepdflib.cc.orig	2018-02-14 14:44:38.000000000 +0000
-+++ texk/web2c/luatexdir/lua/lepdflib.cc
-@@ -221,6 +221,7 @@ static int l_new_Attribute(lua_State * L
-     const char *n;
-     int nlen;
-     udstruct *uobj, *uout;
-+    GooString *gs;
- 
-     if (lua_type(L,1)==LUA_TNUMBER) {
-        uobj = (udstruct *) luaL_checkudata(L, 2, M_Object);
-@@ -240,7 +241,8 @@ static int l_new_Attribute(lua_State * L
-        if (uobj->pd != NULL && uobj->pd->pc != uobj->pc)
-           pdfdoc_changed_error(L);
-        uout = new_Attribute_userdata(L);
--       uout->d = new Attribute(n, nlen, (Object *)uobj->d);
-+       gs = new GooString(n, nlen);
-+       uout->d = new Attribute(std::move(*gs), (Object *)uobj->d);
-        uout->atype = ALLOC_LEPDF;
-        uout->pc = uobj->pc;
-        uout->pd = uobj->pd;
-@@ -439,7 +441,7 @@ static int l_new_Object(lua_State * L)
-       break;
-     case 1:
-       if (lua_isboolean (L,1)) {
--	uout->d = new Object(lua_toboolean(L, 1)? gTrue : gFalse);
-+	uout->d = new Object(lua_toboolean(L, 1)? true : false);
- 	uout->atype = ALLOC_LEPDF;
- 	uout->pc = 0;
- 	uout->pd = NULL;
-@@ -591,7 +593,7 @@ static const struct luaL_Reg epdflib_f[]
- #define m_poppler_get_poppler(in, out, function)               \
- static int m_##in##_##function(lua_State * L)                  \
- {                                                              \
--    out *o;                                                    \
-+    const out *o;                                              \
-     udstruct *uin, *uout;                                      \
-     uin = (udstruct *) luaL_checkudata(L, 1, M_##in);          \
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)             \
-@@ -599,7 +601,7 @@ static int m_##in##_##function(lua_State
-     o = ((in *) uin->d)->function();                           \
-     if (o != NULL) {                                           \
-         uout = new_##out##_userdata(L);                        \
--        uout->d = o;                                           \
-+        uout->d = const_cast<out *>(o);                        \
-         uout->pc = uin->pc;                                    \
-         uout->pd = uin->pd;                                    \
-     } else                                                     \
-@@ -669,14 +671,14 @@ static int m_##in##_##function(lua_State
- #define m_poppler_get_GOOSTRING(in, function)                  \
- static int m_##in##_##function(lua_State * L)                  \
- {                                                              \
--    GooString *gs;                                             \
-+    const GooString *gs;                                             \
-     udstruct *uin;                                             \
-     uin = (udstruct *) luaL_checkudata(L, 1, M_##in);          \
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)             \
-         pdfdoc_changed_error(L);                               \
-     gs = ((in *) uin->d)->function();                          \
-     if (gs != NULL)                                            \
--        lua_pushlstring(L, gs->getCString(), gs->getLength()); \
-+        lua_pushlstring(L, gs->c_str(), gs->getLength()); \
-     else                                                       \
-         lua_pushnil(L);                                        \
-     return 1;                                                  \
-@@ -911,7 +913,7 @@ static int m_Array_getString(lua_State *
-     if (i > 0 && i <= len) {
-         gs = new GooString();
-         if (((Array *) uin->d)->getString(i - 1, gs))
--            lua_pushlstring(L, gs->getCString(), gs->getLength());
-+            lua_pushlstring(L, gs->c_str(), gs->getLength());
-         else
-             lua_pushnil(L);
-         delete gs;
-@@ -1063,7 +1065,7 @@ static int m_Catalog_getJS(lua_State * L
-     if (i > 0 && i <= len) {
-         gs = ((Catalog *) uin->d)->getJS(i - 1);
-         if (gs != NULL)
--            lua_pushlstring(L, gs->getCString(), gs->getLength());
-+            lua_pushlstring(L, gs->c_str(), gs->getLength());
-         else
-             lua_pushnil(L);
-         delete gs;
-@@ -1125,7 +1127,7 @@ m_poppler_get_INT(Dict, getLength);
- 
- static int m_Dict_add(lua_State * L)
- {
--    char *s;
-+    const char *s;
-     udstruct *uin, *uobj;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_Dict);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-@@ -1378,7 +1380,7 @@ static int m_GooString__tostring(lua_Sta
-     uin = (udstruct *) luaL_checkudata(L, 1, M_GooString);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
--    lua_pushlstring(L, ((GooString *) uin->d)->getCString(),
-+    lua_pushlstring(L, ((GooString *) uin->d)->c_str(),
-                     ((GooString *) uin->d)->getLength());
-     return 1;
- }
-@@ -1527,9 +1529,9 @@ static int m_Object_initBool(lua_State *
-         pdfdoc_changed_error(L);
-     luaL_checktype(L, 2, LUA_TBOOLEAN);
-     if (lua_toboolean(L, 2) != 0)
--        *((Object *) uin->d) = Object(gTrue);
-+        *((Object *) uin->d) = Object(true);
-     else
--        *((Object *) uin->d) = Object(gFalse);
-+        *((Object *) uin->d) = Object(false);
-     return 0;
- }
- 
-@@ -1807,14 +1809,14 @@ static int m_Object_getNum(lua_State * L
- 
- static int m_Object_getString(lua_State * L)
- {
--    GooString *gs;
-+    const GooString *gs;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
-     if (((Object *) uin->d)->isString()) {
-         gs = ((Object *) uin->d)->getString();
--        lua_pushlstring(L, gs->getCString(), gs->getLength());
-+        lua_pushlstring(L, gs->c_str(), gs->getLength());
-     } else
-         lua_pushnil(L);
-     return 1;
-@@ -2051,7 +2053,7 @@ static int m_Object_dictAdd(lua_State * 
-         pdfdoc_changed_error(L);
-     if (!((Object *) uin->d)->isDict())
-         luaL_error(L, "Object is not a Dict");
--    ((Object *) uin->d)->dictAdd(copyString(s), std::move(*((Object *) uobj->d)));
-+    ((Object *) uin->d)->dictAdd(s, std::move(*((Object *) uobj->d)));
-     return 0;
- }
- 
-@@ -2465,14 +2467,14 @@ m_PDFDoc_INT(getErrorCode);
- 
- static int m_PDFDoc_getFileName(lua_State * L)
- {
--    GooString *gs;
-+    const GooString *gs;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
-     gs = ((PdfDocument *) uin->d)->doc->getFileName();
-     if (gs != NULL)
--        lua_pushlstring(L, gs->getCString(), gs->getLength());
-+        lua_pushlstring(L, gs->c_str(), gs->getLength());
-     else
-         lua_pushnil(L);
-     return 1;
-@@ -2553,7 +2555,7 @@ m_PDFDoc_INT(getNumPages);
- 
- static int m_PDFDoc_readMetadata(lua_State * L)
- {
--    GooString *gs;
-+    const GooString *gs;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-@@ -2561,7 +2563,7 @@ static int m_PDFDoc_readMetadata(lua_Sta
-     if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
-         gs = ((PdfDocument *) uin->d)->doc->readMetadata();
-         if (gs != NULL)
--            lua_pushlstring(L, gs->getCString(), gs->getLength());
-+            lua_pushlstring(L, gs->c_str(), gs->getLength());
-         else
-             lua_pushnil(L);
-     } else
-@@ -2571,7 +2573,7 @@ static int m_PDFDoc_readMetadata(lua_Sta
- 
- static int m_PDFDoc_getStructTreeRoot(lua_State * L)
- {
--    StructTreeRoot *obj;
-+    const StructTreeRoot *obj;
-     udstruct *uin, *uout;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-@@ -2579,7 +2581,7 @@ static int m_PDFDoc_getStructTreeRoot(lu
-     if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
-         obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
-         uout = new_StructTreeRoot_userdata(L);
--        uout->d = obj;
-+        uout->d = const_cast<StructTreeRoot *>(obj);
-         uout->pc = uin->pc;
-         uout->pd = uin->pd;
-     } else
-@@ -3024,12 +3026,12 @@ m_poppler_get_GUINT(Attribute,getRevisio
- 
- static int m_Attribute_setRevision(lua_State * L)
- {
--    Guint i;
-+    unsigned int i;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
--    i = (Guint) luaL_checkint(L, 2);
-+    i = (unsigned int) luaL_checkint(L, 2);
-     ((Attribute *) uin->d)->setRevision(i);
-     return 0;
- }
-@@ -3038,12 +3040,12 @@ m_poppler_get_BOOL(Attribute, isHidden);
- 
- static int m_Attribute_setHidden(lua_State * L)
- {
--    GBool i;
-+    bool i;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
--    i = (GBool) lua_toboolean(L, 2);
-+    i = (bool) lua_toboolean(L, 2);
-     ((Attribute *) uin->d)->setHidden(i);
-     return 0;
- }
-@@ -3180,7 +3182,7 @@ static int m_StructElement_getParentRef(
- // Ref is false if the C++ functione return false
- static int m_StructElement_getPageRef(lua_State * L)
- {
--    GBool b;
-+    bool b;
-     Ref *r;
-     udstruct *uin, *uout;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
-@@ -3214,28 +3216,28 @@ static int m_StructElement_getTypeName(l
- 
- static int m_StructElement_setRevision(lua_State * L)
- {
--    Guint i;
-+    unsigned int i;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
--    i = (Guint) luaL_checkint(L, 2);
-+    i = (unsigned int) luaL_checkint(L, 2);
-     ((StructElement *) uin->d)->setRevision(i);
-     return 0;
- }
- 
- static int m_StructElement_getText(lua_State * L)
- {
--    GBool i;
-+    bool i;
-     GooString *gs;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
--    i = (GBool) lua_toboolean(L, 2);
-+    i = (bool) lua_toboolean(L, 2);
-     gs =  ((StructElement *) uin->d)->getText(i);
-     if (gs != NULL)
--        lua_pushlstring(L, gs->getCString(), gs->getLength());
-+        lua_pushlstring(L, gs->c_str(), gs->getLength());
-     else
-         lua_pushnil(L);
-     return 1;
-@@ -3321,7 +3323,7 @@ static int m_StructElement_findAttribute
- {
-     Attribute::Type t;
-     Attribute::Owner o;
--    GBool g;
-+    bool g;
-     udstruct *uin, *uout;
-     const Attribute *a;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
-@@ -3329,7 +3331,7 @@ static int m_StructElement_findAttribute
-         pdfdoc_changed_error(L);
-     t = (Attribute::Type) luaL_checkint(L,1);
-     o = (Attribute::Owner) luaL_checkint(L,2);
--    g = (GBool) lua_toboolean(L, 3);
-+    g = (bool) lua_toboolean(L, 3);
-     a = ((StructElement *) uin->d)->findAttribute(t,g,o);
- 
-     if (a!=NULL){
diff --git a/print/ptexenc/Makefile b/print/ptexenc/Makefile
index 25d95f8d0e4..6a2d43d055f 100644
--- a/print/ptexenc/Makefile
+++ b/print/ptexenc/Makefile
@@ -1,28 +1,20 @@
-# $NetBSD: Makefile,v 1.11 2018/05/13 12:49:18 markd Exp $
+# $NetBSD: Makefile,v 1.12 2019/05/09 09:47:36 adam Exp $
 
-DISTNAME=	texlive-20180414-source
-PKGNAME=	ptexenc-1.3.6
+.include "../../print/texlive/Makefile.common"
+
+PKGNAME=	ptexenc-1.3.7
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	Library for Japanese pTeX and its tools
 LICENSE=	modified-bsd
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/ptexenc
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/ptexenc
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ptexenc
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-PKGCONFIG_OVERRIDE=	ptexenc.pc.in
 
 CONFIGURE_ARGS+=	--with-system-kpathsea
+PKGCONFIG_OVERRIDE=	ptexenc.pc.in
 
 BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
 .include "../../print/kpathsea/buildlink3.mk"
diff --git a/print/ptexenc/distinfo b/print/ptexenc/distinfo
index eb7b281e4da..091e8f844b8 100644
--- a/print/ptexenc/distinfo
+++ b/print/ptexenc/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2018/05/13 12:49:18 markd Exp $
+$NetBSD: distinfo,v 1.12 2019/05/09 09:47:36 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
 SHA1 (patch-texk_ptexenc_Makefile.in) = 2d110e53d604c405140abf05646a79aecb393ede
diff --git a/print/seetexk/Makefile b/print/seetexk/Makefile
index aedecf37b8d..60d787bdedd 100644
--- a/print/seetexk/Makefile
+++ b/print/seetexk/Makefile
@@ -1,28 +1,20 @@
-# $NetBSD: Makefile,v 1.5 2018/05/13 12:50:57 markd Exp $
+# $NetBSD: Makefile,v 1.6 2019/05/09 09:47:36 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	seetexk-1.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	Utilities for manipulating DVI files
 LICENSE=	x11
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/seetexk
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/seetexk
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/seetexk
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
 CONFIGURE_ARGS+=	--with-system-kpathsea
 
 BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
diff --git a/print/seetexk/distinfo b/print/seetexk/distinfo
index 1fa1e41542d..5ceb052898c 100644
--- a/print/seetexk/distinfo
+++ b/print/seetexk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2018/05/13 12:50:57 markd Exp $
+$NetBSD: distinfo,v 1.7 2019/05/09 09:47:36 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/print/tex4ht/Makefile b/print/tex4ht/Makefile
index 2d534f378eb..7be4fb1f13b 100644
--- a/print/tex4ht/Makefile
+++ b/print/tex4ht/Makefile
@@ -1,29 +1,21 @@
-# $NetBSD: Makefile,v 1.9 2018/08/22 09:46:16 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/05/09 09:47:36 adam Exp $
 
-DISTNAME=	texlive-20180414-source
-PKGNAME=	tex4ht-0.0.20170523
-PKGREVISION=	2
+.include "../../print/texlive/Makefile.common"
+
+PKGNAME=	tex4ht-20180225
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	Converter from *TeX to HTML, XML, and similar formats
 LICENSE=	lppl-1.3c
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/tex4htk
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/tex4htk
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/tex4htk
-USE_TOOLS+=	perl:run pkg-config
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	mk4ht.pl
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
 CONFIGURE_ARGS+=	--with-system-kpathsea
 
 BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
diff --git a/print/tex4ht/distinfo b/print/tex4ht/distinfo
index ca4936a8e65..5ceb052898c 100644
--- a/print/tex4ht/distinfo
+++ b/print/tex4ht/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2018/05/13 12:53:19 markd Exp $
+$NetBSD: distinfo,v 1.7 2019/05/09 09:47:36 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/print/texlive/Makefile.common b/print/texlive/Makefile.common
new file mode 100644
index 00000000000..dbc2a8c1827
--- /dev/null
+++ b/print/texlive/Makefile.common
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile.common,v 1.1 2019/05/09 09:47:34 adam Exp $
+# used by converters/dvi2tty/Makefile
+# used by fonts/afm2pl/Makefile
+# used by fonts/gsftopkk/Makefile
+# used by fonts/lcdftypetools/Makefile
+# used by fonts/ps2pkm/Makefile
+# used by fonts/ttf2pk/Makefile
+# used by fonts/ttfdump/Makefile
+# used by print/cjkutils/Makefile
+# used by print/dvidvi/Makefile
+# used by print/dviljk/Makefile
+# used by print/dvipdfmx/Makefile
+# used by print/dvipsk/Makefile
+# used by print/kpathsea/Makefile
+# used by print/lacheck/Makefile
+# used by print/luatex/Makefile
+# used by print/ptexenc/Makefile
+# used by print/seetexk/Makefile
+# used by print/tex4ht/Makefile
+# used by print/vlna/Makefile
+# used by print/xdvik/Makefile
+# used by print/xetex/Makefile
+# used by print/xpdfopen/Makefile
+# used by textproc/makeindexk/Makefile
+# used by textproc/mendexk/Makefile
+# used by textproc/xindy/Makefile
+
+DISTNAME=	texlive-20190410-source
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2019/
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER?=	minskim@NetBSD.org
+
+EXTRACT_ELEMENTS=	${DISTNAME}/build-aux
+
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config
+GNU_CONFIGURE=		yes
+GNU_CONFIGURE_STRICT?=	yes
+CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
+CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
diff --git a/print/vlna/Makefile b/print/vlna/Makefile
index 58146ba725b..efe05aaf139 100644
--- a/print/vlna/Makefile
+++ b/print/vlna/Makefile
@@ -1,24 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2018/05/13 12:55:10 markd Exp $
+# $NetBSD: Makefile,v 1.6 2019/05/09 09:47:36 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	vlna-1.5
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	Adds tilde after each non-syllabic preposition
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/utils/vlna
+EXTRACT_ELEMENTS+=	${DISTNAME}/utils/vlna
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/utils/vlna
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/vlna/distinfo b/print/vlna/distinfo
index 18b93a3625e..5ceb052898c 100644
--- a/print/vlna/distinfo
+++ b/print/vlna/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2018/05/13 12:55:10 markd Exp $
+$NetBSD: distinfo,v 1.7 2019/05/09 09:47:36 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index 282203cbca8..7f335ed0d0f 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2018/05/13 17:19:19 bsiegert Exp $
+# $NetBSD: Makefile,v 1.27 2019/05/09 09:47:36 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	xdvik-22.87.03
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://xdvi.sourceforge.net/
 COMMENT=	Previewer for DVI files
 
@@ -16,31 +14,21 @@ BUILD_DEPENDS+=	tex-xdvi-[0-9]*:../../print/tex-xdvi
 DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
 DEPENDS+=	kpathsea>=6.2.1:../../print/kpathsea
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/xdvik
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/xdvik
 
 USE_TOOLS+=	gs:run
 
-MAKE_JOBS_SAFE=	no
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/xdvik
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
+GNU_CONFIGURE_STRICT=	no # texk/xdvik/squeeze/configure
 CONFIGURE_ARGS+=	--with-system-freetype2
 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-zlib
+CONFIGURE_ARGS+=	--with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+=	--with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
 CONFIGURE_ARGS+=	--with-xdvi-x-toolkit=xaw
-CONFIGURE_ARGS+=	--with-default-dvips-path=${LOCALBASE}/bin/dvips
-CONFIGURE_ARGS+=	--with-default-ps2pdf-path=${LOCALBASE}/bin/ps2pdf
-CONFIGURE_ENV+=		FT2_CONFIG=pkg-config \
-		PKG_CONFIG=${TOOLS_CMD.pkg-config}
+CONFIGURE_ARGS+=	--with-default-dvips-path=${PREFIX}/bin/dvips
+CONFIGURE_ARGS+=	--with-default-ps2pdf-path=${PREFIX}/bin/ps2pdf
 
 PKG_SYSCONFSUBDIR=	texmf
 
@@ -63,26 +51,25 @@ XDVI_PAPERSIZE=	us
 XDVI_PAPERSIZE=	a4
 .endif
 
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../print/kpathsea/buildlink3.mk"
-.include "../../print/kpathsea/texmf.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/xaw.buildlink3.mk"
-
 post-build:
 	${RM} ${WRKSRC}/texmf/XDvi
-	${MKDIR} -p ${WRKSRC}/texmf/xdvi
-	${CP} ${LOCALBASE}/share/texmf-dist/xdvi/XDvi ${WRKSRC}/texmf/xdvi
-	env TEXMFCONFIG=${LOCALBASE}/share/texmf \
+	${MKDIR} ${WRKSRC}/texmf/xdvi
+	${CP} ${PREFIX}/share/texmf-dist/xdvi/XDvi ${WRKSRC}/texmf/xdvi
+	${SETENV} TEXMFCONFIG=${PREFIX}/share/texmf \
 		TFC_TEXMFCONFIG=${WRKSRC}/texmf \
-		${LOCALBASE}/bin/texconfig xdvi paper ${XDVI_PAPERSIZE}
+		${PREFIX}/bin/texconfig xdvi paper ${XDVI_PAPERSIZE}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/texmf/xdvi/XDvi \
 		${DESTDIR}${PREFIX}/share/examples/xdvik
 
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../print/kpathsea/buildlink3.mk"
+.include "../../print/kpathsea/texmf.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xdvik/distinfo b/print/xdvik/distinfo
index 74bd4beddc2..37b427ae42d 100644
--- a/print/xdvik/distinfo
+++ b/print/xdvik/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2018/05/13 13:04:03 markd Exp $
+$NetBSD: distinfo,v 1.16 2019/05/09 09:47:36 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
 SHA1 (patch-aa) = 92ab2c63769204f5ee42a10f84a47f636fae82c6
 SHA1 (patch-ab) = 09dbadaa8fb4575e4a437f3a3df266ae808e3278
-SHA1 (patch-configure) = 35e18dca51b22e8f469d5471c6139416fe933012
+SHA1 (patch-configure) = 10ecd7bd6928d1296bde494ce5173187e2734731
diff --git a/print/xdvik/patches/patch-configure b/print/xdvik/patches/patch-configure
index f3b0e9c5b28..525cf863d60 100644
--- a/print/xdvik/patches/patch-configure
+++ b/print/xdvik/patches/patch-configure
@@ -1,39 +1,16 @@
-$NetBSD: patch-configure,v 1.2 2018/05/05 23:17:33 dholland Exp $
+$NetBSD: patch-configure,v 1.3 2019/05/09 09:47:36 adam Exp $
 
-- check more aggressively for XInput 2.1 to fix native X netbsd-6 build
-- freetype2 upstream removed freetype-config; use pkg-config instead
+Check more aggressively for XInput 2.1 to fix native X netbsd-6 build.
 
---- configure.orig	2015-03-12 14:42:02.000000000 +0000
+--- configure.orig	2019-03-25 17:26:59.000000000 +0000
 +++ configure
-@@ -1519,7 +1519,7 @@ Optional Packages:
-                           zlib headers installed in DIR
-   --with-zlib-libdir=DIR  zlib library installed in DIR
-   --with-system-freetype2 use installed freetype2 headers and library
--                          (requires freetype-config)
-+                          (requires pkg-config)
-   --with-default-gs-lib-path=PATH
-                           set default path for finding font aliases to PATH
-   --with-default-dvips-path=CMD
-@@ -15845,6 +15845,9 @@ LDFLAGS="$X_LIBS $LDFLAGS"
+@@ -15847,6 +15847,9 @@ LDFLAGS="$X_LIBS $LDFLAGS"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <X11/extensions/XInput2.h>
 +#ifndef XIScrollClass
-+ bollocks
++ failhere
 +#endif
  int
  main ()
  {
-@@ -18955,9 +18958,9 @@ esac
- else
-   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
- fi
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
--  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
--  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
-+if $PKG_CONFIG --version >/dev/null 2>&1; then
-+  FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
-+  FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
- elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
-   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
- fi
diff --git a/print/xetex/Makefile b/print/xetex/Makefile
index 67274385afe..9a83735441b 100644
--- a/print/xetex/Makefile
+++ b/print/xetex/Makefile
@@ -1,52 +1,57 @@
-# $NetBSD: Makefile,v 1.88 2019/04/03 00:33:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.89 2019/05/09 09:47:36 adam Exp $
 
-DISTNAME=	texlive-20180414-source
-PKGNAME=	xetex-0.99999
-PKGREVISION=	12
+.include "../../print/texlive/Makefile.common"
+
+PKGNAME=	xetex-0.999991
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tug.org/xetex/
 COMMENT=	TeX system with Unicode and modern font technologies
+LICENSE=	mit
 
 CONFLICTS+=	web2c<=7.5.7
 DEPENDS+=	dvipdfmx>=20140525:../../print/dvipdfmx
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/libs/graphite2 \
-			${DISTNAME}/libs/harfbuzz \
-			${DISTNAME}/libs/xpdf \
-			${DISTNAME}/texk/web2c
+EXTRACT_ELEMENTS+=	${DISTNAME}/libs/graphite2
+EXTRACT_ELEMENTS+=	${DISTNAME}/libs/harfbuzz
+EXTRACT_ELEMENTS+=	${DISTNAME}/libs/xpdf
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/web2c
 
-GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c99 c++11
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake lex perl pkg-config yacc
-CONFIGURE_ARGS+=	--disable-aleph --disable-etex --disable-pdftex \
-			--disable-luatex --disable-mf --disable-mf-nowin \
-			--with-x=no \
-			--disable-luajittex --disable-luatex53 \
-			--disable-mflua --disable-mfluajit \
-			--disable-mp --disable-pmp --disable-upmp \
-			--disable-ptex --disable-eptex --disable-uptex --disable-euptex \
-			--disable-web-progs \
-			--enable-web2c --enable-xetex
-CONFIGURE_ARGS+=	--with-system-poppler
-CONFIGURE_ARGS+= \
-	--with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include \
-	--with-fontconfig-libdir=${BUILDLINK_PREFIX.fontconfig}/lib
+USE_LANGUAGES=		c99 c++11
+USE_TOOLS+=		gmake lex perl yacc
+GNU_CONFIGURE_STRICT=	no # libs
+CONFIGURE_ARGS+=	--disable-aleph
+CONFIGURE_ARGS+=	--disable-eptex
+CONFIGURE_ARGS+=	--disable-euptex
+CONFIGURE_ARGS+=	--disable-etex
+CONFIGURE_ARGS+=	--disable-luajittex
+CONFIGURE_ARGS+=	--disable-luatex
+CONFIGURE_ARGS+=	--disable-luatex53
+CONFIGURE_ARGS+=	--disable-mf
+CONFIGURE_ARGS+=	--disable-mf-nowin
+CONFIGURE_ARGS+=	--disable-mflua
+CONFIGURE_ARGS+=	--disable-mfluajit
+CONFIGURE_ARGS+=	--disable-mp
+CONFIGURE_ARGS+=	--disable-pdftex
+CONFIGURE_ARGS+=	--disable-pmp
+CONFIGURE_ARGS+=	--disable-ptex
+CONFIGURE_ARGS+=	--disable-uptex
+CONFIGURE_ARGS+=	--disable-upmp
+CONFIGURE_ARGS+=	--disable-web-progs
+CONFIGURE_ARGS+=	--enable-web2c
+CONFIGURE_ARGS+=	--enable-xetex
+CONFIGURE_ARGS+=	--with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include
+CONFIGURE_ARGS+=	--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-poppler
+CONFIGURE_ARGS+=	--with-system-zlib
+CONFIGURE_ARGS+=	--with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+=	--with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
 CONFIGURE_ARGS+=	--with-system-libpng
 CONFIGURE_ARGS+=	--with-system-freetype2
 CONFIGURE_ARGS+=	--with-system-teckit
 CONFIGURE_ARGS+=	--with-system-icu
-CONFIGURE_ENV+=		FT2_CONFIG=pkg-config \
-			PKG_CONFIG=${TOOLS_CMD.pkg-config}
+CONFIGURE_ARGS+=	--without-x
 
 CONFIGURE_DIRS=		libs/graphite2
 CONFIGURE_DIRS+=	libs/harfbuzz
@@ -57,12 +62,15 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting paths to commands.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	texk/web2c/xetexdir/XeTeX_ext.c
-SUBST_SED.paths=	-e 's,@XDVIPDFMX@,${LOCALBASE}/bin/xdvipdfmx,g'
+SUBST_SED.paths=	-e 's,@XDVIPDFMX@,${PREFIX}/bin/xdvipdfmx,g'
 
 INSTALLATION_DIRS+=	bin
 
 CFLAGS.SunOS+=		-D_XOPEN_SOURCE_EXTENDED=0
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/xetex ${DESTDIR}${PREFIX}/bin
+
 .include "../../converters/TECkit/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
@@ -73,8 +81,4 @@ BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
 .include "../../print/poppler/buildlink3.mk"
 .include "../../print/poppler-includes/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/xetex ${DESTDIR}${PREFIX}/bin
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xetex/distinfo b/print/xetex/distinfo
index 65e52976926..684bf3253f6 100644
--- a/print/xetex/distinfo
+++ b/print/xetex/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.22 2018/12/05 21:44:03 wiz Exp $
+$NetBSD: distinfo,v 1.23 2019/05/09 09:47:36 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
-SHA1 (patch-texk_web2c_configure) = a6a4554f956d429a3142dbf8f85ba54a55ecaf05
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
 SHA1 (patch-texk_web2c_xetexdir_XeTeX__ext.c) = a83e842b567db6acb35cfab5303a7e96845fa953
 SHA1 (patch-texk_web2c_xetexdir_pdfimage.cpp) = 80536965759abcf408bd02c326c23a11de697946
diff --git a/print/xetex/patches/patch-texk_web2c_configure b/print/xetex/patches/patch-texk_web2c_configure
deleted file mode 100644
index 5c0add61ae8..00000000000
--- a/print/xetex/patches/patch-texk_web2c_configure
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-texk_web2c_configure,v 1.1 2018/05/05 12:22:47 minskim Exp $
-
---- texk/web2c/configure.orig	2017-03-18 22:50:15.000000000 +0000
-+++ texk/web2c/configure
-@@ -1786,7 +1786,7 @@ Optional Packages:
-   --with-system-libpng    use installed libpng headers and library (requires
-                           pkg-config)
-   --with-system-freetype2 use installed freetype2 headers and library
--                          (requires freetype-config)
-+                          (requires pkg-config)
-   --with-system-pixman    use installed pixman headers and library (requires
-                           pkg-config)
-   --with-system-cairo     use installed cairo headers and library (requires
-@@ -23968,9 +23968,9 @@ esac
- else
-   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
- fi
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
--  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
--  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
-+if $PKG_CONFIG --version >/dev/null 2>&1; then
-+  FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
-+  FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
- elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
-   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
- fi
diff --git a/print/xpdfopen/Makefile b/print/xpdfopen/Makefile
index 197afc0a660..cceb0e220ff 100644
--- a/print/xpdfopen/Makefile
+++ b/print/xpdfopen/Makefile
@@ -1,22 +1,18 @@
-# $NetBSD: Makefile,v 1.10 2018/05/13 13:09:26 markd Exp $
+# $NetBSD: Makefile,v 1.11 2019/05/09 09:47:36 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	xpdfopen-0.86
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	Commands to control Acrobat Reader, xpdf, and evince
 
 DEPENDS+=	web2c-[0-9]*:../../print/web2c
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/utils/xpdfopen
+EXTRACT_ELEMENTS+=	${DISTNAME}/utils/xpdfopen
 
-GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/utils/xpdfopen
 
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/print/xpdfopen/distinfo b/print/xpdfopen/distinfo
index ec8ce0e6e43..ec96beb1497 100644
--- a/print/xpdfopen/distinfo
+++ b/print/xpdfopen/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2018/05/13 13:09:26 markd Exp $
+$NetBSD: distinfo,v 1.9 2019/05/09 09:47:36 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
 SHA1 (patch-Makefile.in) = 36bd7f20f0aa8901dbc6f6972451cd9b1b748d3d
diff --git a/print/xpdfopen/patches/patch-Makefile.in b/print/xpdfopen/patches/patch-Makefile.in
deleted file mode 100644
index 9bf526c3e69..00000000000
--- a/print/xpdfopen/patches/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.4 2015/12/12 19:24:00 markd Exp $
-
---- Makefile.in.orig	2015-02-16 14:32:53.000000000 +0000
-+++ Makefile.in
-@@ -333,7 +333,7 @@ NEVER_NAMES_SUB = -o -name .deps -o -nam
- NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
- AM_CPPFLAGS = $(X_CFLAGS)
- AM_CFLAGS = $(WARNING_CFLAGS)
--LDADD = $(X_LIBS) -lX11 -lXmu $(X_EXTRA_LIBS)
-+LDADD = $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
- common_sources = \
- 	@XPDFOPEN_TREE@/sendx.c \
- 	@XPDFOPEN_TREE@/utils.c
diff --git a/textproc/makeindexk/Makefile b/textproc/makeindexk/Makefile
index 1ff3bd66d20..2c4ec46424f 100644
--- a/textproc/makeindexk/Makefile
+++ b/textproc/makeindexk/Makefile
@@ -1,25 +1,17 @@
-# $NetBSD: Makefile,v 1.14 2018/05/13 12:18:55 markd Exp $
+# $NetBSD: Makefile,v 1.15 2019/05/09 09:47:37 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	makeindexk-2.15
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	General purpose hierarchical index generator
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/makeindexk
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/makeindexk
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/makeindexk
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
 
 CONFIGURE_ARGS+=	--with-system-kpathsea
 
diff --git a/textproc/makeindexk/distinfo b/textproc/makeindexk/distinfo
index e605a80796d..81e3e7d3f0e 100644
--- a/textproc/makeindexk/distinfo
+++ b/textproc/makeindexk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2018/05/13 12:18:55 markd Exp $
+$NetBSD: distinfo,v 1.13 2019/05/09 09:47:37 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/textproc/mendexk/Makefile b/textproc/mendexk/Makefile
index 5b1741b09d4..4776a15ab61 100644
--- a/textproc/mendexk/Makefile
+++ b/textproc/mendexk/Makefile
@@ -1,30 +1,20 @@
-# $NetBSD: Makefile,v 1.11 2018/05/13 12:20:33 markd Exp $
+# $NetBSD: Makefile,v 1.12 2019/05/09 09:47:37 adam Exp $
 
-DISTNAME=	texlive-20180414-source
-PKGNAME=	mendexk-2.6f
-PKGREVISION=	8
+.include "../../print/texlive/Makefile.common"
+
+PKGNAME=	mendexk-3.1
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	Replacement for makeindex with many enhancements
 LICENSE=	modified-bsd
 
 CONFLICTS+=	ja-ptex-bin-[0-9]*
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/mendexk
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/mendexk
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/mendexk
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
 CONFIGURE_ARGS+=	--with-system-kpathsea
 CONFIGURE_ARGS+=	--with-system-ptexenc
 
diff --git a/textproc/mendexk/distinfo b/textproc/mendexk/distinfo
index e185b6596f9..fb9ac43fd4c 100644
--- a/textproc/mendexk/distinfo
+++ b/textproc/mendexk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2018/05/13 12:20:33 markd Exp $
+$NetBSD: distinfo,v 1.11 2019/05/09 09:47:37 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
diff --git a/textproc/xindy/Makefile b/textproc/xindy/Makefile
index 7cfac9c6eff..72b8ccab214 100644
--- a/textproc/xindy/Makefile
+++ b/textproc/xindy/Makefile
@@ -1,39 +1,33 @@
-# $NetBSD: Makefile,v 1.3 2019/04/10 11:49:43 markd Exp $
+# $NetBSD: Makefile,v 1.4 2019/05/09 09:47:37 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	xindy-2.5.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	xindy runtime required by the tex-xindy package
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/utils/xindy
+EXTRACT_ELEMENTS+=	${DISTNAME}/utils/xindy
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	perl gmake
+USE_TOOLS+=	gmake perl
 WRKSRC=		${WRKDIR}/${DISTNAME}/utils/xindy
 INSTALL_DIRS=	xindy-src/src xindy-src/tex2xindy
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
-CONFIGURE_ARGS+=	--with-clisp-runtime=default
 CONFIGURE_ARGS+=	--disable-xindy-docs
 CONFIGURE_ARGS+=	--disable-xindy-rules
+CONFIGURE_ARGS+=	--with-clisp-runtime=default
 
 INSTALLATION_DIRS+=	bin
 
 post-install:
-	cd ${WRKSRC}; ${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
-                ${MAKE_PROGRAM} install-exec-hook
-	rm -rf ${DESTDIR}${PREFIX}/${PKGMANDIR}
+	cd ${WRKSRC} && ${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
+		${MAKE_PROGRAM} install-exec-hook
+	# man page conflicts with tex-xindy-doc
+	${RM} -f -r ${DESTDIR}${PREFIX}/${PKGMANDIR}
 
 .include "../../devel/libffcall/buildlink3.mk"
 .include "../../devel/libsigsegv/buildlink3.mk"
diff --git a/textproc/xindy/distinfo b/textproc/xindy/distinfo
index 43d3e29edfa..f71a879ded4 100644
--- a/textproc/xindy/distinfo
+++ b/textproc/xindy/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2018/12/03 19:28:02 markd Exp $
+$NetBSD: distinfo,v 1.2 2019/05/09 09:47:37 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
author	adam <adam@pkgsrc.org>	2019-05-09 09:47:34 +0000
committer	adam <adam@pkgsrc.org>	2019-05-09 09:47:34 +0000
commit	986656d34c35c7f478a481b7c3cf66e265113132 (patch)
tree	f204f2fc6109c43594a52133b6e1e272d0a8fa1b
parent	efe6a82b83640e5463562f6be37f855c6ded97f6 (diff)
download	pkgsrc-986656d34c35c7f478a481b7c3cf66e265113132.tar.gz