Fix installation after not-quite-recent TeX path changes.

2 files changed, 16 insertions, 16 deletions

diff --git a/print/html2ps/distinfo b/print/html2ps/distinfo
index 04bf3d32d59..2d17d7221d8 100644
--- a/print/html2ps/distinfo
+++ b/print/html2ps/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/12/04 17:02:54 kim Exp $
+$NetBSD: distinfo,v 1.7 2006/05/26 18:19:15 wiz Exp $
 
 SHA1 (html2ps-1.0b4.tar.gz) = 09b1b6678e08eb08c49113e4837f0ac91942c095
 RMD160 (html2ps-1.0b4.tar.gz) = 248a6319eaddbf5fc342fd9150c6c8cb67c7df1f
 Size (html2ps-1.0b4.tar.gz) = 127901 bytes
-SHA1 (patch-aa) = 51e8621bf6936c1760e991a61256cdc9485ab4d7
+SHA1 (patch-aa) = 0666fe8aa37f141c44c51466b359a662d1e66090
 SHA1 (patch-ab) = b541a724106572e2d82dfc9a73b3e11b22a9136b
diff --git a/print/html2ps/patches/patch-aa b/print/html2ps/patches/patch-aa
index 09907e89b89..56932cb07ac 100644
--- a/print/html2ps/patches/patch-aa
+++ b/print/html2ps/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2005/12/04 17:02:54 kim Exp $
+$NetBSD: patch-aa,v 1.4 2006/05/26 18:19:15 wiz Exp $
 
---- install.orig	2005-03-03 14:25:29.000000000 +0200
-+++ install	2005-12-04 18:54:52.000000000 +0200
-@@ -17,7 +17,7 @@
+--- install.orig	2005-03-03 12:25:29.000000000 +0000
++++ install
+@@ -17,7 +17,7 @@ if(-e '/dev/null') {
      $pathsep = ':';
      $dirsep = '/';
      $sys = 'unix';
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2005/12/04 17:02:54 kim Exp $
  } elsif (-e 'nul') {
      $pathsep = ';';
      $dirsep = '\\';
-@@ -57,8 +57,8 @@
+@@ -57,8 +57,8 @@ where the abovementioned packages are. Y
  the directories where the files should be placed.
  EOD
  
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.3 2005/12/04 17:02:54 kim Exp $
  
  print "\n";
  for $req (@perl) {
-@@ -134,19 +134,22 @@
+@@ -134,19 +134,22 @@ if(@reqpath) {
  
  chop ($cd = `pwd`);
  
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.3 2005/12/04 17:02:54 kim Exp $
  
  if($def) {
      $bindir = "$prefix${dirsep}bin";
-@@ -159,9 +162,9 @@
+@@ -159,9 +162,9 @@ if($def) {
  &makedir($bindir,$def);
  
  if($def) {
@@ -69,16 +69,16 @@ $NetBSD: patch-aa,v 1.3 2005/12/04 17:02:54 kim Exp $
       "\nEnter the the directory where the global configuration file for\n"
      ."html2ps should be put");
      $glob =~ s|/$||g;
-@@ -198,7 +201,7 @@
+@@ -198,7 +201,7 @@ $cophy = 1;
  if($exist{'TeX'}) {
      $hfile = "";
      ($texdir = $dir{'TeX'}) =~ s|/bin$||;
 -    SW:for("texmf/tex/generic/hyphen","macros","inputs","lib/macros",
-+    SW:for("share/texmf/tex/generic/hyphen","macros","inputs","lib/macros",
++    SW:for("share/texmf-dist/tex/generic/hyphen","macros","inputs","lib/macros",
          "lib/inputs","lib/tex/macros","lib/tex/inputs") {
          if(-f "$texdir/$_/ushyph1.tex") {
              $hyph = "$texdir/$_";
-@@ -212,15 +215,15 @@
+@@ -212,15 +215,15 @@ if($exist{'TeX'}) {
          }
      }
      if($hfile) {
@@ -102,7 +102,7 @@ $NetBSD: patch-aa,v 1.3 2005/12/04 17:02:54 kim Exp $
      } else {
          &getval($hfile, "", "$ht I cannot find the pattern\nfile for English "
           ."in your TeX installation. (It should be called\n'hyphen.tex', "
-@@ -236,9 +239,9 @@
+@@ -236,9 +239,9 @@ if($exist{'TeX'}) {
      }
      if(!$hfile) {
          if($def) {
@@ -114,7 +114,7 @@ $NetBSD: patch-aa,v 1.3 2005/12/04 17:02:54 kim Exp $
               "\nOK, I will use the supplied pattern file for English. Enter "
              ."the directory\nwhere this file should be put");
              &fixdir($hyph);
-@@ -246,9 +249,9 @@
+@@ -246,9 +249,9 @@ if($exist{'TeX'}) {
      }
  } else {
      if($def) {
@@ -126,7 +126,7 @@ $NetBSD: patch-aa,v 1.3 2005/12/04 17:02:54 kim Exp $
       ."included with html2ps (see the documentation how to install pattern\n"
       ."files for other languages). Enter the directory where this file\n"
       ."should be put");
-@@ -260,20 +263,21 @@
+@@ -260,20 +263,21 @@ if($cophy) {
  }
  
  if($def) {
@@ -156,7 +156,7 @@ $NetBSD: patch-aa,v 1.3 2005/12/04 17:02:54 kim Exp $
  if($format !~ /^other$/i) {
      $paper .= "    type: $format;";
  } else {
-@@ -431,7 +435,7 @@
+@@ -431,7 +435,7 @@ sub inst {
      copy $from => $_[0].$dirsep.$_[1] or die "*** Cannot write to $_[0]\n";
  }
  sub goodprefix {