4 files changed, 13 insertions, 18 deletions

diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile
index ff8303810ca1..0335bcd54d70 100644
--- a/print/html2ps/Makefile
+++ b/print/html2ps/Makefile
@@ -6,14 +6,11 @@ DISTVERSION=	1.0b7
 PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	print www perl5
-MASTER_SITES=	http://user.it.uu.se/~jan/ \
-		http://fossies.org/unix/www/
+MASTER_SITES=	LOCAL/hrs
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	HTML to PostScript converter
 
-BROKEN=		unfetchable
-
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
@@ -31,8 +28,8 @@ PLIST_FILES=	bin/html2ps \
 		etc/html2psrc \
 		man/man1/html2ps.1.gz \
 		man/man5/html2psrc.5.gz \
-		%%DATADIR%%/html2ps.html \
-		%%DATADIR%%/hyphen.tex
+		${DATADIR_REL}/html2ps.html \
+		${DATADIR_REL}/hyphen.tex
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/print/html2ps/files/patch-html2ps b/print/html2ps/files/patch-html2ps
index 89acd7817d75..84c80ddf321f 100644
--- a/print/html2ps/files/patch-html2ps
+++ b/print/html2ps/files/patch-html2ps
@@ -1,6 +1,6 @@
---- html2ps.orig	2010-05-07 20:22:12.000000000 +0900
-+++ html2ps	2013-04-29 00:07:16.000000000 +0900
-@@ -26,8 +26,9 @@
+--- html2ps.orig	2010-05-07 11:22:12 UTC
++++ html2ps
+@@ -26,8 +26,9 @@ eval 'exec perl -S $0 "$@"'
  # Set the name of the global configuration file. See the installation notes
  # and manual page for more details on configuration files.
  
@@ -12,7 +12,7 @@
  
  $conf=<<'EOR';
  @html2ps {
-@@ -46,7 +47,7 @@
+@@ -46,7 +47,7 @@ $conf=<<'EOR';
      path: "";
    }
    paper {
@@ -21,7 +21,7 @@
      height: "";
      width: "";
    }
-@@ -613,6 +614,23 @@
+@@ -613,6 +614,23 @@ for (0..10) {
    $height{"b$_"}=int($temp*2**(1/2)*1000+.5)/10;
  }
  if(!$pagew || !$pageh) {
@@ -45,7 +45,7 @@
    if($width{"\L$paper{'type'}"}) {
      $paper{'width'}=$width{"\L$paper{'type'}"} if(!defined $paper{'width'});
      $paper{'height'}=$height{"\L$paper{'type'}"} if(!defined $paper{'height'});
-@@ -620,6 +638,7 @@
+@@ -620,6 +638,7 @@ if(!$pagew || !$pageh) {
    } elsif($paper{'type'}) {
      &dbg("Unknown paper type: $paper{'type'}\n");
    }
@@ -53,7 +53,7 @@
  }
  if($opt_L) {
    $wl=$pageh-$mll-$mrl;
-@@ -3405,7 +3424,6 @@
+@@ -3405,7 +3424,6 @@ sub Getopts {
    local($optlist)=@_;
    local(@args,$_,$opt,$opts,$rest,$olist,$plist,$found,@popts);
    local($errs)=0;
diff --git a/print/html2ps/files/patch-html2ps.1 b/print/html2ps/files/patch-html2ps.1
index e05531623434..d683147a3a18 100644
--- a/print/html2ps/files/patch-html2ps.1
+++ b/print/html2ps/files/patch-html2ps.1
@@ -1,6 +1,6 @@
---- html2ps.1.orig	2013-04-28 23:11:32.000000000 +0900
-+++ html2ps.1	2013-04-28 23:11:39.000000000 +0900
-@@ -357,7 +357,7 @@
+--- html2ps.1.orig	2010-05-07 11:22:12 UTC
++++ html2ps.1
+@@ -357,7 +357,7 @@ is: search the current directory first, and then the g
  $HOME/.html2psrc
  User configuration file, see html2psrc(5).
  .SH SEE ALSO
diff --git a/print/html2ps/pkg-descr b/print/html2ps/pkg-descr
index 6ce680e1074d..90a6a166a447 100644
--- a/print/html2ps/pkg-descr
+++ b/print/html2ps/pkg-descr
@@ -15,5 +15,3 @@
   Adobe Acrobat Distiller - the original hyperlinks in the HTML
   documents will be retained in the PDF document.
 - Automatic hyphenation and text justification can be selected.
-
-WWW: http://www.tdb.uu.se/~jan/html2ps.html