Update xdvik to 22.86.

Changes:
    + xdvi.h, xdvi.c, x_util.h, x_util.c, dvi-init.c: Fixed bugs in
      property handling on 64-bit systems (related to source specials).
    + Added support for XkbBell, to make the console bell work again.
    + Fixed #3514485 (mksedscript improperly handles macro values in
      c-auto.in that contain spaces) (fix from TeX Live).
    + dvi-draw.c: Fixed #3578773 (type1 -> pk fallback bug if >1 size used)
    + events.c: Fixed a bug involving a segfault when switching to a dvi
      file whose name does not end in .dvi
    + Many places:  Switched from using the t1lib library to FreeType2
    + Added support for horizontal scrolling

4 files changed, 27 insertions, 44 deletions

diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index 563b3d820a3..8fff38f53eb 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2013/04/24 10:12:32 sbd Exp $
+# $NetBSD: Makefile,v 1.14 2013/11/17 16:56:47 minskim Exp $
 
-DISTNAME=	texlive-20110705-source
-PKGNAME=	xdvik-22.84.16
-PKGREVISION=	4
+DISTNAME=	texlive-20130530-source
+PKGNAME=	xdvik-22.86
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.xz
@@ -12,7 +11,7 @@ HOMEPAGE=	http://xdvi.sourceforge.net/
 COMMENT=	Previewer for DVI files
 
 CONFLICTS+=	teTeX-bin<3.0nb25
-BUILD_DEPENDS+=	texlive-tetex-[0-9]*:../../print/texlive-tetex
+BUILD_DEPENDS+=	tex-texconfig-[0-9]*:../../print/tex-texconfig
 BUILD_DEPENDS+=	tex-xdvi-[0-9]*:../../print/tex-xdvi
 DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
 DEPENDS+=	kpathsea>=6.0.1:../../print/kpathsea
@@ -31,12 +30,13 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/texk/xdvik
 FIND_PREFIX:=	TEX_XDVI_PREFIX=tex-xdvi
 .include "../../mk/find-prefix.mk"
 
+CONFIGURE_ARGS+=	--with-system-freetype2
 CONFIGURE_ARGS+=	--with-system-kpathsea \
 		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
 		--with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
-CONFIGURE_ARGS+=	--with-system-t1lib \
-		--with-t1lib-includes=${BUILDLINK_PREFIX.t1lib} \
-		--with-t1lib-libdir=${BUILDLINK_PREFIX.t1lib}
+CONFIGURE_ARGS+=	--with-system-zlib \
+		--with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
+		--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
@@ -44,15 +44,14 @@ CONFIGURE_ARGS+=	--with-default-ps2pdf-path=${LOCALBASE}/bin/ps2pdf
 PKG_SYSCONFSUBDIR=	texmf
 
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdvi
-CONF_FILES=	${PREFIX}/share/texmf-dist/xdvi/XDvi \
+CONF_FILES=	${PREFIX}/share/examples/xdvik/XDvi \
 		${PKG_SYSCONFDIR}/xdvi/XDvi
 
 BUILD_DEFS+=	PAPERSIZE
 
-INSTALLATION_DIRS+=	share/texmf-dist/xdvi
+INSTALLATION_DIRS+=	share/examples/xdvik
 
 TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR}
-TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
 TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf-dist
 
 .include "../../mk/bsd.prefs.mk"
@@ -64,25 +63,22 @@ XDVI_PAPERSIZE=	a4
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../fonts/t1lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../print/kpathsea/buildlink3.mk"
 .include "../../print/kpathsea/texmf.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 
-post-extract:
-	${RM} ${WRKSRC}/texmf/XDvi
-	${MKDIR} -p ${WRKSRC}/texmf/xdvi
-	${CP} ${LOCALBASE}/share/texmf/xdvi/XDvi \
-		${WRKSRC}/texmf/xdvi
-
 post-build:
+	${MKDIR} -p ${WRKSRC}/texmf/xdvi
+	${CP} ${LOCALBASE}/share/texmf-dist/xdvi/XDvi ${WRKSRC}/texmf/xdvi
 	env TEXMFCONFIG=${LOCALBASE}/share/texmf \
 		TFC_TEXMFCONFIG=${WRKSRC}/texmf \
 		${LOCALBASE}/bin/texconfig xdvi paper ${XDVI_PAPERSIZE}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/texmf/xdvi/XDvi \
-		${DESTDIR}${PREFIX}/share/texmf-dist/xdvi
+		${DESTDIR}${PREFIX}/share/examples/xdvik
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xdvik/PLIST b/print/xdvik/PLIST
index 981c13c9f39..82c016e008d 100644
--- a/print/xdvik/PLIST
+++ b/print/xdvik/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2010/01/16 03:56:07 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/11/17 16:56:47 minskim Exp $
 bin/xdvi
 bin/xdvi-xaw
 man/man1/xdvi.1
-share/texmf-dist/xdvi/XDvi
-share/texmf/xdvi/pixmap/toolbar.xpm
-share/texmf/xdvi/pixmap/toolbar2.xpm
-share/texmf/xdvi/xdvi.cfg
+share/examples/xdvik/XDvi
+share/texmf-dist/dvips/config/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 77986ec1e03..b7c18f3a6df 100644
--- a/print/xdvik/distinfo
+++ b/print/xdvik/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2011/07/28 04:45:53 minskim Exp $
+$NetBSD: distinfo,v 1.5 2013/11/17 16:56:47 minskim Exp $
 
-SHA1 (texlive-20110705-source.tar.xz) = 7a47cfe847801c86c98da8ade181baf97339f6e4
-RMD160 (texlive-20110705-source.tar.xz) = fbcad494cc4717a0238ab2624f259270fce9332b
-Size (texlive-20110705-source.tar.xz) = 131207904 bytes
-SHA1 (patch-aa) = 0dd1d3a94a064224589f5014dfc8fa8c9e66bf40
+SHA1 (texlive-20130530-source.tar.xz) = 42f0a6fa3f49435991182f14e01276b2ee3fce61
+RMD160 (texlive-20130530-source.tar.xz) = 2d779ae5de979be86a9258b224dfc15cbcd76b18
+Size (texlive-20130530-source.tar.xz) = 179963948 bytes
+SHA1 (patch-aa) = c2e676ce06197017e08b6078b9504f36d3f9c1f2
 SHA1 (patch-ab) = bbbeb011aa888f2ee7dab84c1602fb3e1127cdb1
diff --git a/print/xdvik/patches/patch-aa b/print/xdvik/patches/patch-aa
index c3c0b44ef0e..974d6bd3735 100644
--- a/print/xdvik/patches/patch-aa
+++ b/print/xdvik/patches/patch-aa
@@ -1,24 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2010/01/16 03:56:07 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2013/11/17 16:56:47 minskim Exp $
 
 - Do not install XDvi; it is installed by tex-xdvi.
 - Fix texmf paths for pkgsrc.
 
 --- Makefile.in.orig	2009-06-16 05:01:38.000000000 -0700
 +++ Makefile.in
-@@ -436,9 +436,9 @@ EXTRA_DIST = psheader.txt mksedscript xd
- 	xdvi.icon xdvizilla xdvizilla.1
- CLEANFILES = psheader.c sedscript xdvi.1
- nodist_man1_MANS = xdvi.1
--xdvidir = ${prefix}/texmf/xdvi
--dist_xdvi_DATA = texmf/XDvi
--pixmapdir = ${prefix}/texmf/xdvi/pixmap
-+xdvidir = ${prefix}/share/texmf/xdvi
-+dist_xdvi_DATA = texmf/xdvi/XDvi
-+pixmapdir = ${prefix}/share/texmf/xdvi/pixmap
- dist_pixmap_DATA = pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
- dist_noinst_DATA = texmf/xdvi.cfg
- all: c-auto.h
-@@ -1579,7 +1579,7 @@ info: info-recursive
+@@ -1297,7 +1297,7 @@ info: info-recursive
  
  info-am: