Fix paths to kpsewhich, avoiding "sh: line 1: kpsewhich: not found".

Bump PKGREVISION.

4 files changed, 68 insertions, 2 deletions

diff --git a/print/tex-texlive.infra/Makefile b/print/tex-texlive.infra/Makefile
index cbc49eaf46a..42cb57b11b3 100644
--- a/print/tex-texlive.infra/Makefile
+++ b/print/tex-texlive.infra/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2012/07/18 18:30:50 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2012/07/24 09:24:22 jperkin Exp $
 
 DISTNAME=	texlive.infra
 PKGNAME=	tex-${DISTNAME}-2012
+PKGREVISION=	1
 TEXLIVE_REV=	26923
 
 MAINTAINER=	minskim@NetBSD.org
@@ -14,6 +15,12 @@ TEXLIVE_IGNORE_PATTERNS=	texmf/scripts
 INSTALLATION_DIRS+=	${PERL5_SUB_INSTALLVENDORLIB}/TeXLive
 TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
 
+SUBST_CLASSES+=		paths
+SUBST_MESSAGE.paths=	Setting paths to commands.
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	tlpkg/TeXLive/TLPaper.pm tlpkg/TeXLive/TLUtils.pm
+SUBST_SED.paths=	-e 's,@KPSEWHICH@,${PREFIX}/bin/kpsewhich,g'
+
 .include "../../print/texlive/package.mk"
 .include "../../lang/perl5/dirs.mk"
 
diff --git a/print/tex-texlive.infra/distinfo b/print/tex-texlive.infra/distinfo
index 268de43e111..adc7c23d210 100644
--- a/print/tex-texlive.infra/distinfo
+++ b/print/tex-texlive.infra/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2012/07/18 18:30:50 minskim Exp $
+$NetBSD: distinfo,v 1.3 2012/07/24 09:24:22 jperkin Exp $
 
 SHA1 (tex-texlive.infra-26923/texlive.infra.tar.xz) = d07e292b50858a7074769b43623df0a152d43dcb
 RMD160 (tex-texlive.infra-26923/texlive.infra.tar.xz) = 7681496e7fc131154a7157f1e7a90a15785a0476
 Size (tex-texlive.infra-26923/texlive.infra.tar.xz) = 201208 bytes
+SHA1 (patch-aa) = fa49e775842a96e0667b35fb9629cd007d043544
+SHA1 (patch-ab) = e9a708b1d2df9442a30a45f8937a1560840f7be1
diff --git a/print/tex-texlive.infra/patches/patch-aa b/print/tex-texlive.infra/patches/patch-aa
new file mode 100644
index 00000000000..f07988e05d4
--- /dev/null
+++ b/print/tex-texlive.infra/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2012/07/24 09:24:22 jperkin Exp $
+
+Fix path to kpsewhich.
+
+--- tlpkg/TeXLive/TLPaper.pm.orig	2012-07-24 09:02:54.548061239 +0000
++++ tlpkg/TeXLive/TLPaper.pm	2012-07-24 09:03:19.975273864 +0000
+@@ -222,7 +222,7 @@
+   
+   my $cmd;
+   for my $filename (@filenames) {
+-    $cmd = qq!kpsewhich --progname=$progname --format="$format" $filename!;
++    $cmd = qq!@KPSEWHICH@ --progname=$progname --format="$format" $filename!;
+     chomp($ret = `$cmd`);
+     if ($ret) {
+       debug("paper file for $progname ($format) $filename: $ret\n");
diff --git a/print/tex-texlive.infra/patches/patch-ab b/print/tex-texlive.infra/patches/patch-ab
new file mode 100644
index 00000000000..c4d4d952904
--- /dev/null
+++ b/print/tex-texlive.infra/patches/patch-ab
@@ -0,0 +1,42 @@
+$NetBSD: patch-ab,v 1.1 2012/07/24 09:24:22 jperkin Exp $
+
+Fix paths to kpsewhich.
+
+--- tlpkg/TeXLive/TLUtils.pm.orig	2012-07-24 09:03:04.471178595 +0000
++++ tlpkg/TeXLive/TLUtils.pm	2012-07-24 09:03:27.491955121 +0000
+@@ -1609,7 +1609,7 @@
+   }
+   my $cmd = $keyval{'cmd'};
+ 
+-  my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
++  my $texdir = `@KPSEWHICH@ -var-value=SELFAUTOPARENT`;
+   chomp($texdir);
+   my $texdir_bsl = conv_to_w32_path($texdir);
+   $cmd =~ s!^("?)TEXDIR/!$1$texdir/!g;
+@@ -1684,7 +1684,7 @@
+   if (win32() && defined($keyval{'filew32'})) {
+     $file = $keyval{'filew32'};
+   }
+-  my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
++  my $texdir = `@KPSEWHICH@ -var-value=SELFAUTOPARENT`;
+   chomp($texdir);
+   my @syscmd;
+   if ($file =~ m/\.pl$/i) {
+@@ -1759,7 +1759,7 @@
+ 
+   &log("postaction $how shortcut for " . $tlpobj->name . "\n");
+   if ($how eq "install") {
+-    my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
++    my $texdir = `@KPSEWHICH@ -var-value=SELFAUTOPARENT`;
+     chomp($texdir);
+     my $texdir_bsl = conv_to_w32_path($texdir);
+     $icon =~ s!^TEXDIR/!$texdir/!;
+@@ -3863,7 +3863,7 @@
+       }
+       my $delim= (&win32)? ';' : ':';
+       my $TEXMFDBS;
+-      chomp($TEXMFDBS=`kpsewhich --show-path="ls-R"`);
++      chomp($TEXMFDBS=`@KPSEWHICH@ --show-path="ls-R"`);
+ 
+       my @texmfdbs=split ($delim, "$TEXMFDBS");
+       my %dbs;