bin/html2ps should not contain .destdir/ path.

Bump PKGREVISION.

4 files changed, 34 insertions, 21 deletions

diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile
index 7eaf4d6f752..a7314387d80 100644
--- a/print/html2ps/Makefile
+++ b/print/html2ps/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/05/06 09:17:27 sbd Exp $
+# $NetBSD: Makefile,v 1.29 2011/11/18 21:43:59 ryoon Exp $
 #
 
 DISTNAME=	html2ps-1.0b4
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	http://user.it.uu.se/~jan/
 
@@ -28,7 +28,7 @@ NO_BUILD=	yes
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/html2ps
-	@cd ${WRKSRC} && PATH=${LOCALBASE}/bin:${PREFIX}/bin ./install ${DESTDIR}${PREFIX} ${PKGMANDIR}
+	@cd ${WRKSRC} && PATH=${LOCALBASE}/bin:${PREFIX}/bin ./install ${DESTDIR}${PREFIX} ${PKGMANDIR} ${PREFIX}
 	@${INSTALL_DATA} ${WRKSRC}/sample ${DESTDIR}${PREFIX}/share/html2ps/sample.rc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/html2ps/distinfo b/print/html2ps/distinfo
index 7088e7e9f45..8ddf390a6a8 100644
--- a/print/html2ps/distinfo
+++ b/print/html2ps/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2010/05/06 09:17:27 sbd Exp $
+$NetBSD: distinfo,v 1.10 2011/11/18 21:43:59 ryoon 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) = 000b6b9f01e233948943d7ac9402a4ad0038f8aa
-SHA1 (patch-ab) = b541a724106572e2d82dfc9a73b3e11b22a9136b
+SHA1 (patch-aa) = 3a3178ce5075b2a638883a0bc9b896ba80e86c4d
+SHA1 (patch-ab) = d3cf5a878172dbe02fe278e21fe91c1a37ce86c7
diff --git a/print/html2ps/patches/patch-aa b/print/html2ps/patches/patch-aa
index 4677a4cd9b3..e140960edea 100644
--- a/print/html2ps/patches/patch-aa
+++ b/print/html2ps/patches/patch-aa
@@ -1,18 +1,19 @@
-$NetBSD: patch-aa,v 1.6 2010/05/06 09:17:27 sbd Exp $
+$NetBSD: patch-aa,v 1.7 2011/11/18 21:44:00 ryoon Exp $
 
 --- install.orig	2005-03-03 12:25:29.000000000 +0000
 +++ install
