- make port non-interactive.

- support a4 and letter papersizes after a repository copy from
  html2ps to html2ps-a4 and html2ps-letter.

- use ${PERL} for substituting not ${PERL5}.

Requested by:	Andreas Klemm <andreas@FreeBSD.org> (mantainer)

4 files changed, 40 insertions, 9 deletions

diff --git a/print/html2ps-letter/Makefile b/print/html2ps-letter/Makefile
index f0ce67201bee..d271c46f0abf 100644
--- a/print/html2ps-letter/Makefile
+++ b/print/html2ps-letter/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	html2ps
+# New ports collection makefile for:	html2ps-letter
 # Version required:	1.0b1
 # Date created:		Sat Nov 22 12:54:50 CET 1997
 # Whom:			andreas
@@ -24,13 +24,14 @@ BUILD_DEPENDS=	mogrify:${PORTSDIR}/graphics/ImageMagick \
 site_perl=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 USE_PERL5=	YES
 NO_BUILD=	YES
-IS_INTERACTIVE=	YES
+
+PAPERSIZE?=	letter
 
 MAN1=		html2ps.1
 MAN5=		html2psrc.5
-SCRIPTS_ENV+=	PERL5=${PERL5}
+SCRIPTS_ENV+=	PERL=${PERL} PAPERSIZE=${PAPERSIZE}
 
 do-install:
-	@cd ${WRKSRC}; ${PERL5} install
+	@cd ${WRKSRC}; ${PERL} install
 
 .include <bsd.port.mk>
diff --git a/print/html2ps-letter/files/patch-aa b/print/html2ps-letter/files/patch-aa
index 8f46908afbf0..857c6108c15e 100644
--- a/print/html2ps-letter/files/patch-aa
+++ b/print/html2ps-letter/files/patch-aa
@@ -1,5 +1,5 @@
 --- install.orig	Sat Sep 13 14:37:20 1997
-+++ install	Sun May 17 21:29:55 1998
++++ install	Fri Sep 10 00:13:56 1999
 @@ -1,5 +1,5 @@
  : # Use perl
 -eval 'exec perl -S $0 "$@"'
@@ -28,3 +28,22 @@
      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);
+ 
+ $paper = "";
+-&getval($format, "A4",
++&getval($format, "!!PAPERSIZE!!",
+  "\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 @@
+ 
+ sub getval {
+     $text = $_[1]? "$_[2] [$_[1]]": $_[2];
+-    print "$text: ";
+-    ($_[0] = <STDIN>) =~ s/^\s+|[\/\s]+$//g;
++    print "$text: $_[1]\n";
+     $_[0] = $_[1] if(!$_[0]);
+ }
+ sub inst {
diff --git a/print/html2ps-letter/files/patch-ab b/print/html2ps-letter/files/patch-ab
index b71569dcc578..866d1059f53e 100644
--- a/print/html2ps-letter/files/patch-ab
+++ b/print/html2ps-letter/files/patch-ab
@@ -1,12 +1,21 @@
 --- html2ps.orig	Sat Aug  9 20:59:05 1997
-+++ html2ps	Mon Jul 19 21:55:04 1999
++++ html2ps	Fri Sep 10 00:00:25 1999
 @@ -1,5 +1,5 @@
  : # Use perl
 -eval 'exec perl -S $0 "$@"'
-+eval 'exec /usr/bin/perl5 -S $0 "$@"'
++eval 'exec !!PERL5!! -S $0 "$@"'
    if $running_under_some_shell;
  
  # This is html2ps version 1.0 beta1, 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='!!PREFIX!!/lib/html2ps/html2psrc';
+ 
+ $conf=<<'EOR';
+ @html2ps {
 @@ -4072,6 +4072,7 @@
        $URL=$url;
        unless($url=~m|://|) {
diff --git a/print/html2ps-letter/scripts/pre-configure b/print/html2ps-letter/scripts/pre-configure
index d4c30205fbec..96c9dabee87e 100644
--- a/print/html2ps-letter/scripts/pre-configure
+++ b/print/html2ps-letter/scripts/pre-configure
@@ -1,7 +1,9 @@
 #! /bin/sh
 
 perl -pi -e "s=!!PREFIX!!=$PREFIX=" ${WRKSRC}/install
-perl -pi -e "s=!!PERL5!!=$PERL5=" ${WRKSRC}/install
-perl -pi -e "s=!!PERL5!!=$PERL5=" ${WRKSRC}/html2ps
+perl -pi -e "s=!!PERL5!!=$PERL=" ${WRKSRC}/install
+perl -pi -e "s=!!PAPERSIZE!!=$PAPERSIZE=" ${WRKSRC}/install
+perl -pi -e "s=!!PREFIX!!=$PREFIX=" ${WRKSRC}/html2ps
+perl -pi -e "s=!!PERL5!!=$PERL=" ${WRKSRC}/html2ps
 
 exit 0