SOURCES: html2ps-conf.patch, html2ps-open.patch, html2ps-perl_path...
maciek2w
maciek2w at pld-linux.org
Wed Jan 18 12:35:07 CET 2006
Author: maciek2w Date: Wed Jan 18 11:35:07 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated to 1.0b5
- patchs fixes (parts of PLD patchs applied to source)
---- Files affected:
SOURCES:
html2ps-conf.patch (1.1 -> 1.2) , html2ps-open.patch (1.1 -> 1.2) , html2ps-perl_path.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/html2ps-conf.patch
diff -u SOURCES/html2ps-conf.patch:1.1 SOURCES/html2ps-conf.patch:1.2
--- SOURCES/html2ps-conf.patch:1.1 Tue Mar 20 02:00:21 2001
+++ SOURCES/html2ps-conf.patch Wed Jan 18 12:35:02 2006
@@ -5,8 +5,8 @@
# 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';
--$ug='/usr/local/lib/html2ps/html2ps.html';
+-$globrc='/opt/misc/lib/html2ps/html2psrc';
+-$ug='/opt/misc/lib/html2ps/html2ps.html';
+$globrc='@CONFDIR@/html2psrc';
+$ug='@DOCDIR@/html2ps.html';
================================================================
Index: SOURCES/html2ps-open.patch
diff -u SOURCES/html2ps-open.patch:1.1 SOURCES/html2ps-open.patch:1.2
--- SOURCES/html2ps-open.patch:1.1 Mon Dec 9 13:27:15 2002
+++ SOURCES/html2ps-open.patch Wed Jan 18 12:35:02 2006
@@ -11,24 +11,6 @@
%extend=('quote',1, 'font',1, 'colour',1, 'hyphenation',1);
%fal=("serif","times", "sans_serif","helvetica", "monospace","courier");
-@@ -420,7 +420,7 @@
- ."\$$_\{'font-family'\}:\$body{'font-family'}";
- }
- $user=1;
--if(open(RC,$globrc)) {
-+if(open(RC,"<$globrc")) {
- $conf=<RC>;
- print DBG "***** Global file $globrc:\n$conf" if($opt_d);
- &getconf($conf);
-@@ -460,7 +460,7 @@
- S:for $dir (@hpath) {
- if(-r $rc && !grep(/^$rc$/, at local) || $files{$dir}=~/ $rc /) {
- chdir $dir if($files{$dir}=~/ $rc / && $cwd);
-- if(open(RC,$rc)) {
-+ if(open(RC,"<$rc")) {
- $conf=<RC>;
- print DBG "***** Personal file $rc:\n$conf" if($opt_d);
- &getconf($conf);
@@ -495,6 +495,8 @@
die "Ghostscript is required to generate cross references\n"
if($opt_R && !$package{'Ghostscript'});
@@ -38,42 +20,6 @@
($scr=$tmpname)=~/\w+$/;
$tempdir=$`;
-@@ -1023,7 +1025,7 @@
- for $k (keys %ff) {
- $f=$ff{$k};
- if(defined $fontid{$fr{$k}} && !defined($cont{$f})) {
-- open(FONT,$f) || &dbg("Error opening fontfile $f\n");
-+ open(FONT,"<$f") || &dbg("Error opening fontfile $f\n");
- ($cont{$f}=<FONT>)=~s/(^|\r?\n|\r)%.*//g;
- close FONT;
- }
-@@ -2282,7 +2284,7 @@
- if($contyp!~m|text/html|i) {$_=" <plaintext>\n$_"};
- unless(($ba2)=$html=~m|(.*://.*/)|) {$ba2=$html."/"};
- } else {
-- if(open(FILE,$html)) {
-+ if(open(FILE,"<$html")) {
- &dbg("Reading $html\n") if($opt_W || $opt_d);
- $_=<FILE>;
- if(!/<HTML/i && $html!~/html?$/i && ($html!~/\.ps$/i || $ndoc>1)) {
-@@ -2398,7 +2400,7 @@
- if($type=~/^text\/(html|plain)$/i
- || !$type && $uaddr=~m"(\.html?|://.+/|://[^/]+)$"i) {
- $tag=~/data\s*=\s*/i;
-- if(&open($uaddr,$idoc)) {
-+ if(&open($uaddr,"<$idoc")) {
- if($type=~/plain/i) {
- $idoc="<XMP>$idoc</XMP>";
- } else {
-@@ -2527,7 +2529,7 @@
- } elsif($2 eq "virtual") {
- $file=$opt_r.$file;
- }
-- if(open INC,$file) {
-+ if(open INC,"<$file") {
- $inc=<INC>;
- &spec($inc);
- close INC;
@@ -3179,7 +3181,7 @@
open(SCRATCH,">$scr.tex");
print SCRATCH $tex;
@@ -83,57 +29,3 @@
`dvips -E -o $scr.ps $scr.dvi`;
open(LOG,"$scr.log");
$log=<LOG>;
-@@ -3644,7 +3646,7 @@
- if($opt_O) {
- $orig=$URL;
- unless($orig=~s/\.\w*$/.ps/) {$orig.=".ps"};
-- if(open(ORIG,"$orig")) {
-+ if(open(ORIG,"<$orig")) {
- $pic=<ORIG>;
- close ORIG;
- if($pic=~/^%!/ && $pic=~/%%BoundingBox:/) {
-@@ -3654,7 +3656,7 @@
- }
- }
- if(!$flag) {
-- if(open(PIC,"$URL")) {
-+ if(open(PIC,"<$URL")) {
- binmode PIC;
- $pic=<PIC>;
- close PIC;
-@@ -4075,7 +4077,7 @@
- $rep{$lang}=$refl{$hyfile};
- return;
- }
-- if(open(HYPH,$hyfile)) {
-+ if(open(HYPH,"<$hyfile")) {
- &dbg("Reading hyphenation patterns from $hyfile\n") if($opt_d);
- <HYPH>=~/\\patterns{.*/;
- close HYPH;
-@@ -4150,7 +4152,7 @@
- }
- $hext=$hyphenation_extfile{$lang};
- for(split('\s*:\s*',$hext)) {
-- if(open(HEXT,$_)) {
-+ if(open(HEXT,"<$_")) {
- &dbg("Reading hyphenation extensions from $_\n") if($opt_d);
- $hyext.=<HEXT>;
- close HEXT;
-@@ -4374,7 +4376,7 @@
- sub getconf {
- local($_)=@_;
- while(/\@import\s+(([\w.\/-]+)|"([^"]*)"|'([^']*)')\s*;/) {
-- if(open(SS,$+) && !$read{$+}) {
-+ if(open(SS,"<$+") && !$read{$+}) {
- $conf=<SS>;
- $_=$`.$conf.$';
- print DBG "***** $+:\n$conf" if($opt_d);
-@@ -4559,7 +4561,7 @@
- sub open {
- if($_[0]=~m|://|) {
- &geturl($_[0],$_[1]);
-- } elsif(open(FILE,$_[0])) {
-+ } elsif(open(FILE,"<$_[0]")) {
- $_[1]=<FILE>;
- close FILE;
- } else {
================================================================
Index: SOURCES/html2ps-perl_path.patch
diff -u SOURCES/html2ps-perl_path.patch:1.1 SOURCES/html2ps-perl_path.patch:1.2
--- SOURCES/html2ps-perl_path.patch:1.1 Mon Feb 25 05:31:03 2002
+++ SOURCES/html2ps-perl_path.patch Wed Jan 18 12:35:02 2006
@@ -6,6 +6,6 @@
- if $running_under_some_shell;
-
+#!/usr/bin/perl
- # This is html2ps version 1.0 beta3, an HTML-to-PostScript converter.
+ # This is html2ps version 1.0 beta5, an HTML-to-PostScript converter.
# Copyright (C) 1995-2000 Jan Karrman.
#
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/html2ps-conf.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/html2ps-open.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/html2ps-perl_path.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list