Update kpathsea to 6.1.0.

Changes:
* New formats for .ris and .bltxml.
* Merge with W32TeX.

7 files changed, 52 insertions, 157 deletions

diff --git a/print/kpathsea/Makefile b/print/kpathsea/Makefile
index 80fc1594044..08fef697289 100644
--- a/print/kpathsea/Makefile
+++ b/print/kpathsea/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2011/11/07 08:27:35 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2012/07/10 22:32:13 minskim Exp $
 
-DISTNAME=	texlive-20110705-source
-PKGNAME=	kpathsea-6.0.1
-PKGREVISION=	1
+DISTNAME=	texlive-20120701-source
+PKGNAME=	kpathsea-6.1.0
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
diff --git a/print/kpathsea/PLIST b/print/kpathsea/PLIST
index d5552ac879e..e5ffa8a6b3e 100644
--- a/print/kpathsea/PLIST
+++ b/print/kpathsea/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2010/09/13 04:06:12 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/07/10 22:32:13 minskim Exp $
 bin/kpseaccess
 bin/kpsereadlink
 bin/kpsestat
@@ -27,14 +27,11 @@ include/kpathsea/c-unistd.h
 include/kpathsea/cnf.h
 include/kpathsea/concatn.h
 include/kpathsea/config.h
-include/kpathsea/db.h
 include/kpathsea/debug.h
-include/kpathsea/default.h
 include/kpathsea/expand.h
-include/kpathsea/fn.h
-include/kpathsea/fontmap.h
 include/kpathsea/getopt.h
 include/kpathsea/hash.h
+include/kpathsea/knj.h
 include/kpathsea/kpathsea.h
 include/kpathsea/lib.h
 include/kpathsea/line.h
@@ -45,7 +42,6 @@ include/kpathsea/pathsearch.h
 include/kpathsea/proginit.h
 include/kpathsea/progname.h
 include/kpathsea/readable.h
-include/kpathsea/recorder.h
 include/kpathsea/str-list.h
 include/kpathsea/str-llist.h
 include/kpathsea/systypes.h
@@ -53,14 +49,10 @@ include/kpathsea/tex-file.h
 include/kpathsea/tex-glyph.h
 include/kpathsea/tex-hush.h
 include/kpathsea/tex-make.h
-include/kpathsea/tilde.h
-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
 lib/libkpathsea.la
 man/man1/kpseaccess.1
diff --git a/print/kpathsea/distinfo b/print/kpathsea/distinfo
index 6a9f441589d..6660bdd871b 100644
--- a/print/kpathsea/distinfo
+++ b/print/kpathsea/distinfo
@@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.11 2011/11/07 08:27:35 minskim Exp $
+$NetBSD: distinfo,v 1.12 2012/07/10 22:32:13 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) = 304413906418d2c9e80dd41105fc59530ac82789
-SHA1 (patch-ab) = 241176f612485a800ec94974ab00419c92043243
+SHA1 (texlive-20120701-source.tar.xz) = e41ef31eba27891f3434e01638d3559cc6958016
+RMD160 (texlive-20120701-source.tar.xz) = df09b657919a3f203309645028803098f52bbac9
+Size (texlive-20120701-source.tar.xz) = 131904044 bytes
+SHA1 (patch-aa) = ee5efc02bb67648177fdaeb1d4b9999ea908e01b
 SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0
 SHA1 (patch-ad) = b9ff0a7d906c8ed613b84de9f200629d37e8ef40
 SHA1 (patch-ae) = b85fd269d86bbc878bc4622f1cdbbdebb5c320bf
 SHA1 (patch-af) = 390783ba6ad88208df1b7be0bf9e52e2ceb81c13
 SHA1 (patch-ag) = 0590a33b0f557d9f6fbf13fdf59469c9345445fe
 SHA1 (patch-ah) = 15a0026ed21d732504d50af9597e53197aca038e
-SHA1 (patch-ai) = 28042f47978fe7df907a5e0d3600ac2e1bd17022
+SHA1 (patch-ai) = ceef76e53a9146161be23bb22287b4f768d3cb3c
 SHA1 (patch-aj) = 97235f77188a1923d87d6992defb4c0cc2e050f4
 SHA1 (patch-ak) = 2cee0c54ee5d2f02c08a6d19d8bfb7aa6316b69c
-SHA1 (patch-cnf-to-paths.awk) = 8bd54171d039750c9c1f9293019db8dc1cf90d6d
diff --git a/print/kpathsea/patches/patch-aa b/print/kpathsea/patches/patch-aa
index ea4c63b4934..6a44d8469c4 100644
--- a/print/kpathsea/patches/patch-aa
+++ b/print/kpathsea/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.9 2011/11/07 08:27:35 minskim Exp $
+$NetBSD: patch-aa,v 1.10 2012/07/10 22:32:13 minskim Exp $
 
 Set paths to texmf trees for pkgsrc.
 
