pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   adam
Date:           Thu May  9 09:47:37 UTC 2019

Modified Files:
        pkgsrc/converters/dvi2tty: Makefile distinfo
        pkgsrc/fonts/afm2pl: Makefile distinfo
        pkgsrc/fonts/gsftopkk: Makefile distinfo
        pkgsrc/fonts/lcdftypetools: Makefile distinfo
        pkgsrc/fonts/ps2pkm: Makefile distinfo
        pkgsrc/fonts/ttf2pk: Makefile distinfo
        pkgsrc/fonts/ttfdump: Makefile distinfo
        pkgsrc/print/cjkutils: Makefile distinfo
        pkgsrc/print/dvidvi: Makefile distinfo
        pkgsrc/print/dviljk: Makefile distinfo
        pkgsrc/print/dvipdfmx: Makefile distinfo map.mk
        pkgsrc/print/dvipsk: Makefile distinfo
        pkgsrc/print/kpathsea: Makefile distinfo texmf.mk
        pkgsrc/print/lacheck: Makefile distinfo
        pkgsrc/print/luatex: Makefile PLIST distinfo
        pkgsrc/print/ptexenc: Makefile distinfo
        pkgsrc/print/seetexk: Makefile distinfo
        pkgsrc/print/tex4ht: Makefile distinfo
        pkgsrc/print/vlna: Makefile distinfo
        pkgsrc/print/xdvik: Makefile distinfo
        pkgsrc/print/xdvik/patches: patch-configure
        pkgsrc/print/xetex: Makefile distinfo
        pkgsrc/print/xpdfopen: Makefile distinfo
        pkgsrc/textproc/makeindexk: Makefile distinfo
        pkgsrc/textproc/mendexk: Makefile distinfo
        pkgsrc/textproc/xindy: Makefile distinfo
Added Files:
        pkgsrc/print/luatex/patches: patch-libs_lua53_lua53-src_src_luaconf.h
        pkgsrc/print/texlive: Makefile.common
Removed Files:
        pkgsrc/fonts/ttf2pk/patches: patch-configure
        pkgsrc/print/dvipsk/patches: patch-texk_dvipsk_writet1.c
        pkgsrc/print/luatex/patches: patch-ac
            patch-texk_web2c_luatexdir_font_writet1.w
            patch-texk_web2c_luatexdir_image_pdftoepdf.w
            patch-texk_web2c_luatexdir_lua_lepdflib.cc
        pkgsrc/print/xetex/patches: patch-texk_web2c_configure
        pkgsrc/print/xpdfopen/patches: patch-Makefile.in

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/converters/dvi2tty/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/converters/dvi2tty/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/afm2pl/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/afm2pl/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/fonts/gsftopkk/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/fonts/gsftopkk/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/fonts/lcdftypetools/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/lcdftypetools/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/fonts/ps2pkm/Makefile \
    pkgsrc/fonts/ps2pkm/distinfo
cvs rdiff -u -r1.36 -r1.37 pkgsrc/fonts/ttf2pk/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/fonts/ttf2pk/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/fonts/ttf2pk/patches/patch-configure
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/ttfdump/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/fonts/ttfdump/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/cjkutils/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/cjkutils/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/print/dvidvi/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/dvidvi/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/print/dviljk/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/dviljk/distinfo
cvs rdiff -u -r1.50 -r1.51 pkgsrc/print/dvipdfmx/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/print/dvipdfmx/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/dvipdfmx/map.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/print/dvipsk/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/print/dvipsk/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/print/dvipsk/patches/patch-texk_dvipsk_writet1.c
cvs rdiff -u -r1.30 -r1.31 pkgsrc/print/kpathsea/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/print/kpathsea/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/kpathsea/texmf.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/lacheck/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/lacheck/distinfo
cvs rdiff -u -r1.84 -r1.85 pkgsrc/print/luatex/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/luatex/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/print/luatex/distinfo
cvs rdiff -u -r1.7 -r0 pkgsrc/print/luatex/patches/patch-ac
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/luatex/patches/patch-libs_lua53_lua53-src_src_luaconf.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/print/luatex/patches/patch-texk_web2c_luatexdir_font_writet1.w
cvs rdiff -u -r1.8 -r0 \
    pkgsrc/print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w \
    pkgsrc/print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/ptexenc/Makefile \
    pkgsrc/print/ptexenc/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/seetexk/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/seetexk/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/tex4ht/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex4ht/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/print/texlive/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/vlna/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/vlna/distinfo
