Attachment #12467 for bug #24072

View | Details | Raw Unified | Return to bug 24072
Collapse All | Expand All

Lines 9-15 Link Here

(-)html2ps-letter/Makefile (-1 / +1 lines)
9	PORTVERSION= 1.0	9	PORTVERSION= 1.0
10	CATEGORIES= print www perl5	10	CATEGORIES= print www perl5
11	MASTER_SITES= http://www.tdb.uu.se/~jan/	11	MASTER_SITES= http://www.tdb.uu.se/~jan/
12	DISTNAME= html2ps-1.0b1	12	DISTNAME= html2ps-1.0b3
13		13
14	MAINTAINER= andreas@FreeBSD.org	14	MAINTAINER= andreas@FreeBSD.org
15		15

Line 1 Link Here

(-)html2ps-letter/distinfo (-1 / +1 lines)
1	MD5 (html2ps-1.0b1.tar.gz) = 00fb5ac8c3769473b53ec4ad20e9b7cb	1	MD5 (html2ps-1.0b3.tar.gz) = 9386d64649a76e0ad2458393a91d0aab




--- 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=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;

     SW:for("texmf/tex/generic/hyphen","macros","inputs","lib/macros",
         "lib/inputs","lib/tex/macros","lib/tex/inputs") {
         if(-f "$texdir/$_/ushyph1.tex") {
@@ -272,7 +272,7 @@
 &makedir($html,$def);
 
 $paper = "";
-&getval($format, "A4",

  "\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,"
@@ -419,8 +419,7 @@
 
 sub getval {
     $text = $_[1]? "$_[2] [$_[1]]": $_[2];




--- 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 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='/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=$`.$'};

Return to bug 24072

Lines 1-22 Link Here

(-)html2ps-letter/files/patch-aa (-16 / +16 lines)
1	--- install.orig Sat Sep 13 14:37:20 1997	1	--- install.orig Thu Aug 17 00:42:03 2000
2	+++ install Fri Sep 10 00:13:56 1999	2	+++ install Thu Jan 4 17:23:05 2001
3	@@ -1,5 +1,5 @@	3	@@ -1,5 +1,5 @@
4	: # Use perl	4	: # Use perl
5	-eval 'exec perl -S $0 "$@"'	5	-eval 'exec perl -S $0 "$@"'
6	+eval 'exec !!PERL5!! -S $0 "$@"'	6	+eval 'exec !!PERL5!! -S $0 "$@"'
7	if $running_under_some_shell;	7	if $running_under_some_shell;
8		8
9	$vid=101;	9	$vid=103;
10	@@ -121,7 +121,7 @@	10	@@ -17,7 +17,7 @@
11		11	$pathsep = ':';
12	chop ($cd = `pwd`);	12	$dirsep = '/';
13		13	$sys = 'unix';
14	-$prefix = "/usr/local";	14	- $prefix = '/usr/local';
15	+$prefix = "!!PREFIX!!";	15	+ $prefix = "!!PREFIX!!";
16		16	} elsif (-e 'nul') {
17	&getval($ans, "y",	17	$pathsep = ';';
18	"\nBy default all files will be installed in subdirectories 'bin', 'lib',\n"	18	$dirsep = '\\';
19	@@ -181,9 +181,9 @@	19	@@ -198,9 +198,9 @@
20	$ht = "\nTo use the automatic hyphenation feature, hyphenation pattern files\n"	20	$ht = "\nTo use the automatic hyphenation feature, hyphenation pattern files\n"
21	."from the TeX distribution are needed.";	21	."from the TeX distribution are needed.";
22	$cophy = 1;	22	$cophy = 1;
Lines 28-35 Link Here
28	SW:for("texmf/tex/generic/hyphen","macros","inputs","lib/macros",	28	SW:for("texmf/tex/generic/hyphen","macros","inputs","lib/macros",
29	"lib/inputs","lib/tex/macros","lib/tex/inputs") {	29	"lib/inputs","lib/tex/macros","lib/tex/inputs") {
30	if(-f "$texdir/$_/ushyph1.tex") {	30	if(-f "$texdir/$_/ushyph1.tex") {
31	@@ -255,7 +255,7 @@	31	@@ -272,7 +272,7 @@
32	&mkdir($html,$def);	32	&makedir($html,$def);
33		33
34	$paper = "";	34	$paper = "";
35	-&getval($format, "A4",	35	-&getval($format, "A4",
Lines 37-43 Link Here
37	"\nEnter the default paper type, possible choices are:\nA0, A1, A2, A3, A4,"	37	"\nEnter the default paper type, possible choices are:\nA0, A1, A2, A3, A4,"
38	." A5, A6, A7, A8, A9, A10,\nB0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10,\n"	38	." A5, A6, A7, A8, A9, A10,\nB0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10,\n"
39	."letter, legal, arche, archd, archc, archb, archa,\nflsa, flse, halfletter,"	39	."letter, legal, arche, archd, archc, archb, archa,\nflsa, flse, halfletter,"
40	@@ -401,8 +401,7 @@	40	@@ -419,8 +419,7 @@
41		41
42	sub getval {	42	sub getval {
43	$text = $_[1]? "$_[2] [$_[1]]": $_[2];	43	$text = $_[1]? "$_[2] [$_[1]]": $_[2];

Lines 1-26 Link Here

(-)html2ps-letter/files/patch-ab (-13 / +5 lines)
1	--- html2ps.orig Sat Aug 9 20:59:05 1997	1	--- html2ps.orig Thu Aug 17 00:42:03 2000
2	+++ html2ps Fri Sep 10 00:00:25 1999	2	+++ html2ps Thu Jan 4 17:25:26 2001
3	@@ -1,5 +1,5 @@	3	@@ -1,5 +1,5 @@
4	: # Use perl	4	: # Use perl
5	-eval 'exec perl -S $0 "$@"'	5	-eval 'exec perl -S $0 "$@"'
6	+eval 'exec !!PERL5!! -S $0 "$@"'	6	+eval 'exec !!PERL5!! -S $0 "$@"'
7	if $running_under_some_shell;	7	if $running_under_some_shell;
8		8
9	# This is html2ps version 1.0 beta1, an HTML-to-PostScript converter.	9	# This is html2ps version 1.0 beta3, an HTML-to-PostScript converter.
10	@@ -26,7 +26,7 @@	10	@@ -26,7 +26,7 @@
11	# Set the name of the global configuration file. See the installation notes	11	# Set the name of the global configuration file. See the installation notes
12	# and manual page for more details on configuration files.	12	# and manual page for more details on configuration files.
13		13
14	-$globrc='/opt/tdb/lib/html2ps/html2psrc';	14	-$globrc='/usr/local/lib/html2ps/html2psrc';
15	+$globrc='!!PREFIX!!/lib/html2ps/html2psrc';	15	+$globrc='!!PREFIX!!/lib/html2ps/html2psrc';
		16	$ug='/usr/local/lib/html2ps/html2ps.html';
16		17
17	$conf=<<'EOR';	18	$conf=<<'EOR';
18	@html2ps {
19	@@ -4072,6 +4072,7 @@
20	$URL=$url;
21	unless($url=~m\|://\|) {
22	if($url=~m\|^http:(.*)\|) {$url=$1}
23	+ if($url=~m\|^file:(.*)\|) {$url=$1}
24	if($url=~m\|^/\|) {$URL=$b1.$url} else {$URL=$b2.$url}
25	}
26	while($URL!~m\|^\.\./\| && $URL=~m\|[^/]*/\.\./\|) {$URL=$`.$'};