Update kpathsea to 6.0.0.

Changes:
- Added texhash.
- Changed some function names.

5 files changed, 25 insertions, 22 deletions

diff --git a/print/kpathsea/Makefile b/print/kpathsea/Makefile
index 5d01423487f..56d0aaf96f0 100644
--- a/print/kpathsea/Makefile
+++ b/print/kpathsea/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/01/16 03:06:56 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2010/09/13 04:06:12 minskim Exp $
 
-DISTNAME=	texlive-20091011-source
-PKGNAME=	kpathsea-5.0.0
-PKGREVISION=	3
+DISTNAME=	texlive-20100720-source
+PKGNAME=	kpathsea-6.0.0
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.xz
@@ -14,6 +13,7 @@ LICENSE=	gnu-lgpl-v2.1
 
 CONFLICTS+=	teTeX-bin<=3.0nb21
 CONFLICTS+=	teTeX-texmf<=3.0nb5
+CONFLICTS+=	texlive-tetex<2010
 
 EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 			${DISTNAME}/texk/kpathsea
@@ -51,8 +51,8 @@ SUBST_MESSAGE.paths=	Setting paths to commands.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	mktex.opt mktexdir mktexlsr mktexmf \
 			mktexnam mktexnam.opt mktexpk mktextfm mktexupd
-SUBST_SED.paths=	-e 's,@KPSEWHICH@,${PREFIX}/bin/kpsewhich,g' \
-			-e 's,@MKTEXMF@,${PREFIX}/bin/mktexmf,g'
+SUBST_SED.paths=	-e 's,@KPSEWHICH@,${PREFIX}/bin/kpsewhich,g'
+SUBST_SED.paths+=	-e 's,@MKTEXMF@,${PREFIX}/bin/mktexmf,g'
 
 PKG_SYSCONFSUBDIR=	texmf
 
diff --git a/print/kpathsea/PLIST b/print/kpathsea/PLIST
index 7a018157df1..d5552ac879e 100644
--- a/print/kpathsea/PLIST
+++ b/print/kpathsea/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/01/16 03:06:56 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/09/13 04:06:12 minskim Exp $
 bin/kpseaccess
 bin/kpsereadlink
 bin/kpsestat
@@ -7,6 +7,7 @@ bin/mktexlsr
 bin/mktexmf
 bin/mktexpk
 bin/mktextfm
+bin/texhash
 include/kpathsea/absolute.h
 include/kpathsea/c-auto.h
 include/kpathsea/c-ctype.h
@@ -57,6 +58,7 @@ include/kpathsea/truncate.h
 include/kpathsea/types.h
 include/kpathsea/variable.h
 include/kpathsea/version.h
+include/kpathsea/win32lib.h
 include/kpathsea/xopendir.h
 include/kpathsea/xstat.h
 info/kpathsea.info
@@ -69,6 +71,7 @@ man/man1/mktexlsr.1
 man/man1/mktexmf.1
 man/man1/mktexpk.1
 man/man1/mktextfm.1
+man/man1/texhash.1
 share/texmf/web2c/mktex.opt
 share/texmf/web2c/mktexdir
 share/texmf/web2c/mktexdir.opt
diff --git a/print/kpathsea/buildlink3.mk b/print/kpathsea/buildlink3.mk
index 5e238ad328c..e7acd8e2981 100644
--- a/print/kpathsea/buildlink3.mk
+++ b/print/kpathsea/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/06/09 21:29:17 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/09/13 04:06:12 minskim Exp $
 
 BUILDLINK_TREE+=	kpathsea
 
 .if !defined(KPATHSEA_BUILDLINK3_MK)
 KPATHSEA_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.kpathsea+=	kpathsea>=5.0.0
+BUILDLINK_API_DEPENDS.kpathsea+=	kpathsea>=6.0.0
 BUILDLINK_PKGSRCDIR.kpathsea?=	../../print/kpathsea
 BUILDLINK_FILES.kpathsea+=	bin/kpsewhich
 .endif # KPATHSEA_BUILDLINK3_MK
diff --git a/print/kpathsea/distinfo b/print/kpathsea/distinfo
index 93d5b99ff5d..945c5bd66fa 100644
--- a/print/kpathsea/distinfo
+++ b/print/kpathsea/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2010/01/16 03:06:56 minskim Exp $
+$NetBSD: distinfo,v 1.8 2010/09/13 04:06:12 minskim Exp $
 
-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) = f22538ddcb94566542984216103da97885377bcf
+SHA1 (texlive-20100720-source.tar.xz) = 713b861123e3d9e073e2c93d7ed3e13262d82c34
+RMD160 (texlive-20100720-source.tar.xz) = b1120f3377ca45b4d86911b99a95c2e6e45927b5
+Size (texlive-20100720-source.tar.xz) = 33484212 bytes
+SHA1 (patch-aa) = 55e52639087f93d6321eac12664fa5c13c938ea8
 SHA1 (patch-ab) = 241176f612485a800ec94974ab00419c92043243
 SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0
 SHA1 (patch-ad) = b9ff0a7d906c8ed613b84de9f200629d37e8ef40
diff --git a/print/kpathsea/patches/patch-aa b/print/kpathsea/patches/patch-aa
index 45425470dc8..9af943e48db 100644
--- a/print/kpathsea/patches/patch-aa
+++ b/print/kpathsea/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2009/06/09 21:29:17 minskim Exp $
+$NetBSD: patch-aa,v 1.6 2010/09/13 04:06:12 minskim Exp $
 
 - Set paths to texmf trees for pkgsrc.
 
---- texmf.cnf.orig	2009-06-03 06:07:27.000000000 -0700
+--- texmf.cnf.orig	2010-05-30 21:52:39.000000000 +0000
 +++ texmf.cnf
 @@ -53,15 +53,15 @@
  
@@ -41,21 +41,21 @@ $NetBSD: patch-aa,v 1.5 2009/06/09 21:29:17 minskim Exp $
  
  % User texmf trees are allowed as follows.
  % This used to be HOMETEXMF.
-@@ -128,7 +128,7 @@ SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXM
+@@ -136,7 +136,7 @@ SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXM
  % Where generated fonts may be written.  This tree is used when the sources
  % were found in a system tree and either that tree wasn't writable, or the
  % varfonts feature was enabled in MT_FEATURES in mktex.cnf.
 -VARTEXFONTS = $TEXMFVAR/fonts
 +VARTEXFONTS = $TEXMFSYSVAR/fonts
  
- % Where to look for ls-R files.  There need not be an ls-R in the
- % directories in this path, but if there is one, Kpathsea will use it.
-@@ -455,7 +455,7 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
+ % On some systems, there will be a system tree which contains all the font
+ % files that may be created as well as the formats.  For example
+@@ -463,7 +463,7 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
  % 
  % For security reasons, it is better not to include . in this path.
  %
 -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
 +TEXMFCNF = @PKG_SYSCONFDIR@
  
- # kpathsea 3.5.3 and later sets these at runtime. To avoid empty
- # expansions from binaries linked against an earlier version of the
+ % kpathsea 3.5.3 and later sets these at runtime. To avoid empty
+ % expansions from binaries linked against an earlier version of the