cvs rdiff -u -r1.26 -r1.27 pkgsrc/print/xdvik/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/print/xdvik/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/xdvik/patches/patch-configure
cvs rdiff -u -r1.88 -r1.89 pkgsrc/print/xetex/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/print/xetex/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/print/xetex/patches/patch-texk_web2c_configure
cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/xpdfopen/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/xpdfopen/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/print/xpdfopen/patches/patch-Makefile.in
cvs rdiff -u -r1.14 -r1.15 pkgsrc/textproc/makeindexk/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/makeindexk/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/mendexk/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/mendexk/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/xindy/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/xindy/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/converters/dvi2tty/Makefile
diff -u pkgsrc/converters/dvi2tty/Makefile:1.19 pkgsrc/converters/dvi2tty/Makefile:1.20
--- pkgsrc/converters/dvi2tty/Makefile:1.19     Sun May 13 12:01:26 2018
+++ pkgsrc/converters/dvi2tty/Makefile  Thu May  9 09:47:34 2019
@@ -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@localhost
 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
 

Index: pkgsrc/converters/dvi2tty/distinfo
diff -u pkgsrc/converters/dvi2tty/distinfo:1.9 pkgsrc/converters/dvi2tty/distinfo:1.10
--- pkgsrc/converters/dvi2tty/distinfo:1.9      Sun May 13 12:01:26 2018
+++ pkgsrc/converters/dvi2tty/distinfo  Thu May  9 09:47:34 2019
@@ -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

Index: pkgsrc/fonts/afm2pl/Makefile
diff -u pkgsrc/fonts/afm2pl/Makefile:1.5 pkgsrc/fonts/afm2pl/Makefile:1.6
--- pkgsrc/fonts/afm2pl/Makefile:1.5    Sun May 13 12:03:52 2018
+++ pkgsrc/fonts/afm2pl/Makefile        Thu May  9 09:47:34 2019
@@ -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@localhost
 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

Index: pkgsrc/fonts/afm2pl/distinfo
diff -u pkgsrc/fonts/afm2pl/distinfo:1.6 pkgsrc/fonts/afm2pl/distinfo:1.7
--- pkgsrc/fonts/afm2pl/distinfo:1.6    Sun May 13 12:03:52 2018
+++ pkgsrc/fonts/afm2pl/distinfo        Thu May  9 09:47:34 2019
@@ -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

Index: pkgsrc/fonts/gsftopkk/Makefile
diff -u pkgsrc/fonts/gsftopkk/Makefile:1.14 pkgsrc/fonts/gsftopkk/Makefile:1.15
--- pkgsrc/fonts/gsftopkk/Makefile:1.14 Sun May 13 12:06:11 2018
+++ pkgsrc/fonts/gsftopkk/Makefile      Thu May  9 09:47:34 2019
@@ -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@localhost
 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
 

Index: pkgsrc/fonts/gsftopkk/distinfo
diff -u pkgsrc/fonts/gsftopkk/distinfo:1.11 pkgsrc/fonts/gsftopkk/distinfo:1.12
--- pkgsrc/fonts/gsftopkk/distinfo:1.11 Sun May 13 12:06:11 2018
+++ pkgsrc/fonts/gsftopkk/distinfo      Thu May  9 09:47:34 2019
@@ -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

Index: pkgsrc/fonts/lcdftypetools/Makefile
diff -u pkgsrc/fonts/lcdftypetools/Makefile:1.7 pkgsrc/fonts/lcdftypetools/Makefile:1.8
--- pkgsrc/fonts/lcdftypetools/Makefile:1.7     Sun May 13 12:09:31 2018
+++ pkgsrc/fonts/lcdftypetools/Makefile Thu May  9 09:47:34 2019
@@ -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@localhost
 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

Index: pkgsrc/fonts/lcdftypetools/distinfo
diff -u pkgsrc/fonts/lcdftypetools/distinfo:1.6 pkgsrc/fonts/lcdftypetools/distinfo:1.7
--- pkgsrc/fonts/lcdftypetools/distinfo:1.6     Sun May 13 12:09:31 2018
+++ pkgsrc/fonts/lcdftypetools/distinfo Thu May  9 09:47:34 2019
@@ -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

Index: pkgsrc/fonts/ps2pkm/Makefile
diff -u pkgsrc/fonts/ps2pkm/Makefile:1.13 pkgsrc/fonts/ps2pkm/Makefile:1.14
--- pkgsrc/fonts/ps2pkm/Makefile:1.13   Sun May 13 12:11:46 2018
+++ pkgsrc/fonts/ps2pkm/Makefile        Thu May  9 09:47:34 2019
@@ -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@localhost
 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
 
Index: pkgsrc/fonts/ps2pkm/distinfo
diff -u pkgsrc/fonts/ps2pkm/distinfo:1.13 pkgsrc/fonts/ps2pkm/distinfo:1.14
--- pkgsrc/fonts/ps2pkm/distinfo:1.13   Sun May 13 12:11:46 2018
+++ pkgsrc/fonts/ps2pkm/distinfo        Thu May  9 09:47:34 2019
@@ -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

Index: pkgsrc/fonts/ttf2pk/Makefile
diff -u pkgsrc/fonts/ttf2pk/Makefile:1.36 pkgsrc/fonts/ttf2pk/Makefile:1.37
--- pkgsrc/fonts/ttf2pk/Makefile:1.36   Sun May 13 12:14:17 2018
+++ pkgsrc/fonts/ttf2pk/Makefile        Thu May  9 09:47:34 2019
@@ -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@localhost
 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"

Index: pkgsrc/fonts/ttf2pk/distinfo
diff -u pkgsrc/fonts/ttf2pk/distinfo:1.12 pkgsrc/fonts/ttf2pk/distinfo:1.13
--- pkgsrc/fonts/ttf2pk/distinfo:1.12   Sun May 13 12:14:17 2018
+++ pkgsrc/fonts/ttf2pk/distinfo        Thu May  9 09:47:34 2019
@@ -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

Index: pkgsrc/fonts/ttfdump/Makefile
diff -u pkgsrc/fonts/ttfdump/Makefile:1.8 pkgsrc/fonts/ttfdump/Makefile:1.9
--- pkgsrc/fonts/ttfdump/Makefile:1.8   Sun May 13 12:16:18 2018
+++ pkgsrc/fonts/ttfdump/Makefile       Thu May  9 09:47:35 2019
@@ -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@localhost
 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

Index: pkgsrc/fonts/ttfdump/distinfo
diff -u pkgsrc/fonts/ttfdump/distinfo:1.7 pkgsrc/fonts/ttfdump/distinfo:1.8
--- pkgsrc/fonts/ttfdump/distinfo:1.7   Sun May 13 12:16:18 2018
+++ pkgsrc/fonts/ttfdump/distinfo       Thu May  9 09:47:35 2019
@@ -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

Index: pkgsrc/print/cjkutils/Makefile
diff -u pkgsrc/print/cjkutils/Makefile:1.10 pkgsrc/print/cjkutils/Makefile:1.11
--- pkgsrc/print/cjkutils/Makefile:1.10 Sun May 13 12:22:46 2018
+++ pkgsrc/print/cjkutils/Makefile      Thu May  9 09:47:35 2019
@@ -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@localhost,hubertf%NetBSD.org@localhost
 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"

Index: pkgsrc/print/cjkutils/distinfo
diff -u pkgsrc/print/cjkutils/distinfo:1.8 pkgsrc/print/cjkutils/distinfo:1.9
--- pkgsrc/print/cjkutils/distinfo:1.8  Sun May 13 12:22:46 2018
+++ pkgsrc/print/cjkutils/distinfo      Thu May  9 09:47:35 2019
@@ -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

Index: pkgsrc/print/dvidvi/Makefile
diff -u pkgsrc/print/dvidvi/Makefile:1.15 pkgsrc/print/dvidvi/Makefile:1.16
--- pkgsrc/print/dvidvi/Makefile:1.15   Sun May 13 12:24:31 2018
+++ pkgsrc/print/dvidvi/Makefile        Thu May  9 09:47:35 2019
@@ -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@localhost
 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

