Update xdvik to 22.84.16.

Changes since 22.84.14:
    + Fixed #2067614: Re-introduced default binding for key 0
      which had been forgotten in previous changes
    + Fixed #1502137 (compiler warnings on 64bit systems)
    + Fixed some typos in the man page

4 files changed, 60 insertions, 40 deletions

diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index 9ca903d6edd..ed6d32e033a 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2009/12/24 17:30:01 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/01/16 03:56:07 minskim Exp $
 
-DISTNAME=	xdvik-22.84.14
-PKGREVISION=	2
+DISTNAME=	texlive-20091011-source
+PKGNAME=	xdvik-22.84.16
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xdvi/}
+MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://xdvi.sourceforge.net/
@@ -11,7 +12,12 @@ COMMENT=	Previewer for DVI files
 
 CONFLICTS+=	teTeX-bin<3.0nb25
 BUILD_DEPENDS+=	texlive-tetex-[0-9]*:../../print/texlive-tetex
-BUILD_DEPENDS+=	tex-bin-xdvi-[0-9]*:../../print/tex-bin-xdvi
+BUILD_DEPENDS+=	tex-xdvi-[0-9]*:../../print/tex-xdvi
+DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
+DEPENDS+=	ghostscript-[0-9]*:../../print/ghostscript
+
+EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
+			${DISTNAME}/texk/xdvik
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=	no
@@ -20,17 +26,18 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/xdvik
 
-FIND_PREFIX:=	TETEX_PREFIX=texlive-tetex BIN_XDVI_PREFIX=tex-bin-xdvi
+FIND_PREFIX:=	TEX_XDVI_PREFIX=tex-xdvi
 .include "../../mk/find-prefix.mk"
 
-CONFIGURE_ARGS+=	--with-system-kpathsea --with-system-t1lib \
-			--with-xdvi-x-toolkit=xaw
-
-MAKE_FLAGS+=	LIBTOOL=${LIBTOOL:Q} \
-		kpathsea_parent=${BUILDLINK_PREFIX.kpathsea}/include
-
-INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
-			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+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-xdvi-x-toolkit=xaw
+CONFIGURE_ARGS+=	--with-default-dvips-path=${LOCALBASE}/bin/dvips
+CONFIGURE_ARGS+=	--with-default-ps2pdf-path=${LOCALBASE}/bin/ps2pdf
 
 PKG_SYSCONFSUBDIR=	texmf
 
@@ -64,14 +71,14 @@ XDVI_PAPERSIZE=	a4
 
 post-extract:
 	${RM} ${WRKSRC}/texmf/XDvi
-
-post-build:
 	${MKDIR} -p ${WRKSRC}/texmf/xdvi
-	${CP} ${BIN_XDVI_PREFIX}/share/texmf/xdvi/XDvi \
+	${CP} ${LOCALBASE}/share/texmf/xdvi/XDvi \
 		${WRKSRC}/texmf/xdvi
-	env TEXMFCONFIG=${BIN_XDVI_PREFIX}/share/texmf \
+
+post-build:
+	env TEXMFCONFIG=${LOCALBASE}/share/texmf \
 		TFC_TEXMFCONFIG=${WRKSRC}/texmf \
-		${TETEX_PREFIX}/bin/texconfig xdvi paper ${XDVI_PAPERSIZE}
+		${LOCALBASE}/bin/texconfig xdvi paper ${XDVI_PAPERSIZE}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/texmf/xdvi/XDvi \
diff --git a/print/xdvik/PLIST b/print/xdvik/PLIST
index f479d3ec829..981c13c9f39 100644
--- a/print/xdvik/PLIST
+++ b/print/xdvik/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/02/23 19:32:01 minskim Exp $
-bin/oxdvi
+@comment $NetBSD: PLIST,v 1.2 2010/01/16 03:56:07 minskim Exp $
 bin/xdvi
 bin/xdvi-xaw
-man/man1/oxdvi.1
 man/man1/xdvi.1
 share/texmf-dist/xdvi/XDvi
-share/texmf/xdvi/pixmaps/toolbar.xpm
-share/texmf/xdvi/pixmaps/toolbar2.xpm
+share/texmf/xdvi/pixmap/toolbar.xpm
+share/texmf/xdvi/pixmap/toolbar2.xpm
 share/texmf/xdvi/xdvi.cfg
diff --git a/print/xdvik/distinfo b/print/xdvik/distinfo
index e29a6db3e96..3551ab1937c 100644
--- a/print/xdvik/distinfo
+++ b/print/xdvik/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/02/23 19:32:01 minskim Exp $
+$NetBSD: distinfo,v 1.2 2010/01/16 03:56:07 minskim Exp $
 
-SHA1 (xdvik-22.84.14.tar.gz) = 1ca7f0c7930d24c3e10cc1d7115abed7dd39e95e
-RMD160 (xdvik-22.84.14.tar.gz) = a19920fcc9e4e5d2878b16e65fa95bab5f034b74
-Size (xdvik-22.84.14.tar.gz) = 2016256 bytes
-SHA1 (patch-aa) = 878d51f49647160c6f75acb1ca386fefb7fd778b
+SHA1 (texlive-20091011-source.tar.xz) = 82fc9fcdb82c63a00f4b08a51733c761cbda897d
+RMD160 (texlive-20091011-source.tar.xz) = 81b86cd93e629d6b1b3d7918848dd76babc0d5a9
+Size (texlive-20091011-source.tar.xz) = 29683728 bytes
+SHA1 (patch-aa) = 0dd1d3a94a064224589f5014dfc8fa8c9e66bf40
 SHA1 (patch-ab) = bbbeb011aa888f2ee7dab84c1602fb3e1127cdb1
diff --git a/print/xdvik/patches/patch-aa b/print/xdvik/patches/patch-aa
index e3b30144c82..c3c0b44ef0e 100644
--- a/print/xdvik/patches/patch-aa
+++ b/print/xdvik/patches/patch-aa
@@ -1,14 +1,29 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/02/23 19:32:01 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/16 03:56:07 minskim Exp $
 
-XDvi is installed by tex-bin-xdvi.
+- Do not install XDvi; it is installed by tex-xdvi.
+- Fix texmf paths for pkgsrc.
 
---- Makefile.in.orig	2008-05-03 12:45:05.000000000 -0700
+--- Makefile.in.orig	2009-06-16 05:01:38.000000000 -0700
 +++ Makefile.in
-@@ -161,7 +161,6 @@ install-data: $(manpage).1 pixmaps/toolb
- 	$(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext)
- 	rm -f $(man1dir)/o$(manpage).$(manext)
- 	ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext)
--	$(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi
- 	$(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/xdvi/pixmaps
- 	if \
- 	    grep 'original xdvi.cfg --' $(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
+@@ -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
+ 
+ info-am:
+ 
+-install-data-am: install-dist_pixmapDATA install-dist_xdviDATA \
++install-data-am: install-dist_pixmapDATA \
+ 	install-man
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook