From owner-svn-ports-head@FreeBSD.ORG  Tue Oct 22 12:28:19 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4E975CA6;
 Tue, 22 Oct 2013 12:28:19 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 21D7B2735;
 Tue, 22 Oct 2013 12:28:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9MCSJWb063217;
 Tue, 22 Oct 2013 12:28:19 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9MCSIj3063215;
 Tue, 22 Oct 2013 12:28:18 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201310221228.r9MCSIj3063215@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 22 Oct 2013 12:28:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331259 - in head/japanese/a2ps: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Oct 2013 12:28:19 -0000

Author: hrs
Date: Tue Oct 22 12:28:18 2013
New Revision: 331259
URL: http://svnweb.freebsd.org/changeset/ports/331259

Log:
  - Use shebangfix.
  - Fix a missing USES=perl5.  ${PERL} was empty.
  - Add STAGEDIR support.
  
  PR:	ports/183200

Modified:
  head/japanese/a2ps/Makefile
  head/japanese/a2ps/files/patch-a2ps-j

Modified: head/japanese/a2ps/Makefile
==============================================================================
--- head/japanese/a2ps/Makefile	Tue Oct 22 12:14:10 2013	(r331258)
+++ head/japanese/a2ps/Makefile	Tue Oct 22 12:28:18 2013	(r331259)
@@ -3,7 +3,7 @@
 
 PORTNAME=	a2ps
 PORTVERSION=	1.45
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/ \
 		${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/a2ps|}
@@ -17,6 +17,10 @@ LICENSE=	BSD
 
 RUN_DEPENDS=	paperconf:${PORTSDIR}/print/libpaper
 
+USES=		perl5 shebangfix
+USE_PERL5=	run
+SHEBANG_FILES=	${WRKDIR}/a2ps-j
+perl_OLD_CMD=	/usr/local/bin/perl
 PLIST_FILES=	bin/a2ps-j
 EXTRACT_CMD=	${INSTALL_SCRIPT}
 EXTRACT_BEFORE_ARGS=	# empty
@@ -24,14 +28,10 @@ EXTRACT_AFTER_ARGS=	a2ps-j
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-NO_STAGE=	yes
 post-patch:
-	${REINPLACE_CMD} \
-		-e 's,%%PERL%%,${PERL},' \
-		-e 's,%%LOCALBASE%%,${LOCALBASE},' \
-		${WRKDIR}/a2ps-j
+	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKDIR}/a2ps-j
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/a2ps-j ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/a2ps-j ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Modified: head/japanese/a2ps/files/patch-a2ps-j
==============================================================================
--- head/japanese/a2ps/files/patch-a2ps-j	Tue Oct 22 12:14:10 2013	(r331258)
+++ head/japanese/a2ps/files/patch-a2ps-j	Tue Oct 22 12:28:18 2013	(r331259)
@@ -1,11 +1,5 @@
---- 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
- ;#
+--- a2ps-j.orig	2013-10-22 21:19:43.000000000 +0900
++++ a2ps-j	2013-10-22 21:20:30.000000000 +0900
 @@ -51,14 +51,23 @@
  @mon{@mon} = ($[ .. $#mon);
  @day{@day} = ($[ .. $#day);