Index: pkgsrc/print/dvidvi/distinfo
diff -u pkgsrc/print/dvidvi/distinfo:1.6 pkgsrc/print/dvidvi/distinfo:1.7
--- pkgsrc/print/dvidvi/distinfo:1.6    Sun May 13 12:24:31 2018
+++ pkgsrc/print/dvidvi/distinfo        Thu May  9 09:47:35 2019
@@ -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

Index: pkgsrc/print/dviljk/Makefile
diff -u pkgsrc/print/dviljk/Makefile:1.14 pkgsrc/print/dviljk/Makefile:1.15
--- pkgsrc/print/dviljk/Makefile:1.14   Sun May 13 12:26:15 2018
+++ pkgsrc/print/dviljk/Makefile        Thu May  9 09:47:35 2019
@@ -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@localhost
 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

Index: pkgsrc/print/dviljk/distinfo
diff -u pkgsrc/print/dviljk/distinfo:1.11 pkgsrc/print/dviljk/distinfo:1.12
--- pkgsrc/print/dviljk/distinfo:1.11   Sun May 13 12:26:15 2018
+++ pkgsrc/print/dviljk/distinfo        Thu May  9 09:47:35 2019
@@ -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

Index: pkgsrc/print/dvipdfmx/Makefile
diff -u pkgsrc/print/dvipdfmx/Makefile:1.50 pkgsrc/print/dvipdfmx/Makefile:1.51
--- pkgsrc/print/dvipdfmx/Makefile:1.50 Sun May 13 12:29:00 2018
+++ pkgsrc/print/dvipdfmx/Makefile      Thu May  9 09:47:35 2019
@@ -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@localhost
 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]*:../../prin
 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 co
 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"

Index: pkgsrc/print/dvipdfmx/distinfo
diff -u pkgsrc/print/dvipdfmx/distinfo:1.17 pkgsrc/print/dvipdfmx/distinfo:1.18
--- pkgsrc/print/dvipdfmx/distinfo:1.17 Sun May 13 12:29:00 2018
+++ pkgsrc/print/dvipdfmx/distinfo      Thu May  9 09:47:35 2019
@@ -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

Index: pkgsrc/print/dvipdfmx/map.mk
diff -u pkgsrc/print/dvipdfmx/map.mk:1.9 pkgsrc/print/dvipdfmx/map.mk:1.10
--- pkgsrc/print/dvipdfmx/map.mk:1.9    Sat Jan 16 03:52:41 2010
+++ pkgsrc/print/dvipdfmx/map.mk        Thu May  9 09:47:35 2019
@@ -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:../.
 .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
 

Index: pkgsrc/print/dvipsk/Makefile
diff -u pkgsrc/print/dvipsk/Makefile:1.22 pkgsrc/print/dvipsk/Makefile:1.23
--- pkgsrc/print/dvipsk/Makefile:1.22   Sun Apr 28 11:31:13 2019
+++ pkgsrc/print/dvipsk/Makefile        Thu May  9 09:47:35 2019
@@ -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@localhost
 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/dvips
 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"

Index: pkgsrc/print/dvipsk/distinfo
diff -u pkgsrc/print/dvipsk/distinfo:1.17 pkgsrc/print/dvipsk/distinfo:1.18
--- pkgsrc/print/dvipsk/distinfo:1.17   Thu Nov  1 10:55:57 2018
+++ pkgsrc/print/dvipsk/distinfo        Thu May  9 09:47:35 2019
@@ -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

Index: pkgsrc/print/kpathsea/Makefile
diff -u pkgsrc/print/kpathsea/Makefile:1.30 pkgsrc/print/kpathsea/Makefile:1.31
--- pkgsrc/print/kpathsea/Makefile:1.30 Sun May 13 12:36:28 2018
+++ pkgsrc/print/kpathsea/Makefile      Thu May  9 09:47:35 2019
@@ -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@localhost
 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

Index: pkgsrc/print/kpathsea/distinfo
diff -u pkgsrc/print/kpathsea/distinfo:1.23 pkgsrc/print/kpathsea/distinfo:1.24
--- pkgsrc/print/kpathsea/distinfo:1.23 Sun May 13 12:36:28 2018
+++ pkgsrc/print/kpathsea/distinfo      Thu May  9 09:47:35 2019
@@ -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

