4 files changed, 25 insertions, 32 deletions

diff --git a/print/html2ps-letter/Makefile b/print/html2ps-letter/Makefile
index 797294a6d839..25872d0b4979 100644
--- a/print/html2ps-letter/Makefile
+++ b/print/html2ps-letter/Makefile
@@ -7,11 +7,12 @@
 
 PORTNAME=	html2ps-${PAPERSIZE}
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	print www perl5
 MASTER_SITES=	http://www.tdb.uu.se/~jan/
-DISTNAME=	html2ps-1.0b1
+DISTNAME=	html2ps-1.0b3
 
-MAINTAINER=	andreas@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	mogrify:${PORTSDIR}/graphics/ImageMagick \
 		djpeg:${PORTSDIR}/graphics/jpeg \
diff --git a/print/html2ps-letter/distinfo b/print/html2ps-letter/distinfo
index 373a6c5ce9e9..4995efc2e843 100644
--- a/print/html2ps-letter/distinfo
+++ b/print/html2ps-letter/distinfo
@@ -1 +1 @@
-MD5 (html2ps-1.0b1.tar.gz) = 00fb5ac8c3769473b53ec4ad20e9b7cb
+MD5 (html2ps-1.0b3.tar.gz) = 9386d64649a76e0ad2458393a91d0aab
diff --git a/print/html2ps-letter/files/patch-aa b/print/html2ps-letter/files/patch-aa
index 857c6108c15e..fdda82ff61c5 100644
--- a/print/html2ps-letter/files/patch-aa
+++ b/print/html2ps-letter/files/patch-aa
@@ -1,22 +1,22 @@
---- install.orig	Sat Sep 13 14:37:20 1997
-+++ install	Fri Sep 10 00:13:56 1999
+--- install.orig	Thu Aug 17 00:42:03 2000
++++ install	Thu Jan  4 17:23:05 2001
 @@ -1,5 +1,5 @@
  : # Use perl
 -eval 'exec perl -S $0 "$@"'
 +eval 'exec !!PERL5!! -S $0 "$@"'
    if $running_under_some_shell;
  
- $vid=101;
-@@ -121,7 +121,7 @@
- 
- chop ($cd = `pwd`);
- 
--$prefix = "/usr/local";
-+$prefix = "!!PREFIX!!";
- 
- &getval($ans, "y",
-  "\nBy default all files will be installed in subdirectories 'bin', 'lib',\n"
-@@ -181,9 +181,9 @@
+ $vid=103;
+@@ -17,7 +17,7 @@
+     $pathsep = ':';
+     $dirsep = '/';
+     $sys = 'unix';
+-    $prefix = '/usr/local';
++    $prefix = "!!PREFIX!!";
+ } elsif (-e 'nul') {
+     $pathsep = ';';
+     $dirsep = '\\';
+@@ -198,9 +198,9 @@
  $ht = "\nTo use the automatic hyphenation feature, hyphenation pattern files\n"
       ."from the TeX distribution are needed.";
  $cophy = 1;
@@ -28,8 +28,8 @@
      SW:for("texmf/tex/generic/hyphen","macros","inputs","lib/macros",
          "lib/inputs","lib/tex/macros","lib/tex/inputs") {
          if(-f "$texdir/$_/ushyph1.tex") {
-@@ -255,7 +255,7 @@
- &mkdir($html,$def);
+@@ -272,7 +272,7 @@
+ &makedir($html,$def);
  
  $paper = "";
 -&getval($format, "A4",
@@ -37,7 +37,7 @@
   "\nEnter the default paper type, possible choices are:\nA0, A1, A2, A3, A4,"
   ." A5, A6, A7, A8, A9, A10,\nB0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10,\n"
   ."letter, legal, arche, archd, archc, archb, archa,\nflsa, flse, halfletter,"
-@@ -401,8 +401,7 @@
+@@ -419,8 +419,7 @@
  
  sub getval {
      $text = $_[1]? "$_[2] [$_[1]]": $_[2];
diff --git a/print/html2ps-letter/files/patch-ab b/print/html2ps-letter/files/patch-ab
index 866d1059f53e..da70d6d5d0f6 100644
--- a/print/html2ps-letter/files/patch-ab
+++ b/print/html2ps-letter/files/patch-ab
@@ -1,26 +1,18 @@
---- html2ps.orig	Sat Aug  9 20:59:05 1997
-+++ html2ps	Fri Sep 10 00:00:25 1999
+--- html2ps.orig	Thu Aug 17 00:42:03 2000
++++ html2ps	Thu Jan  4 17:25:26 2001
 @@ -1,5 +1,5 @@
  : # Use perl
 -eval 'exec perl -S $0 "$@"'
 +eval 'exec !!PERL5!! -S $0 "$@"'
    if $running_under_some_shell;
  
- # This is html2ps version 1.0 beta1, an HTML-to-PostScript converter.
+ # This is html2ps version 1.0 beta3, an HTML-to-PostScript converter.
 @@ -26,7 +26,7 @@
  # Set the name of the global configuration file. See the installation notes
  # and manual page for more details on configuration files.
  
--$globrc='/opt/tdb/lib/html2ps/html2psrc';
+-$globrc='/usr/local/lib/html2ps/html2psrc';
 +$globrc='!!PREFIX!!/lib/html2ps/html2psrc';
+ $ug='/usr/local/lib/html2ps/html2ps.html';
  
  $conf=<<'EOR';
- @html2ps {
-@@ -4072,6 +4072,7 @@
-       $URL=$url;
-       unless($url=~m|://|) {
-         if($url=~m|^http:(.*)|) {$url=$1}
-+	if($url=~m|^file:(.*)|) {$url=$1}
-         if($url=~m|^/|) {$URL=$b1.$url} else {$URL=$b2.$url}
-       }
-       while($URL!~m|^\.\./| && $URL=~m|[^/]*/\.\./|) {$URL=$`.$'};