---- texmf.cnf.orig	2011-06-18 22:10:46.000000000 +0000
+--- texmf.cnf.orig	2012-05-12 23:34:52.000000000 +0000
 +++ texmf.cnf
-@@ -49,7 +49,7 @@
- % (http://tug.org/tds), or files may not be found.
- %
+@@ -51,7 +51,7 @@
  % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
+ % Kpathsea sets SELFAUTOLOC (the directory with the binary),
+ % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent).
 -TEXMFROOT = $SELFAUTOPARENT
 +TEXMFROOT = $SELFAUTODIR/share
  
  % The tree containing runtime files related to the specific
  % distribution and version.
-@@ -59,13 +59,13 @@ TEXMFMAIN = $TEXMFROOT/texmf
+@@ -61,13 +61,13 @@ TEXMFMAIN = $TEXMFROOT/texmf
  TEXMFDIST = $TEXMFROOT/texmf-dist
  
  % Local additions to the distribution trees.
@@ -30,7 +30,7 @@ Set paths to texmf trees for pkgsrc.
  
  % Per-user texmf tree(s) -- organized per the TDS, as usual.  To define
  % more than one per-user tree, set this to a list of directories in
-@@ -111,7 +111,7 @@ SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXM
+@@ -113,7 +113,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.
@@ -39,65 +39,23 @@ Set paths to texmf trees for pkgsrc.
  
  % 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
-@@ -303,6 +303,10 @@ BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//
- MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
- MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//
- 
-+% .ris and .bltxml bibliography formats.
-+RISINPUTS = .;$TEXMF/bibtex/ris//
-+BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml//
-+
- % MFT style files.
- MFTINPUTS = .;$TEXMF/mft//
- 
-@@ -368,11 +372,13 @@ MPSUPPORT = .;$TEXMF/metapost/support
- MIMELIBDIR = $TEXMFROOT/etc
- MAILCAPLIBDIR = $TEXMFROOT/etc
- 
--% Default settings for fontconfig library, used by Windows versions of
--% xetex/xdvipdfmx.  On Unixish systems, fontconfig ignores this.
--FONTCONFIG_FILE=fonts.conf
--FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf
--FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache
-+% Default settings for the fontconfig library as used by the Windows
-+% versions of xetex/xdvipdfmx.  On Unixish systems, fontconfig ignores
-+% this.  ConTeXT MkIV (all platforms) also use these values.
-+% 
-+FONTCONFIG_FILE = fonts.conf
-+FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf
-+FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache
- 
- % TeX documentation and source files, for use with texdoc and kpsewhich.
- TEXDOCS = $TEXMF/doc//
-@@ -407,10 +413,19 @@ TW_INIPATH = $TW_LIBPATH
- % would allow command execution.
- DVIPDFMXINPUTS = $TEXMF/dvipdfmx
- 
--% Find scripts that are distributed/installed in the texmf tree.
--
- % Lua needs to look in TEXINPUTS for lua scripts distributed with packages.
--LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS
-+% 
-+% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in
-+% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended
-+% default expansion of TEXINPUTS will not happen and .lua files under
-+% the /tex/ will not be found.
-+% 
-+% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex.
-+% The default LUAINPUTS sufficess for luatex and dviluatex.
-+%
-+LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-+LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-+LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}//
- 
- % Lua needs to look for binary lua libraries distributed with packages.
- CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//
-@@ -442,7 +457,7 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
- % 
- % For security reasons, it is better not to include . in this path.
+@@ -481,18 +481,7 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
+ % explicitly list every directory.  Arguably more understandable this
+ % way anyway.
  %
--TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
+-TEXMFCNF = {\
+-$SELFAUTOLOC,\
+-$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\
+-$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\
+-$SELFAUTODIR,\
+-$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\
+-$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\
+-$SELFAUTOPARENT/../texmf-local/web2c,\
+-$SELFAUTOPARENT,\
+-$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\
+-$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/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
+ %
+ % For reference, here is the old brace-using definition:
+ %TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
diff --git a/print/kpathsea/patches/patch-ab b/print/kpathsea/patches/patch-ab
deleted file mode 100644
index e051a4072a2..00000000000
--- a/print/kpathsea/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/06/09 21:29:17 minskim Exp $
-
---- Makefile.in.orig	2009-06-03 06:07:21.000000000 -0700
-+++ Makefile.in
-@@ -421,7 +421,7 @@ DISTCLEANFILES = paths.h stamp-paths
- kpseaccess_SOURCES = access.c
- kpsereadlink_SOURCES = readlink.c
- kpsewhich_LDADD = libkpathsea.la
--web2cdir = ${prefix}/texmf/web2c
-+web2cdir = ${prefix}/share/texmf/web2c
- dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd
- dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt
- dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
diff --git a/print/kpathsea/patches/patch-ai b/print/kpathsea/patches/patch-ai
index 233f456113e..86b3e5a8c72 100644
--- a/print/kpathsea/patches/patch-ai
+++ b/print/kpathsea/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.1 2009/09/20 18:50:03 minskim Exp $
+$NetBSD: patch-ai,v 1.2 2012/07/10 22:32:13 minskim Exp $
 
---- mktexmf.orig	2009-06-03 06:07:17.000000000 -0700
+--- mktexmf.orig	2012-05-22 16:05:18.000000000 +0000
 +++ mktexmf
 @@ -15,8 +15,8 @@ Makes the Metafont source file for FONT,
  \`ecr12' or \`cmr11'."
@@ -22,19 +22,19 @@ $NetBSD: patch-ai,v 1.1 2009/09/20 18:50:03 minskim Exp $
  if test -n "$sauterroot"; then
    rootfile=$sauterroot
    rootname=b-$rootname
-@@ -41,12 +41,12 @@ else
-     csso12[0-5][0-9])
-        rootfile=;;
-     cs*|lcsss*|icscsc*|icstt*|ilcsss*)
--       rootfile=`kpsewhich cscode.mf`;;
-+       rootfile=`@KPSEWHICH@ cscode.mf`;;
-     wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*)
-        lhprefix=`echo "$name" | sed 's/^\(..\).*/\1/'`
--       rootfile=`kpsewhich ${lhprefix}codes.mf 2>/dev/null`;;
-+       rootfile=`@KPSEWHICH@ ${lhprefix}codes.mf 2>/dev/null`;;
+@@ -43,12 +43,12 @@ else
      *)
--       rootfile=`kpsewhich $rootname.mf 2>/dev/null`;;
-+       rootfile=`@KPSEWHICH@ $rootname.mf 2>/dev/null`;;
+       case $rootname in
+         cs*|lcsss*|icscsc*|icstt*|ilcsss*)
+-          rootfile=`kpsewhich cscode.mf`;;
++          rootfile=`@KPSEWHICH@ cscode.mf`;;
+         wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*)
+           lhprefix=`echo "$name" | sed 's/^\(..\).*/\1/'`
+-          rootfile=`kpsewhich ${lhprefix}codes.mf 2>/dev/null`;;
++          rootfile=`@KPSEWHICH@ ${lhprefix}codes.mf 2>/dev/null`;;
+         *)
+-          rootfile=`kpsewhich $rootname.mf 2>/dev/null`;;
++          rootfile=`@KPSEWHICH@ $rootname.mf 2>/dev/null`;;
+       esac;;
    esac
  fi
- { test -z "$rootfile" || test ! -f "$rootfile"; } && exit 1
diff --git a/print/kpathsea/patches/patch-cnf-to-paths.awk b/print/kpathsea/patches/patch-cnf-to-paths.awk
deleted file mode 100644
index 6baf3826b4a..00000000000
--- a/print/kpathsea/patches/patch-cnf-to-paths.awk
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-cnf-to-paths.awk,v 1.1 2011/07/28 04:25:06 minskim Exp $
-
---- cnf-to-paths.awk.orig	2011-05-23 17:48:36.000000000 +0000
-+++ cnf-to-paths.awk
-@@ -10,19 +10,6 @@
- # (whitespace around the = is optional)
- #
- /^[ \t]*[A-Z0-9_]+[ \t]*=/ {
--  # On these lines, there are two cases:
--  # 
--  # 1) definitions referring to SELFAUTO*, which we want to keep.  In
--  # particular, this is how the compile-time TEXMFCNF gets defined and
--  # thus how texmf.cnf gets found.
--  # 
--  # 2) all the others, which we want to convert to a constant
--  # /nonesuch.  That way, the binaries don't get change just because we
--  # change definitions in texmf.cnf.
--  # 
--  # The definition of DEFAULT_TEXMF (and other variables)
--  # that winds up in the final paths.h will not be used.
--  
-   # Let's extract the identifier and the value from the line.  Since
-   # gawk's subexpression matching is an extension, do it with copies.
-   ident = $0;
-@@ -34,13 +21,7 @@
-   sub(/[ \t]*$/, "", val);
-   #print "got ident", ident, "and val", val >"/dev/stderr"; 
-   
--  if (val ~ /\$SELFAUTO/) {
--    # Replace all semicolons with colons in the SELFAUTO paths we're keeping.
--    # (The path-splitting code should be changed to understand both.)
--    gsub(/;/, ":", val);
--  } else {
--    val = "/nonesuch";
--  }
-+  gsub(/;/, ":", val);
-   
-   print "#ifndef DEFAULT_" ident;
-   print "#define DEFAULT_" ident " \"" val "\"";