Index: pkgsrc/print/kpathsea/texmf.mk
diff -u pkgsrc/print/kpathsea/texmf.mk:1.9 pkgsrc/print/kpathsea/texmf.mk:1.10
--- pkgsrc/print/kpathsea/texmf.mk:1.9  Thu Jul 19 12:57:38 2018
+++ pkgsrc/print/kpathsea/texmf.mk      Thu May  9 09:47:35 2019
@@ -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"

Index: pkgsrc/print/lacheck/Makefile
diff -u pkgsrc/print/lacheck/Makefile:1.5 pkgsrc/print/lacheck/Makefile:1.6
--- pkgsrc/print/lacheck/Makefile:1.5   Sun May 13 12:39:23 2018
+++ pkgsrc/print/lacheck/Makefile       Thu May  9 09:47:35 2019
@@ -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@localhost
-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"

Index: pkgsrc/print/lacheck/distinfo
diff -u pkgsrc/print/lacheck/distinfo:1.6 pkgsrc/print/lacheck/distinfo:1.7
--- pkgsrc/print/lacheck/distinfo:1.6   Sun May 13 12:39:23 2018
+++ pkgsrc/print/lacheck/distinfo       Thu May  9 09:47:35 2019
@@ -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

Index: pkgsrc/print/luatex/Makefile
diff -u pkgsrc/print/luatex/Makefile:1.84 pkgsrc/print/luatex/Makefile:1.85
--- pkgsrc/print/luatex/Makefile:1.84   Sun Apr 28 13:15:25 2019
+++ pkgsrc/print/luatex/Makefile        Thu May  9 09:47:35 2019
@@ -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@localhost
-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+= kpathse
 .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"

Index: pkgsrc/print/luatex/PLIST
diff -u pkgsrc/print/luatex/PLIST:1.4 pkgsrc/print/luatex/PLIST:1.5
--- pkgsrc/print/luatex/PLIST:1.4       Sat Dec 12 19:11:47 2015
+++ pkgsrc/print/luatex/PLIST   Thu May  9 09:47:35 2019
@@ -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

Index: pkgsrc/print/luatex/distinfo
diff -u pkgsrc/print/luatex/distinfo:1.34 pkgsrc/print/luatex/distinfo:1.35
--- pkgsrc/print/luatex/distinfo:1.34   Sun Feb 17 11:17:37 2019
+++ pkgsrc/print/luatex/distinfo        Thu May  9 09:47:35 2019
@@ -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

Index: pkgsrc/print/ptexenc/Makefile
diff -u pkgsrc/print/ptexenc/Makefile:1.11 pkgsrc/print/ptexenc/Makefile:1.12
--- pkgsrc/print/ptexenc/Makefile:1.11  Sun May 13 12:49:18 2018
+++ pkgsrc/print/ptexenc/Makefile       Thu May  9 09:47:36 2019
@@ -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@localhost
 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"
Index: pkgsrc/print/ptexenc/distinfo
diff -u pkgsrc/print/ptexenc/distinfo:1.11 pkgsrc/print/ptexenc/distinfo:1.12
--- pkgsrc/print/ptexenc/distinfo:1.11  Sun May 13 12:49:18 2018
+++ pkgsrc/print/ptexenc/distinfo       Thu May  9 09:47:36 2019
@@ -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

Index: pkgsrc/print/seetexk/Makefile
diff -u pkgsrc/print/seetexk/Makefile:1.5 pkgsrc/print/seetexk/Makefile:1.6
--- pkgsrc/print/seetexk/Makefile:1.5   Sun May 13 12:50:57 2018
+++ pkgsrc/print/seetexk/Makefile       Thu May  9 09:47:36 2019
@@ -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@localhost
 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

Index: pkgsrc/print/seetexk/distinfo
diff -u pkgsrc/print/seetexk/distinfo:1.6 pkgsrc/print/seetexk/distinfo:1.7
--- pkgsrc/print/seetexk/distinfo:1.6   Sun May 13 12:50:57 2018
+++ pkgsrc/print/seetexk/distinfo       Thu May  9 09:47:36 2019
@@ -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

Index: pkgsrc/print/tex4ht/Makefile
diff -u pkgsrc/print/tex4ht/Makefile:1.9 pkgsrc/print/tex4ht/Makefile:1.10
--- pkgsrc/print/tex4ht/Makefile:1.9    Wed Aug 22 09:46:16 2018
+++ pkgsrc/print/tex4ht/Makefile        Thu May  9 09:47:36 2019
@@ -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@localhost
 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