-@@ -17,7 +17,8 @@ if(-e '/dev/null') {
+@@ -17,7 +17,9 @@ if(-e '/dev/null') {
      $pathsep = ':';
      $dirsep = '/';
      $sys = 'unix';
 -    $prefix = '/usr/local';
 +    $prefix = $ARGV[0];
 +    $mandir = $ARGV[1];
++    $iprefix = $ARGV[2];
  } elsif (-e 'nul') {
      $pathsep = ';';
      $dirsep = '\\';
-@@ -57,8 +58,8 @@ where the abovementioned packages are. Y
+@@ -57,8 +59,8 @@ where the abovementioned packages are. Y
  the directories where the files should be placed.
  EOD
  
@@ -23,7 +24,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/06 09:17:27 sbd Exp $
  
  print "\n";
  for $req (@perl) {
-@@ -134,19 +135,22 @@ if(@reqpath) {
+@@ -134,19 +136,22 @@ if(@reqpath) {
  
  chop ($cd = `pwd`);
  
@@ -58,7 +59,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/06 09:17:27 sbd Exp $
  
  if($def) {
      $bindir = "$prefix${dirsep}bin";
-@@ -159,9 +163,9 @@ if($def) {
+@@ -159,9 +164,9 @@ if($def) {
  &makedir($bindir,$def);
  
  if($def) {
@@ -70,7 +71,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/06 09:17:27 sbd Exp $
       "\nEnter the the directory where the global configuration file for\n"
      ."html2ps should be put");
      $glob =~ s|/$||g;
-@@ -174,7 +178,7 @@ if(-f "$glob${dirsep}html2psrc") {
+@@ -174,7 +179,7 @@ if(-f "$glob${dirsep}html2psrc") {
  }
  
  if($def) {
@@ -79,7 +80,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/06 09:17:27 sbd Exp $
  } else {
      &getval($man1, "$prefix${dirsep}man${dirsep}man1",
       "\nEnter the directory for the html2ps manual page");
-@@ -183,7 +187,7 @@ if($def) {
+@@ -183,7 +188,7 @@ if($def) {
  &makedir($man1,$def);
  
  if($def) {
@@ -88,7 +89,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/06 09:17:27 sbd Exp $
  } else {
      &getval($man5, "$prefix${dirsep}man${dirsep}man5",
       "\nEnter the directory for the manual page describing the configuration\n"
-@@ -198,7 +202,7 @@ $cophy = 1;
+@@ -198,7 +203,7 @@ $cophy = 1;
  if($exist{'TeX'}) {
      $hfile = "";
      ($texdir = $dir{'TeX'}) =~ s|/bin$||;
@@ -97,7 +98,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/06 09:17:27 sbd Exp $
          "lib/inputs","lib/tex/macros","lib/tex/inputs") {
          if(-f "$texdir/$_/ushyph1.tex") {
              $hyph = "$texdir/$_";
-@@ -212,15 +216,15 @@ if($exist{'TeX'}) {
+@@ -212,15 +217,15 @@ if($exist{'TeX'}) {
          }
      }
      if($hfile) {
@@ -121,7 +122,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/06 09:17:27 sbd 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 +240,9 @@ if($exist{'TeX'}) {
+@@ -236,9 +241,9 @@ if($exist{'TeX'}) {
      }
      if(!$hfile) {
          if($def) {
@@ -133,7 +134,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/06 09:17:27 sbd Exp $
               "\nOK, I will use the supplied pattern file for English. Enter "
              ."the directory\nwhere this file should be put");
              &fixdir($hyph);
-@@ -246,9 +250,9 @@ if($exist{'TeX'}) {
+@@ -246,9 +251,9 @@ if($exist{'TeX'}) {
      }
  } else {
      if($def) {
@@ -145,7 +146,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/06 09:17:27 sbd 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 +264,21 @@ if($cophy) {
+@@ -260,20 +265,21 @@ if($cophy) {
  }
  
  if($def) {
@@ -175,7 +176,19 @@ $NetBSD: patch-aa,v 1.6 2010/05/06 09:17:27 sbd Exp $
  if($format !~ /^other$/i) {
      $paper .= "    type: $format;";
  } else {
-@@ -431,7 +436,7 @@ sub inst {
+@@ -292,9 +298,9 @@ close RC;
+ 
+ undef $/;
+ open(HTML2PS,"html2ps") || die "*** Error opening html2ps\n";
+-($code = <HTML2PS>) =~ s|\$globrc=.*|\$globrc='$glob${dirsep}html2psrc';|;
++($code = <HTML2PS>) =~ s|\$globrc=.*|\$globrc='$iprefix${dirsep}${sharedir}${dirsep}html2psrc';|;
+ $code =~ s/exec \S+/exec $^X/;
+-$code =~ s|\$ug=.*|\$ug='$html${dirsep}html2ps.html';|;
++$code =~ s|\$ug=.*|\$ug='$iprefix${dirsep}${sharedir}${dirsep}html2ps.html';|;
+ close HTML2PS;
+ open(HTML2PS,">html2ps") || die "*** Error opening html2ps\n";
+ print HTML2PS $code;
+@@ -431,7 +437,7 @@ sub inst {
      copy $from => $_[0].$dirsep.$_[1] or die "*** Cannot write to $_[0]\n";
  }
  sub goodprefix {
diff --git a/print/html2ps/patches/patch-ab b/print/html2ps/patches/patch-ab
index db0dd94e435..14b4b1fe766 100644
--- a/print/html2ps/patches/patch-ab
+++ b/print/html2ps/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.2 2005/07/08 19:23:28 hubertf Exp $
+$NetBSD: patch-ab,v 1.3 2011/11/18 21:44:00 ryoon Exp $
 
 This patch adds option "-C H" to include headers (only) in output.
 The patch was sent from the html2ps author Jan Karrman <jan@it.uu.se>
 to hubertf@NetBSD.org upon request for such a feature.  - HF
 
 
---- html2ps.orig	2005-02-25 14:40:42.000000000 +0100
+--- html2ps.orig	2005-02-25 13:40:42.000000000 +0000
 +++ html2ps
 @@ -521,7 +521,7 @@ $below=$opt_W=~/b/;
  $layer=$opt_W=~/L/;