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.

3 files changed, 35 insertions, 71 deletions

diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index 282203cbca8..7f335ed0d0f 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2018/05/13 17:19:19 bsiegert Exp $
+# $NetBSD: Makefile,v 1.27 2019/05/09 09:47:36 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
 
-DISTNAME=	texlive-20180414-source
 PKGNAME=	xdvik-22.87.03
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://xdvi.sourceforge.net/
 COMMENT=	Previewer for DVI files
 
@@ -16,31 +14,21 @@ BUILD_DEPENDS+=	tex-xdvi-[0-9]*:../../print/tex-xdvi
 DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
 DEPENDS+=	kpathsea>=6.2.1:../../print/kpathsea
 
-EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/texk/xdvik
+EXTRACT_ELEMENTS+=	${DISTNAME}/texk/xdvik
 
 USE_TOOLS+=	gs:run
 
-MAKE_JOBS_SAFE=	no
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/xdvik
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
-
+GNU_CONFIGURE_STRICT=	no # texk/xdvik/squeeze/configure
 CONFIGURE_ARGS+=	--with-system-freetype2
 CONFIGURE_ARGS+=	--with-system-kpathsea
-CONFIGURE_ARGS+=	--with-system-zlib \
-		--with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
-		--with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
+CONFIGURE_ARGS+=	--with-system-zlib
+CONFIGURE_ARGS+=	--with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+=	--with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
 CONFIGURE_ARGS+=	--with-xdvi-x-toolkit=xaw
-CONFIGURE_ARGS+=	--with-default-dvips-path=${LOCALBASE}/bin/dvips
-CONFIGURE_ARGS+=	--with-default-ps2pdf-path=${LOCALBASE}/bin/ps2pdf
-CONFIGURE_ENV+=		FT2_CONFIG=pkg-config \
-		PKG_CONFIG=${TOOLS_CMD.pkg-config}
+CONFIGURE_ARGS+=	--with-default-dvips-path=${PREFIX}/bin/dvips
+CONFIGURE_ARGS+=	--with-default-ps2pdf-path=${PREFIX}/bin/ps2pdf
 
 PKG_SYSCONFSUBDIR=	texmf
 
@@ -63,26 +51,25 @@ XDVI_PAPERSIZE=	us
 XDVI_PAPERSIZE=	a4
 .endif
 
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../print/kpathsea/buildlink3.mk"
-.include "../../print/kpathsea/texmf.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/xaw.buildlink3.mk"
-
 post-build:
 	${RM} ${WRKSRC}/texmf/XDvi
-	${MKDIR} -p ${WRKSRC}/texmf/xdvi
-	${CP} ${LOCALBASE}/share/texmf-dist/xdvi/XDvi ${WRKSRC}/texmf/xdvi
-	env TEXMFCONFIG=${LOCALBASE}/share/texmf \
+	${MKDIR} ${WRKSRC}/texmf/xdvi
+	${CP} ${PREFIX}/share/texmf-dist/xdvi/XDvi ${WRKSRC}/texmf/xdvi
+	${SETENV} TEXMFCONFIG=${PREFIX}/share/texmf \
 		TFC_TEXMFCONFIG=${WRKSRC}/texmf \
-		${LOCALBASE}/bin/texconfig xdvi paper ${XDVI_PAPERSIZE}
+		${PREFIX}/bin/texconfig xdvi paper ${XDVI_PAPERSIZE}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/texmf/xdvi/XDvi \
 		${DESTDIR}${PREFIX}/share/examples/xdvik
 
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../print/kpathsea/buildlink3.mk"
+.include "../../print/kpathsea/texmf.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xdvik/distinfo b/print/xdvik/distinfo
index 74bd4beddc2..37b427ae42d 100644
--- a/print/xdvik/distinfo
+++ b/print/xdvik/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2018/05/13 13:04:03 markd Exp $
+$NetBSD: distinfo,v 1.16 2019/05/09 09:47:36 adam Exp $
 
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
 SHA1 (patch-aa) = 92ab2c63769204f5ee42a10f84a47f636fae82c6
 SHA1 (patch-ab) = 09dbadaa8fb4575e4a437f3a3df266ae808e3278
-SHA1 (patch-configure) = 35e18dca51b22e8f469d5471c6139416fe933012
+SHA1 (patch-configure) = 10ecd7bd6928d1296bde494ce5173187e2734731
diff --git a/print/xdvik/patches/patch-configure b/print/xdvik/patches/patch-configure
index f3b0e9c5b28..525cf863d60 100644
--- a/print/xdvik/patches/patch-configure
+++ b/print/xdvik/patches/patch-configure
@@ -1,39 +1,16 @@
-$NetBSD: patch-configure,v 1.2 2018/05/05 23:17:33 dholland Exp $
+$NetBSD: patch-configure,v 1.3 2019/05/09 09:47:36 adam Exp $
 
-- check more aggressively for XInput 2.1 to fix native X netbsd-6 build
-- freetype2 upstream removed freetype-config; use pkg-config instead
+Check more aggressively for XInput 2.1 to fix native X netbsd-6 build.
 
---- configure.orig	2015-03-12 14:42:02.000000000 +0000
+--- configure.orig	2019-03-25 17:26:59.000000000 +0000
 +++ configure
-@@ -1519,7 +1519,7 @@ Optional Packages:
-                           zlib headers installed in DIR
-   --with-zlib-libdir=DIR  zlib library installed in DIR
-   --with-system-freetype2 use installed freetype2 headers and library
--                          (requires freetype-config)
-+                          (requires pkg-config)
-   --with-default-gs-lib-path=PATH
-                           set default path for finding font aliases to PATH
-   --with-default-dvips-path=CMD
-@@ -15845,6 +15845,9 @@ LDFLAGS="$X_LIBS $LDFLAGS"
+@@ -15847,6 +15847,9 @@ LDFLAGS="$X_LIBS $LDFLAGS"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <X11/extensions/XInput2.h>
 +#ifndef XIScrollClass
-+ bollocks
++ failhere
 +#endif
  int
  main ()
  {
-@@ -18955,9 +18958,9 @@ esac
- else
-   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
- fi
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
--  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
--  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
-+if $PKG_CONFIG --version >/dev/null 2>&1; then
-+  FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
-+  FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
- elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
-   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
- fi