japanese/a2ps: Fix license

While here,
* Add NO_ARCH
* Pet portlint (extra item in the USES section)
* Regenarate patch
* Remove perl_OLD_CMD

PR:		222534
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>
Approved by:	mentors (implicit)

3 files changed, 32 insertions, 9 deletions

diff --git a/japanese/a2ps/Makefile b/japanese/a2ps/Makefile
index a4192589d2fe..99040449542d 100644
--- a/japanese/a2ps/Makefile
+++ b/japanese/a2ps/Makefile
@@ -13,20 +13,24 @@ EXTRACT_SUFX=	# empty
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Text file to postscript converter (with Japanese support)
 
-LICENSE=	BSD
+LICENSE=	A2PSJ
+LICENSE_NAME=	License of a2ps-j
+LICENSE_FILE=	${FILESDIR}/LICENSE
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS=	paperconf:print/libpaper
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
+
 SHEBANG_FILES=	${WRKSRC}/a2ps-j
-perl_OLD_CMD=	/usr/local/bin/perl
 PLIST_FILES=	bin/a2ps-j
 EXTRACT_CMD=	${INSTALL_SCRIPT}
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	a2ps-j
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/a2ps-j
diff --git a/japanese/a2ps/files/LICENSE b/japanese/a2ps/files/LICENSE
new file mode 100644
index 000000000000..7bac6abba50b
--- /dev/null
+++ b/japanese/a2ps/files/LICENSE
@@ -0,0 +1,19 @@
+(Following sentences are from a2ps.pl-1.45.)
+
+Copyright (c) 2001 Kazumasa Utashiro <utashiro@srekcah.org>
+Copyright (c) 1990-1999 Kazumasa Utashiro
+Internet Initiative Japan Inc.
+3-13 Kanda Nishiki-cho, Chiyoda-ku, Tokyo 101-0054, Japan
+
+This program is perl version of Miguel Santana's a2ps.  Postscript
+kanji enhancement was done by Naoki Kanazawa <kanazawa@sra.co.jp>.
+Converted to perl and enhanced by Kazumasa Utashiro.  B4 support
+and punchmark was contributed by Masami Ueno
+<cabbage@kki.esi.yamanashi.ac.jp>.
+
+Use and redistribution for ANY PURPOSE, with or without
+modification, is granted as long as all copyright notices are
+retained.  Although, it is strongly recommended to make it
+obviously distinguishable from the original one when distributing
+modified version.  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS
+IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED.
diff --git a/japanese/a2ps/files/patch-a2ps-j b/japanese/a2ps/files/patch-a2ps-j
index 79c9160a6ad9..90784f5caf12 100644
--- a/japanese/a2ps/files/patch-a2ps-j
+++ b/japanese/a2ps/files/patch-a2ps-j
@@ -1,5 +1,5 @@
---- a2ps-j.orig	2013-10-22 21:19:43.000000000 +0900
-+++ a2ps-j	2013-10-22 21:20:30.000000000 +0900
+--- a2ps-j.orig	2017-09-23 14:04:32 UTC
++++ a2ps-j
 @@ -51,14 +51,23 @@
  @mon{@mon} = ($[ .. $#mon);
  @day{@day} = ($[ .. $#day);
@@ -25,7 +25,7 @@
  }
  &paper($default_paper);
  
-@@ -192,7 +201,8 @@
+@@ -192,7 +201,8 @@ if ($linesperpage <= 0 || $columnsperlin
  
  if ($debug == 2) {
      require('dumpvar.pl');
@@ -35,7 +35,7 @@
      &dumpvar('main',
  	     'width', 'height', 'lmargin', 'smargin', 'font_size',
  	     'sheet_height', 'sheet_width', 'char_width', 'skip_column',
-@@ -208,8 +218,14 @@
+@@ -208,8 +218,14 @@ while (@ARGV) {
      $file = shift;
      if ($file && !-r $file) { warn "$file: $!\n"; next; }
      if ($jisconvert) {
@@ -52,7 +52,7 @@
  	open(F, "-|") || &jis($file);
      } else {
  	$file = '-' if $file eq '';
-@@ -476,10 +492,13 @@
+@@ -476,10 +492,13 @@ sub _euc2jis {
  }
  
  sub print_header {
@@ -68,7 +68,7 @@
      local($orientation) = $portrait ? "Portrait" : "Landscape";
  
      print <<"---";
-@@ -525,7 +544,8 @@
+@@ -525,7 +544,8 @@ sub print_header {
      printf("/lines %d def\n", $linesperpage);
      printf("/columns %d def\n", $columnsperline);
      $sublabel = $default_sublabel unless defined $sublabel;
@@ -78,7 +78,7 @@
      if ($ascii_mag) {
  	printf("/doasciimag true def /asciimagsize %f def\n", $ascii_mag);
      } else {
-@@ -548,7 +568,8 @@
+@@ -548,7 +568,8 @@ sub print_header {
      print "%%EndProlog\n\n";
  }