Update dviljk to the version in TeX Live 2009.

The version number remains the same, but bump PKGREIVISION as
precaution.

4 files changed, 13 insertions, 56 deletions

diff --git a/print/dviljk/Makefile b/print/dviljk/Makefile
index 6142d8408e9..a0d9c9d7b86 100644
--- a/print/dviljk/Makefile
+++ b/print/dviljk/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2009/06/09 21:31:03 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/16 03:37:55 minskim Exp $
 
-DISTNAME=	texlive-20080816-source
+DISTNAME=	texlive-20091011-source
 PKGNAME=	dviljk-2.6.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
-EXTRACT_SUFX=	.tar.lzma
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
@@ -13,27 +13,18 @@ COMMENT=	DVI driver for the LaserJet printers using kpathsea
 
 CONFLICTS+=	teTeX-bin<=3.0nb32
 
-EXTRACT_ELEMENTS=	${DISTNAME}/texk/dviljk \
-			${DISTNAME}/texk/make \
-			${DISTNAME}/texk/install.sh \
-			${DISTNAME}/texk/mkinstalldirs
+EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
+			${DISTNAME}/texk/dviljk
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
-INFO_FILES=	yes
 USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/dviljk
 
-MAKE_ENV+=	KPATHSEA_PREFIX=${BUILDLINK_PREFIX.kpathsea}
-MAKE_FLAGS+=	LIBTOOL=${LIBTOOL:Q} \
-		kpathsea_parent=${BUILDLINK_PREFIX.kpathsea}/include \
-		kpathsea_srcdir=${BUILDLINK_PREFIX.kpathsea}/include/kpathsea \
-		kpathsea=${BUILDLINK_PREFIX.kpathsea}/lib/libkpathsea.la
-
-INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
-			infodir=${DESTDIR}${PREFIX}/${PKGINFODIR} \
-			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--with-system-kpathsea \
+		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
+		--with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
 
 .include "../../print/kpathsea/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/dviljk/distinfo b/print/dviljk/distinfo
index a65ed48435c..087ff3e88fb 100644
--- a/print/dviljk/distinfo
+++ b/print/dviljk/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/07/27 08:42:02 minskim Exp $
+$NetBSD: distinfo,v 1.3 2010/01/16 03:37:55 minskim Exp $
 
-SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
-RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
-Size (texlive-20080816-source.tar.lzma) = 23175835 bytes
-SHA1 (patch-aa) = fb59180925ae9791c39fa69c85f7b5b02954a388
-SHA1 (patch-ab) = 81bd9571868759ad1194178c47bca5e3b77a6fb9
+SHA1 (texlive-20091011-source.tar.xz) = 82fc9fcdb82c63a00f4b08a51733c761cbda897d
+RMD160 (texlive-20091011-source.tar.xz) = 81b86cd93e629d6b1b3d7918848dd76babc0d5a9
+Size (texlive-20091011-source.tar.xz) = 29683728 bytes
diff --git a/print/dviljk/patches/patch-aa b/print/dviljk/patches/patch-aa
deleted file mode 100644
index 93f0afc23d8..00000000000
--- a/print/dviljk/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/07/27 08:42:02 minskim Exp $
-
-Use the kpathsea library in print/kpathsea.
-
---- Makefile.in.orig	2008-02-01 03:23:16.000000000 -0800
-+++ Makefile.in
-@@ -53,8 +53,6 @@ dvilj.man: dvilj.pod dvi2xx.c
- dvilj.ps: dvilj.man
- 	man -t -l $< >$@
- 
--kpse_include ../make/tkpathsea.mk
--
- install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
- 
-@@ -109,4 +107,3 @@ info dvi check:
- kpse_include ../make/clean.mk
- 
- kpse_include ../make/rdepend.mk
--kpse_include depend.mk
diff --git a/print/dviljk/patches/patch-ab b/print/dviljk/patches/patch-ab
deleted file mode 100644
index 2d26dbb4157..00000000000
--- a/print/dviljk/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/07/27 08:42:02 minskim Exp $
-
---- dvi2xx.h.orig	2008-02-17 04:58:17.000000000 -0800
-+++ dvi2xx.h
-@@ -19,7 +19,6 @@
- #include <kpathsea/tex-glyph.h>
- #include <kpathsea/tex-hush.h>
- #include <kpathsea/tex-make.h>
--#include <kpathsea/c-vararg.h>
- #include <c-auto.h>
- #else
- #include <string.h>