From owner-svn-ports-all@FreeBSD.ORG  Tue Aug  7 19:45:33 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 05876106564A;
	Tue,  7 Aug 2012 19:45:33 +0000 (UTC)
	(envelope-from scheidell@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C9B848FC08;
	Tue,  7 Aug 2012 19:45:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q77JjWIB098341;
	Tue, 7 Aug 2012 19:45:32 GMT
	(envelope-from scheidell@svn.freebsd.org)
Received: (from scheidell@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q77JjWr7098339;
	Tue, 7 Aug 2012 19:45:32 GMT
	(envelope-from scheidell@svn.freebsd.org)
Message-Id: <201208071945.q77JjWr7098339@svn.freebsd.org>
From: Michael Scheidell <scheidell@FreeBSD.org>
Date: Tue, 7 Aug 2012 19:45:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r302258 - head/japanese/a2ps/files
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2012 19:45:33 -0000

Author: scheidell
Date: Tue Aug  7 19:45:32 2012
New Revision: 302258
URL: http://svn.freebsd.org/changeset/ports/302258

Log:
  - Eliminate perl 5.16 defined() array error.
  - No PORTREVISION bump (its just an error, and only on 5.16)
  
  PR:		ports/170293
  Submitted by:	Kenji Rikitake <kenji.rikitake@acm.org>
  Approved by:	port@ maintainer

Modified:
  head/japanese/a2ps/files/patch-aa

Modified: head/japanese/a2ps/files/patch-aa
==============================================================================
--- head/japanese/a2ps/files/patch-aa	Tue Aug  7 19:32:52 2012	(r302257)
+++ head/japanese/a2ps/files/patch-aa	Tue Aug  7 19:45:32 2012	(r302258)
@@ -1,12 +1,26 @@
 --- a2ps-j.orig	2011-09-19 17:05:32.000000000 +0900
-+++ a2ps-j	2011-09-19 17:09:07.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
  ;#
-@@ -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;
++    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');
@@ -16,7 +30,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 +47,7 @@
  	open(F, "-|") || &jis($file);
      } else {
  	$file = '-' if $file eq '';
-@@ -476,10 +483,13 @@
+@@ -476,10 +486,13 @@
  }
  
  sub print_header {
@@ -49,7 +63,7 @@
      local($orientation) = $portrait ? "Portrait" : "Landscape";
  
      print <<"---";
-@@ -525,7 +535,8 @@
+@@ -525,7 +538,8 @@
      printf("/lines %d def\n", $linesperpage);
      printf("/columns %d def\n", $columnsperline);
      $sublabel = $default_sublabel unless defined $sublabel;
@@ -59,7 +73,7 @@
      if ($ascii_mag) {
  	printf("/doasciimag true def /asciimagsize %f def\n", $ascii_mag);
      } else {
-@@ -548,7 +559,8 @@
+@@ -548,7 +562,8 @@
      print "%%EndProlog\n\n";
  }