Index: pkgsrc/print/tex4ht/distinfo
diff -u pkgsrc/print/tex4ht/distinfo:1.6 pkgsrc/print/tex4ht/distinfo:1.7
--- pkgsrc/print/tex4ht/distinfo:1.6    Sun May 13 12:53:19 2018
+++ pkgsrc/print/tex4ht/distinfo        Thu May  9 09:47:36 2019
@@ -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

Index: pkgsrc/print/vlna/Makefile
diff -u pkgsrc/print/vlna/Makefile:1.5 pkgsrc/print/vlna/Makefile:1.6
--- pkgsrc/print/vlna/Makefile:1.5      Sun May 13 12:55:10 2018
+++ pkgsrc/print/vlna/Makefile  Thu May  9 09:47:36 2019
@@ -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@localhost
 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"

Index: pkgsrc/print/vlna/distinfo
diff -u pkgsrc/print/vlna/distinfo:1.6 pkgsrc/print/vlna/distinfo:1.7
--- pkgsrc/print/vlna/distinfo:1.6      Sun May 13 12:55:10 2018
+++ pkgsrc/print/vlna/distinfo  Thu May  9 09:47:36 2019
@@ -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

Index: pkgsrc/print/xdvik/Makefile
diff -u pkgsrc/print/xdvik/Makefile:1.26 pkgsrc/print/xdvik/Makefile:1.27
--- pkgsrc/print/xdvik/Makefile:1.26    Sun May 13 17:19:19 2018
+++ pkgsrc/print/xdvik/Makefile Thu May  9 09:47:36 2019
@@ -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@localhost
 HOMEPAGE=      http://xdvi.sourceforge.net/
 COMMENT=       Previewer for DVI files
 
@@ -16,31 +14,21 @@ BUILD_DEPENDS+=     tex-xdvi-[0-9]*:../../pr
 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"

Index: pkgsrc/print/xdvik/distinfo
diff -u pkgsrc/print/xdvik/distinfo:1.15 pkgsrc/print/xdvik/distinfo:1.16
--- pkgsrc/print/xdvik/distinfo:1.15    Sun May 13 13:04:03 2018
+++ pkgsrc/print/xdvik/distinfo Thu May  9 09:47:36 2019
@@ -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

Index: pkgsrc/print/xdvik/patches/patch-configure
diff -u pkgsrc/print/xdvik/patches/patch-configure:1.2 pkgsrc/print/xdvik/patches/patch-configure:1.3
--- pkgsrc/print/xdvik/patches/patch-configure:1.2      Sat May  5 23:17:33 2018
+++ pkgsrc/print/xdvik/patches/patch-configure  Thu May  9 09:47:36 2019
@@ -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

Index: pkgsrc/print/xetex/Makefile
diff -u pkgsrc/print/xetex/Makefile:1.88 pkgsrc/print/xetex/Makefile:1.89
--- pkgsrc/print/xetex/Makefile:1.88    Wed Apr  3 00:33:03 2019
+++ pkgsrc/print/xetex/Makefile Thu May  9 09:47:36 2019
@@ -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@localhost
 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
-
-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
+EXTRACT_ELEMENTS+=     ${DISTNAME}/libs/graphite2
+EXTRACT_ELEMENTS+=     ${DISTNAME}/libs/harfbuzz
+EXTRACT_ELEMENTS+=     ${DISTNAME}/libs/xpdf
+EXTRACT_ELEMENTS+=     ${DISTNAME}/texk/web2c
+
+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+= kpathse
 .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"

Index: pkgsrc/print/xetex/distinfo
diff -u pkgsrc/print/xetex/distinfo:1.22 pkgsrc/print/xetex/distinfo:1.23
--- pkgsrc/print/xetex/distinfo:1.22    Wed Dec  5 21:44:03 2018
+++ pkgsrc/print/xetex/distinfo Thu May  9 09:47:36 2019
@@ -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

