Update straight to 1.0b4nb1. Changes:

  000727 1.0b2 - Mostly bug fixes. A title page can be generated. The symbol
                 set is extended to include information from META elements.
                 Installation script modified for Windows support.
  000815 1.0b3 - Bug fixes. Some support for Server Side Includes. Form
                 element contents can be rendered. Support for netscape
                 cookies.
  050225 1.0b4   Various bug fixes.

"nb1" includes a patch from the html2ps author to add option "-C H"
which includes headers (only) in output.

Updated after pinging maintainer several times, with no answer.

5 files changed, 74 insertions, 53 deletions

diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile
index 9406b937009..724584343d4 100644
--- a/print/html2ps/Makefile
+++ b/print/html2ps/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/03/26 02:27:51 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/08 19:23:28 hubertf Exp $
 #
 
-DISTNAME=	html2ps-1.0b1
-PKGREVISION=	4
+DISTNAME=	html2ps-1.0b4
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.tdb.uu.se/~jan/
 
@@ -14,7 +14,7 @@ DEPENDS+=	ImageMagick>=5.3.9nb1:../../graphics/ImageMagick
 DEPENDS+=	jpeg>=6b:../../graphics/jpeg
 DEPENDS+=	p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
 DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+=	teTeX-bin>=1.0.6:../../print/teTeX-bin
+DEPENDS+=	teTeX-bin>=1.0.6:../../print/teTeX3-bin
 DEPENDS+=	weblint-[0-9]*:../../www/weblint
 
 USE_PERL5=	yes
@@ -25,7 +25,7 @@ NO_BUILD=	yes
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/html2ps
 	@cd ${WRKSRC} && ./install ${PREFIX}
-	@${INSTALL_DATA} ${WRKSRC}/sample ${PREFIX}/share/html2ps/sample.rc
+	@${INSTALL_DATA} ${WRKSRC}/sample ${PREFIX}/lib/html2ps/sample.rc
 
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/html2ps/PLIST b/print/html2ps/PLIST
index 447172caad5..15081715a70 100644
--- a/print/html2ps/PLIST
+++ b/print/html2ps/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:45 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/07/08 19:23:28 hubertf Exp $
 bin/html2ps
 man/man1/html2ps.1
 man/man5/html2psrc.5
-share/html2ps/html2ps.html
-share/html2ps/html2psrc
-share/html2ps/sample.rc
-@dirrm share/html2ps
+lib/html2ps/html2ps.html
+lib/html2ps/html2psrc
+lib/html2ps/sample.rc
+@dirrm lib/html2ps
diff --git a/print/html2ps/distinfo b/print/html2ps/distinfo
index fd4970135c3..c8a6656199a 100644
--- a/print/html2ps/distinfo
+++ b/print/html2ps/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 12:51:43 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/07/08 19:23:28 hubertf Exp $
 
-SHA1 (html2ps-1.0b1.tar.gz) = ef80edf8a1fb8156848993d4ded306ab6c9149df
-RMD160 (html2ps-1.0b1.tar.gz) = e09b60057f35ebd1164c966bb368380820889827
-Size (html2ps-1.0b1.tar.gz) = 107435 bytes
-SHA1 (patch-aa) = 1b2912d42b41049d07560153f624cd999cc2bad2
-SHA1 (patch-ab) = f4094ff4d5d94f500a64ccca2d795e54678d74e4
+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) = 1c54fc020400d46f53b10bf43f046a2b064e7ad5
+SHA1 (patch-ab) = b541a724106572e2d82dfc9a73b3e11b22a9136b
diff --git a/print/html2ps/patches/patch-aa b/print/html2ps/patches/patch-aa
index 672b6dca2b5..15d34202ca1 100644
--- a/print/html2ps/patches/patch-aa
+++ b/print/html2ps/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/04/23 05:55:02 kim Exp $
+$NetBSD: patch-aa,v 1.2 2005/07/08 19:23:28 hubertf Exp $
 
---- install.orig	Sat Sep 13 08:37:20 1997
-+++ install	Sun Apr 23 01:39:56 2000
-@@ -42,8 +42,8 @@
+--- install.orig	2005-03-03 13:25:29.000000000 +0100
++++ install
+@@ -17,7 +17,7 @@ if(-e '/dev/null') {
+     $pathsep = ':';
+     $dirsep = '/';
+     $sys = 'unix';
+-    $prefix = '/usr/local';
++    $prefix = $ARGV[0];
+ } elsif (-e 'nul') {
+     $pathsep = ';';
+     $dirsep = '\\';
+@@ -57,8 +57,8 @@ where the abovementioned packages are. Y
  the directories where the files should be placed.
  EOD
  
@@ -13,13 +22,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/04/23 05:55:02 kim Exp $
  
  print "\n";
  for $req (@perl) {
-@@ -121,18 +121,19 @@
+@@ -134,19 +134,20 @@ if(@reqpath) {
  
  chop ($cd = `pwd`);
  
--$prefix = "/usr/local";
-+$prefix = "$ARGV[0]";
- 
 -&getval($ans, "y",
 - "\nBy default all files will be installed in subdirectories 'bin', 'lib',\n"
 - ."and 'man' in a common directory. Is this OK?");
@@ -28,7 +34,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/04/23 05:55:02 kim Exp $
 -if($def) {
 -    &getval($prefix, "$prefix", "\nEnter the name of this directory");
 -    &fixdir($prefix);
--    &mkdir($prefix,0);
+-    while(!&goodprefix) {
+-	&getval($prefix, "$prefix", "\nEnter a new directory name");
+-    }
+-    &makedir($prefix,0);
 -}
 +#&getval($ans, "y",
 +# "\nBy default all files will be installed in subdirectories 'bin', 'lib',\n"
@@ -39,21 +48,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/04/23 05:55:02 kim Exp $
 +#if($def) {
 +#    &getval($prefix, "$prefix", "\nEnter the name of this directory");
 +#    &fixdir($prefix);
-+#    &mkdir($prefix,0);
++#    while(!&goodprefix) {
++#	&getval($prefix, "$prefix", "\nEnter a new directory name");
++#    }
++#    &makedir($prefix,0);
 +#}
  
  if($def) {
-     $bindir = "$prefix/bin";
-@@ -145,7 +146,7 @@
- &mkdir($bindir,$def);
- 
- if($def) {
--    $glob = "$prefix/lib/html2ps";
-+    $glob = "$prefix/share/html2ps";
- } else {
-     &getval($glob, "$prefix/lib/html2ps",
-      "\nEnter the the directory where the global configuration file for\n"
-@@ -184,7 +185,7 @@
+     $bindir = "$prefix${dirsep}bin";
+@@ -198,7 +199,7 @@ $cophy = 1;
  if($exist{'TeX'}) {
      $hfile = "";
      ($texdir = $dir{'TeX'}) =~ s|/bin$||;
@@ -62,7 +65,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/04/23 05:55:02 kim Exp $
          "lib/inputs","lib/tex/macros","lib/tex/inputs") {
          if(-f "$texdir/$_/ushyph1.tex") {
              $hyph = "$texdir/$_";
-@@ -198,15 +199,15 @@
+@@ -212,15 +213,15 @@ if($exist{'TeX'}) {
          }
      }
      if($hfile) {
@@ -86,18 +89,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/04/23 05:55:02 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', "
-@@ -246,7 +247,7 @@
- }
- 
- if($def) {
--    $html = "$prefix/lib/html2ps";
-+    $html = "$prefix/share/html2ps";
- } else {
-     &getval($html, "$prefix/lib/html2ps",
-      "\nEnter a directory where to put the HTML document describing\nhtml2ps");
-@@ -254,12 +255,13 @@
+@@ -268,12 +269,13 @@ if($def) {
  }
- &mkdir($html,$def);
+ &makedir($html,$def);
  
 -$paper = "";
 -&getval($format, "A4",
diff --git a/print/html2ps/patches/patch-ab b/print/html2ps/patches/patch-ab
index 033bef3d430..db0dd94e435 100644
--- a/print/html2ps/patches/patch-ab
+++ b/print/html2ps/patches/patch-ab
@@ -1,8 +1,35 @@
-$NetBSD: patch-ab,v 1.1 2001/12/01 10:13:48 kleink Exp $
+$NetBSD: patch-ab,v 1.2 2005/07/08 19:23:28 hubertf Exp $
 
---- html2ps.orig	Sat Aug  9 20:59:05 1997
-+++ html2ps	Sat Dec  1 10:40:03 2001
-@@ -3747,6 +3747,7 @@
+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
+@@ -521,7 +521,7 @@ $below=$opt_W=~/b/;
+ $layer=$opt_W=~/L/;
+ $prompt=$opt_W=~/p/;
+ 
+-if($opt_C && $opt_C!~/^(b?[ft]|[ft]b?|b?h|hb?)$/)
++if($opt_C && $opt_C!~/^(b?[ft]|[ft]b?|b?[hH]|[hH]b?)$/)
+   {die "Invalid option: -C $opt_C\n"};
+ $tc=$opt_C?"t":"f";
+ $rev=$opt_C=~/t/;
+@@ -2244,10 +2244,11 @@ if($gd) {
+ } else {
+   $sd="/Df f D\n";
+ }
++$ndox = $opt_C =~ /H/ ? 1 : $ndoc;
+ $_.=<<EOD;
+ [/Creator ($version) /Author ($Au) /Keywords ($kw) /Subject ($su)
+  /Title ($title) /DOCINFO pdfmark
+-/ND $ndoc D
++/ND $ndox D
+ /HN [1 1 $nref\{pop (??)}for] D
+ $dh$hd
+ Hr length 0 gt{[/PageMode /UseOutlines /DOCVIEW pdfmark}if
+@@ -3962,6 +3963,7 @@ sub DSC {
        $mv=~s/\.0//g;
        $temp.="$mv$line\n";
      }