Update kpathsea to 6.1.1.

Change: Merge texmf into texmf-dist.

6 files changed, 50 insertions, 39 deletions

diff --git a/print/kpathsea/DEINSTALL b/print/kpathsea/DEINSTALL
index b9e242b99ed..a7ec7c5d57e 100644
--- a/print/kpathsea/DEINSTALL
+++ b/print/kpathsea/DEINSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.2 2009/06/09 21:29:17 minskim Exp $
+# $NetBSD: DEINSTALL,v 1.3 2013/11/17 16:45:32 minskim Exp $
 
 case "${STAGE}" in
 DEINSTALL)
@@ -7,6 +7,5 @@ DEINSTALL)
 		@VARBASE@/lib/texmf/ls-R \
 		@TEXMFLOCAL@/ls-R \
 		@PREFIX@/share/texmf-dist/ls-R \
-		@PREFIX@/share/texmf/ls-R
 	;;
 esac
diff --git a/print/kpathsea/INSTALL b/print/kpathsea/INSTALL
index 032442bc261..afd2da91f18 100644
--- a/print/kpathsea/INSTALL
+++ b/print/kpathsea/INSTALL
@@ -1,9 +1,8 @@
-# $NetBSD: INSTALL,v 1.2 2009/06/09 21:29:17 minskim Exp $
+# $NetBSD: INSTALL,v 1.3 2013/11/17 16:45:32 minskim Exp $
 
 case "${STAGE}" in
 POST-INSTALL)
 	@PREFIX@/bin/mktexlsr \
-		@PREFIX@/share/texmf \
 		@PREFIX@/share/texmf-dist \
 		@TEXMFLOCAL@ \
 		@VARBASE@/lib/texmf \
diff --git a/print/kpathsea/Makefile b/print/kpathsea/Makefile
index 669ccb883a0..75165aa4d3e 100644
--- a/print/kpathsea/Makefile
+++ b/print/kpathsea/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2013/02/05 07:54:51 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2013/11/17 16:45:32 minskim Exp $
 
-DISTNAME=	texlive-20120701-source
-PKGNAME=	kpathsea-6.1.0
-PKGREVISION=	1
+DISTNAME=	texlive-20130530-source
+PKGNAME=	kpathsea-6.1.1
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2013/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
@@ -59,7 +58,7 @@ BUILD_DEFS+=		VARBASE
 TEXMFLOCAL=		${PREFIX}/share/texmf-local
 FILES_SUBST+=		TEXMFLOCAL=${TEXMFLOCAL}
 
-CONF_FILES=	${PREFIX}/share/texmf/web2c/texmf.cnf \
+CONF_FILES=	${PREFIX}/share/texmf-dist/web2c/texmf.cnf \
 		${PKG_SYSCONFDIR}/texmf.cnf
 
 OWN_DIRS+=		${TEXMFLOCAL} ${VARBASE}/lib/texmf
diff --git a/print/kpathsea/PLIST b/print/kpathsea/PLIST
index e5ffa8a6b3e..cec5fede968 100644
--- a/print/kpathsea/PLIST
+++ b/print/kpathsea/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/07/10 22:32:13 minskim Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/11/17 16:45:32 minskim Exp $
 bin/kpseaccess
 bin/kpsereadlink
 bin/kpsestat
@@ -64,11 +64,10 @@ 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
-share/texmf/web2c/mktexnam
-share/texmf/web2c/mktexnam.opt
-share/texmf/web2c/mktexupd
-share/texmf/web2c/texmf.cnf
-@pkgdir share/texmf-dist
+share/texmf-dist/web2c/mktex.opt
+share/texmf-dist/web2c/mktexdir
+share/texmf-dist/web2c/mktexdir.opt
+share/texmf-dist/web2c/mktexnam
+share/texmf-dist/web2c/mktexnam.opt
+share/texmf-dist/web2c/mktexupd
+share/texmf-dist/web2c/texmf.cnf
diff --git a/print/kpathsea/distinfo b/print/kpathsea/distinfo
index 1668997f02c..01f1d188ec5 100644
--- a/print/kpathsea/distinfo
+++ b/print/kpathsea/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2013/02/05 07:54:52 wiz Exp $
+$NetBSD: distinfo,v 1.14 2013/11/17 16:45:32 minskim Exp $
 
-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 (texlive-20130530-source.tar.xz) = 42f0a6fa3f49435991182f14e01276b2ee3fce61
+RMD160 (texlive-20130530-source.tar.xz) = 2d779ae5de979be86a9258b224dfc15cbcd76b18
+Size (texlive-20130530-source.tar.xz) = 179963948 bytes
+SHA1 (patch-aa) = 3f26a00fd7057e42b7e0ef76095f3b30106f67a6
 SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0
 SHA1 (patch-ad) = b9ff0a7d906c8ed613b84de9f200629d37e8ef40
 SHA1 (patch-ae) = b85fd269d86bbc878bc4622f1cdbbdebb5c320bf
diff --git a/print/kpathsea/patches/patch-aa b/print/kpathsea/patches/patch-aa
index 6a44d8469c4..4b314e47ae6 100644
--- a/print/kpathsea/patches/patch-aa
+++ b/print/kpathsea/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2012/07/10 22:32:13 minskim Exp $
+$NetBSD: patch-aa,v 1.11 2013/11/17 16:45:32 minskim Exp $
 
 Set paths to texmf trees for pkgsrc.
 
---- texmf.cnf.orig	2012-05-12 23:34:52.000000000 +0000
+--- texmf.cnf.orig	2013-04-15 16:58:08.000000000 +0000
 +++ texmf.cnf
 @@ -51,7 +51,7 @@
  % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
@@ -11,10 +11,10 @@ Set paths to texmf trees for pkgsrc.
 -TEXMFROOT = $SELFAUTOPARENT
 +TEXMFROOT = $SELFAUTODIR/share
  
- % The tree containing runtime files related to the specific
- % distribution and version.
-@@ -61,13 +61,13 @@ TEXMFMAIN = $TEXMFROOT/texmf
+ % The main tree of distributed packages and programs:
  TEXMFDIST = $TEXMFROOT/texmf-dist
+@@ -61,13 +61,13 @@ TEXMFDIST = $TEXMFROOT/texmf-dist
+ TEXMFMAIN = $TEXMFDIST
  
  % Local additions to the distribution trees.
 -TEXMFLOCAL = $TEXMFROOT/../texmf-local
@@ -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
-@@ -113,7 +113,7 @@ SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXM
+@@ -116,7 +116,7 @@ TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR
  % 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,21 +39,36 @@ 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
-@@ -481,18 +481,7 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
- % explicitly list every directory.  Arguably more understandable this
- % way anyway.
+@@ -485,33 +485,7 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
+ % since we don't want to scatter ../'s throughout the value.  Hence we
+ % explicitly list every directory.  Arguably more understandable anyway.
  %
 -TEXMFCNF = {\
 -$SELFAUTOLOC,\
--$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\
--$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\
+-$SELFAUTOLOC/share/texmf-local/web2c,\
+-$SELFAUTOLOC/share/texmf-dist/web2c,\
+-$SELFAUTOLOC/share/texmf/web2c,\
+-$SELFAUTOLOC/texmf-local/web2c,\
+-$SELFAUTOLOC/texmf-dist/web2c,\
+-$SELFAUTOLOC/texmf/web2c,\
+-\
 -$SELFAUTODIR,\
--$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\
--$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\
+-$SELFAUTODIR/share/texmf-local/web2c,\
+-$SELFAUTODIR/share/texmf-dist/web2c,\
+-$SELFAUTODIR/share/texmf/web2c,\
+-$SELFAUTODIR/texmf-local/web2c,\
+-$SELFAUTODIR/texmf-dist/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\
+-\
+-$SELFAUTOPARENT/share/texmf-local/web2c,\
+-$SELFAUTOPARENT/share/texmf-dist/web2c,\
+-$SELFAUTOPARENT/share/texmf/web2c,\
+-$SELFAUTOPARENT/texmf-local/web2c,\
+-$SELFAUTOPARENT/texmf-dist/web2c,\
+-$SELFAUTOPARENT/texmf/web2c\
 -}
 +TEXMFCNF = @PKG_SYSCONFDIR@
  %