Index: pkgsrc/print/xpdfopen/Makefile
diff -u pkgsrc/print/xpdfopen/Makefile:1.10 pkgsrc/print/xpdfopen/Makefile:1.11
--- pkgsrc/print/xpdfopen/Makefile:1.10 Sun May 13 13:09:26 2018
+++ pkgsrc/print/xpdfopen/Makefile      Thu May  9 09:47:36 2019
@@ -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@localhost
 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"

Index: pkgsrc/print/xpdfopen/distinfo
diff -u pkgsrc/print/xpdfopen/distinfo:1.8 pkgsrc/print/xpdfopen/distinfo:1.9
--- pkgsrc/print/xpdfopen/distinfo:1.8  Sun May 13 13:09:26 2018
+++ pkgsrc/print/xpdfopen/distinfo      Thu May  9 09:47:36 2019
@@ -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

Index: pkgsrc/textproc/makeindexk/Makefile
diff -u pkgsrc/textproc/makeindexk/Makefile:1.14 pkgsrc/textproc/makeindexk/Makefile:1.15
--- pkgsrc/textproc/makeindexk/Makefile:1.14    Sun May 13 12:18:55 2018
+++ pkgsrc/textproc/makeindexk/Makefile Thu May  9 09:47:37 2019
@@ -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@localhost
 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
 

Index: pkgsrc/textproc/makeindexk/distinfo
diff -u pkgsrc/textproc/makeindexk/distinfo:1.12 pkgsrc/textproc/makeindexk/distinfo:1.13
--- pkgsrc/textproc/makeindexk/distinfo:1.12    Sun May 13 12:18:55 2018
+++ pkgsrc/textproc/makeindexk/distinfo Thu May  9 09:47:37 2019
@@ -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

Index: pkgsrc/textproc/mendexk/Makefile
diff -u pkgsrc/textproc/mendexk/Makefile:1.11 pkgsrc/textproc/mendexk/Makefile:1.12
--- pkgsrc/textproc/mendexk/Makefile:1.11       Sun May 13 12:20:33 2018
+++ pkgsrc/textproc/mendexk/Makefile    Thu May  9 09:47:37 2019
@@ -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@localhost
 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
 

Index: pkgsrc/textproc/mendexk/distinfo
diff -u pkgsrc/textproc/mendexk/distinfo:1.10 pkgsrc/textproc/mendexk/distinfo:1.11
--- pkgsrc/textproc/mendexk/distinfo:1.10       Sun May 13 12:20:33 2018
+++ pkgsrc/textproc/mendexk/distinfo    Thu May  9 09:47:37 2019
@@ -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

Index: pkgsrc/textproc/xindy/Makefile
diff -u pkgsrc/textproc/xindy/Makefile:1.3 pkgsrc/textproc/xindy/Makefile:1.4
--- pkgsrc/textproc/xindy/Makefile:1.3  Wed Apr 10 11:49:43 2019
+++ pkgsrc/textproc/xindy/Makefile      Thu May  9 09:47:37 2019
@@ -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@localhost
 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"

Index: pkgsrc/textproc/xindy/distinfo
diff -u pkgsrc/textproc/xindy/distinfo:1.1 pkgsrc/textproc/xindy/distinfo:1.2
--- pkgsrc/textproc/xindy/distinfo:1.1  Mon Dec  3 19:28:02 2018
+++ pkgsrc/textproc/xindy/distinfo      Thu May  9 09:47:37 2019
@@ -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

Added files:

Index: pkgsrc/print/luatex/patches/patch-libs_lua53_lua53-src_src_luaconf.h
diff -u /dev/null pkgsrc/print/luatex/patches/patch-libs_lua53_lua53-src_src_luaconf.h:1.1
--- /dev/null   Thu May  9 09:47:37 2019
+++ pkgsrc/print/luatex/patches/patch-libs_lua53_lua53-src_src_luaconf.h        Thu May  9 09:47:36 2019
@@ -0,0 +1,25 @@
+$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/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_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_PATH_DEFAULT  \
+@@ -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
+ #else                         /* }{ */
+ #define LUAI_FUNC     extern

Index: pkgsrc/print/texlive/Makefile.common
diff -u /dev/null pkgsrc/print/texlive/Makefile.common:1.1
--- /dev/null   Thu May  9 09:47:38 2019
+++ pkgsrc/print/texlive/Makefile.common        Thu May  9 09:47:34 2019
@@ -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@localhost
+
+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



Home | Main Index | Thread Index | Old Index