Revision: 98280 http://trac.macports.org//changeset/98280 Author: takanori@macports.org Date: 2012-10-01 10:15:55 -0700 (Mon, 01 Oct 2012) Log Message: ----------- a2ps-j: applied a patch to suppress a warning message on perl 5.16 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/170293 Modified Paths: -------------- trunk/dports/print/a2ps-j/Portfile trunk/dports/print/a2ps-j/files/patch-a2ps-j.diff Modified: trunk/dports/print/a2ps-j/Portfile =================================================================== --- trunk/dports/print/a2ps-j/Portfile 2012-10-01 15:39:47 UTC (rev 98279) +++ trunk/dports/print/a2ps-j/Portfile 2012-10-01 17:15:55 UTC (rev 98280) @@ -4,7 +4,7 @@ name a2ps-j version 1.45 -revision 3 +revision 4 categories print textproc japanese maintainers takanori openmaintainer description Text file to PostScript converter (with Japanese support) Modified: trunk/dports/print/a2ps-j/files/patch-a2ps-j.diff =================================================================== --- trunk/dports/print/a2ps-j/files/patch-a2ps-j.diff 2012-10-01 15:39:47 UTC (rev 98279) +++ trunk/dports/print/a2ps-j/files/patch-a2ps-j.diff 2012-10-01 17:15:55 UTC (rev 98280) @@ -1,13 +1,29 @@ ---- a2ps-j.orig 2011-10-04 11:43:16.000000000 +0900 -+++ a2ps-j 2011-10-28 14:33:49.000000000 +0900 +--- a2ps-j.orig 2012-02-23 15:04:21.000000000 +0900 ++++ a2ps-j 2012-10-02 01:58:37.000000000 +0900 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/env perl ;# ;# a2ps: ascii to ps ;# -@@ -192,7 +192,8 @@ +@@ -56,9 +56,12 @@ + @param_b4 = (10.15, 14.31, 1.40, 1.2, 8.50, 9.5, 0.29, 0.22, 0.08, 'b4'); + sub paper { + local(*param) = 'param_' . $_[0]; +- die "Unknown paper type: $_[0]\n" unless defined @param; +- ($width, $height, $lmargin, $smargin, $fontsize_l, $fontsize_p, +- $portrait_header, $landscape_header, $paper_adjust, $paper_tray) = @param; ++ if (@param) { ++ ($width, $height, $lmargin, $smargin, $fontsize_l, $fontsize_p, ++ $portrait_header, $landscape_header, $paper_adjust, $paper_tray) = @param; ++ } else { ++ die "Unknown paper type: $_[0]\n"; ++ } + } + &paper($default_paper); +@@ -192,7 +195,8 @@ + if ($debug == 2) { require('dumpvar.pl'); - local($#) = '%.6g'; @@ -16,7 +32,7 @@ &dumpvar('main', 'width', 'height', 'lmargin', 'smargin', 'font_size', 'sheet_height', 'sheet_width', 'char_width', 'skip_column', -@@ -208,8 +209,14 @@ +@@ -208,8 +212,14 @@ $file = shift; if ($file && !-r $file) { warn "$file: $!\n"; next; } if ($jisconvert) { @@ -33,7 +49,7 @@ open(F, "-|") || &jis($file); } else { $file = '-' if $file eq ''; -@@ -410,7 +417,6 @@ +@@ -410,7 +420,6 @@ unless ($selfconvert) { shift while @_ > 0 && $_[0] eq ''; exec('nkf', '-b', '-j', @_); @@ -41,7 +57,7 @@ } if (($file = shift) ne '') { open(STDIN, $file) || die "$file: $!\n"; -@@ -476,10 +482,13 @@ +@@ -476,10 +485,13 @@ } sub print_header { @@ -57,7 +73,7 @@ local($orientation) = $portrait ? "Portrait" : "Landscape"; print <<"---"; -@@ -525,7 +534,8 @@ +@@ -525,7 +537,8 @@ printf("/lines %d def\n", $linesperpage); printf("/columns %d def\n", $columnsperline); $sublabel = $default_sublabel unless defined $sublabel; @@ -67,7 +83,7 @@ if ($ascii_mag) { printf("/doasciimag true def /asciimagsize %f def\n", $ascii_mag); } else { -@@ -548,7 +558,8 @@ +@@ -548,7 +561,8 @@ print "%%EndProlog\n\n"; }