From b0480820036106ac9445beff75d147d8afe5bdc3 Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Wed, 1 May 2013 06:19:25 +0000 Subject: - Add paperconf(1) support for the default paper size configuration. - Fix pathname of perl(1). - Trim old-style header. - Add LICENSE. --- japanese/a2ps/Makefile | 22 +++++---- japanese/a2ps/files/patch-a2ps-j | 96 ++++++++++++++++++++++++++++++++++++++++ japanese/a2ps/files/patch-aa | 85 ----------------------------------- 3 files changed, 110 insertions(+), 93 deletions(-) create mode 100644 japanese/a2ps/files/patch-a2ps-j delete mode 100644 japanese/a2ps/files/patch-aa (limited to 'japanese/a2ps') diff --git a/japanese/a2ps/Makefile b/japanese/a2ps/Makefile index 85e0e98ceab3..41935e4d1b24 100644 --- a/japanese/a2ps/Makefile +++ b/japanese/a2ps/Makefile @@ -1,29 +1,35 @@ -# New ports collection makefile for: a2ps-j -# Date created: 16 Nov 1996 -# Whom: SAITO Itsuro -# +# Created by: SAITO Itsuro # $FreeBSD$ -# PORTNAME= a2ps PORTVERSION= 1.45 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese print MASTER_SITES= ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/ \ ${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/a2ps|} DISTNAME= ${PORTNAME}.pl-${PORTVERSION} EXTRACT_SUFX= # empty -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= Text file to postscript converter (with Japanese support) +LICENSE= BSD + +RUN_DEPENDS= paperconf:${PORTSDIR}/print/libpaper + PLIST_FILES= bin/a2ps-j -EXTRACT_CMD= ${CP} +EXTRACT_CMD= ${INSTALL_SCRIPT} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= a2ps-j NO_WRKSUBDIR= yes NO_BUILD= yes +post-patch: + ${REINPLACE_CMD} \ + -e 's,%%PERL%%,${PERL},' \ + -e 's,%%LOCALBASE%%,${LOCALBASE},' \ + ${WRKDIR}/a2ps-j + do-install: ${INSTALL_SCRIPT} ${WRKDIR}/a2ps-j ${PREFIX}/bin diff --git a/japanese/a2ps/files/patch-a2ps-j b/japanese/a2ps/files/patch-a2ps-j new file mode 100644 index 000000000000..f67f9da53392 --- /dev/null +++ b/japanese/a2ps/files/patch-a2ps-j @@ -0,0 +1,96 @@ +--- a2ps-j.orig 2013-05-01 15:12:22.000000000 +0900 ++++ a2ps-j 2013-05-01 15:12:32.000000000 +0900 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!%%PERL%% + ;# + ;# a2ps: ascii to ps + ;# +@@ -51,14 +51,23 @@ + @mon{@mon} = ($[ .. $#mon); + @day{@day} = ($[ .. $#day); + ++my $LIBPAPER = 1; ++if ($LIBPAPER) { ++ $default_paper = `%%LOCALBASE%%/bin/paperconf -n`; ++ chomp($default_paper); ++} ++@param_letter = ( 8.50, 11.06, 0.65, 1.2, 6.85, 9.5, 0.29, 0.22, 0.12, 'letter'); + @param_us = ( 8.50, 11.06, 0.65, 1.2, 6.85, 9.5, 0.29, 0.22, 0.12, 'letter'); + @param_a4 = ( 8.27, 11.64, 1.20, 1.2, 6.60, 9.8, 0.29, 0.22, 0.05, 'a4'); + @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; ++ 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 +201,8 @@ + + if ($debug == 2) { + require('dumpvar.pl'); +- local($#) = '%.6g'; ++## Perl 5.10.1 says $# is no longer supported ++## local($#) = '%.6g'; + &dumpvar('main', + 'width', 'height', 'lmargin', 'smargin', 'font_size', + 'sheet_height', 'sheet_width', 'char_width', 'skip_column', +@@ -208,8 +218,14 @@ + $file = shift; + if ($file && !-r $file) { warn "$file: $!\n"; next; } + if ($jisconvert) { +- require 'flush.pl'; +- &flush(STDOUT); ++ # flush.pl obsolete (originally in Perl 4) ++ # replaced with equivalent code of &flush(STDOUT) ++ local($old_stdout) = select(STDOUT); ++ $| = 1; ++ print ""; ++ $| = 0; ++ select($old_stdout); ++ # end of equivalent code + open(F, "-|") || &jis($file); + } else { + $file = '-' if $file eq ''; +@@ -476,10 +492,13 @@ + } + + sub print_header { +- require('ctime.pl'); + return if $header_is_printed++; + +- chop(local($date) = &ctime(time)); ++ # ctime.pl obsolete (originally in Perl 4) ++ # ctime.pl behaves differently when TZ is not set, ++ # but the behavior will not affect the PostScript file details ++ local($date) = scalar localtime; ++ + local($orientation) = $portrait ? "Portrait" : "Landscape"; + + print <<"---"; +@@ -525,7 +544,8 @@ + printf("/lines %d def\n", $linesperpage); + printf("/columns %d def\n", $columnsperline); + $sublabel = $default_sublabel unless defined $sublabel; +- print "/date (", &date($sublabel, time), ") def\n"; ++ # function name changed to a2ps_date to avoid confusion ++ print "/date (", &a2ps_date($sublabel, time), ") def\n"; + if ($ascii_mag) { + printf("/doasciimag true def /asciimagsize %f def\n", $ascii_mag); + } else { +@@ -548,7 +568,8 @@ + print "%%EndProlog\n\n"; + } + +-sub date { ++# function name changed to a2ps_date to avoid confusion ++sub a2ps_date { + local($_, $time) = @_; + local($sec, $min, $hour, $mday, $mon, $year, $wday) = localtime($time); + $year += 1900; diff --git a/japanese/a2ps/files/patch-aa b/japanese/a2ps/files/patch-aa deleted file mode 100644 index 2d8151ff15e4..000000000000 --- a/japanese/a2ps/files/patch-aa +++ /dev/null @@ -1,85 +0,0 @@ ---- a2ps-j.orig 2011-09-19 17:05:32.000000000 +0900 -+++ a2ps-j 2012-08-07 08:58:02.000000000 -0400 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - ;# - ;# a2ps: ascii to ps - ;# -@@ -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; -+ 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'; -+## Perl 5.10.1 says $# is no longer supported -+## local($#) = '%.6g'; - &dumpvar('main', - 'width', 'height', 'lmargin', 'smargin', 'font_size', - 'sheet_height', 'sheet_width', 'char_width', 'skip_column', -@@ -208,8 +212,14 @@ - $file = shift; - if ($file && !-r $file) { warn "$file: $!\n"; next; } - if ($jisconvert) { -- require 'flush.pl'; -- &flush(STDOUT); -+ # flush.pl obsolete (originally in Perl 4) -+ # replaced with equivalent code of &flush(STDOUT) -+ local($old_stdout) = select(STDOUT); -+ $| = 1; -+ print ""; -+ $| = 0; -+ select($old_stdout); -+ # end of equivalent code - open(F, "-|") || &jis($file); - } else { - $file = '-' if $file eq ''; -@@ -476,10 +486,13 @@ - } - - sub print_header { -- require('ctime.pl'); - return if $header_is_printed++; - -- chop(local($date) = &ctime(time)); -+ # ctime.pl obsolete (originally in Perl 4) -+ # ctime.pl behaves differently when TZ is not set, -+ # but the behavior will not affect the PostScript file details -+ local($date) = scalar localtime; -+ - local($orientation) = $portrait ? "Portrait" : "Landscape"; - - print <<"---"; -@@ -525,7 +538,8 @@ - printf("/lines %d def\n", $linesperpage); - printf("/columns %d def\n", $columnsperline); - $sublabel = $default_sublabel unless defined $sublabel; -- print "/date (", &date($sublabel, time), ") def\n"; -+ # function name changed to a2ps_date to avoid confusion -+ print "/date (", &a2ps_date($sublabel, time), ") def\n"; - if ($ascii_mag) { - printf("/doasciimag true def /asciimagsize %f def\n", $ascii_mag); - } else { -@@ -548,7 +562,8 @@ - print "%%EndProlog\n\n"; - } - --sub date { -+# function name changed to a2ps_date to avoid confusion -+sub a2ps_date { - local($_, $time) = @_; - local($sec, $min, $hour, $mday, $mon, $year, $wday) = localtime($time); - $year += 1900; -- cgit v1.2.3