xdvik: update to 22.87.03nb2

texlive 2018 version

4 files changed, 24 insertions, 22 deletions

diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index ff538d9a060..0cd1403bdd5 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2018/05/05 23:17:33 dholland Exp $
+# $NetBSD: Makefile,v 1.25 2018/05/13 13:04:03 markd Exp $
 
-DISTNAME=	texlive-20170524-source
+DISTNAME=	texlive-20180414-source
 PKGNAME=	xdvik-22.87.03
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2017/
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2018/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
@@ -63,6 +63,7 @@ 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"
diff --git a/print/xdvik/PLIST b/print/xdvik/PLIST
index 82c016e008d..b0436915b8e 100644
--- a/print/xdvik/PLIST
+++ b/print/xdvik/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2013/11/17 16:56:47 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/05/13 13:04:03 markd Exp $
 bin/xdvi
 bin/xdvi-xaw
 man/man1/xdvi.1
+share/applications/xdvi.desktop
 share/examples/xdvik/XDvi
-share/texmf-dist/dvips/config/config.xdvi
+share/texmf-dist/dvips/xdvi/config.xdvi
 share/texmf-dist/xdvi/pixmap/toolbar.xpm
 share/texmf-dist/xdvi/pixmap/toolbar2.xpm
diff --git a/print/xdvik/distinfo b/print/xdvik/distinfo
index 72f458b03d0..74bd4beddc2 100644
--- a/print/xdvik/distinfo
+++ b/print/xdvik/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2018/05/05 23:17:33 dholland Exp $
+$NetBSD: distinfo,v 1.15 2018/05/13 13:04:03 markd Exp $
 
-SHA1 (texlive-20170524-source.tar.xz) = 1c1383ddb1b871c6b8ce49a4ae3c1a33d454a7b6
-RMD160 (texlive-20170524-source.tar.xz) = a8430c19fe1727cf308fe03e5838105260c0d71e
-SHA512 (texlive-20170524-source.tar.xz) = 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
-Size (texlive-20170524-source.tar.xz) = 63483372 bytes
-SHA1 (patch-aa) = 08bc8e8a7a2cd7a65c0a176f02fdd2930d1d9ae2
+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-aa) = 92ab2c63769204f5ee42a10f84a47f636fae82c6
 SHA1 (patch-ab) = 09dbadaa8fb4575e4a437f3a3df266ae808e3278
 SHA1 (patch-configure) = 35e18dca51b22e8f469d5471c6139416fe933012
diff --git a/print/xdvik/patches/patch-aa b/print/xdvik/patches/patch-aa
index 08c19705cc8..4160342abb1 100644
--- a/print/xdvik/patches/patch-aa
+++ b/print/xdvik/patches/patch-aa
@@ -1,25 +1,25 @@
-$NetBSD: patch-aa,v 1.4 2014/07/20 00:06:19 dholland Exp $
+$NetBSD: patch-aa,v 1.5 2018/05/13 13:04:03 markd Exp $
 
 - Do not install XDvi; it is installed by tex-xdvi.
 - Don't depend on it either as it's removed by the pkgsrc makefile.
 
---- Makefile.in.orig	2013-04-08 06:34:46.000000000 +0000
+--- Makefile.in.orig	2018-01-17 22:59:48.000000000 +0000
 +++ Makefile.in
-@@ -533,7 +533,7 @@ EXTRA_DIST = psheader.txt mksedscript xd
+@@ -577,7 +577,7 @@ EXTRA_DIST = psheader.txt mksedscript xd
  CLEANFILES = psheader.c sedscript xdvi.1
  nodist_man1_MANS = xdvi.1
  xdvidir = $(datarootdir)/texmf-dist/xdvi
 -dist_xdvi_DATA = texmf/XDvi
-+dist_xdvi_DATA =
++dist_xdvi_DATA = 
  pixmapdir = $(datarootdir)/texmf-dist/xdvi/pixmap
  dist_pixmap_DATA = pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
- dvipsconfdir = $(datarootdir)/texmf-dist/dvips/config
-@@ -1297,7 +1297,7 @@ info: info-recursive
- 
+ dvipsconfdir = $(datarootdir)/texmf-dist/dvips/xdvi
+@@ -1372,7 +1372,7 @@ info: info-recursive
  info-am:
  
--install-data-am: install-dist_pixmapDATA install-dist_xdviDATA \
-+install-data-am: install-dist_pixmapDATA \
- 	install-man
+ install-data-am: install-desktopDATA install-dist_pixmapDATA \
+-	install-dist_xdviDATA install-man
++	install-man
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-recursive