From owner-svn-ports-all@FreeBSD.ORG  Sat Jan 25 16:57:06 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 ESMTPS id 5E33E57B;
 Sat, 25 Jan 2014 16:57:06 +0000 (UTC)
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 4A06310A8;
 Sat, 25 Jan 2014 16:57:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PGv6o1001985;
 Sat, 25 Jan 2014 16:57:06 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PGv6Ze001984;
 Sat, 25 Jan 2014 16:57:06 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201401251657.s0PGv6Ze001984@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 25 Jan 2014 16:57:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r341058 - head/misc/najitool
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Sat, 25 Jan 2014 16:57:06 -0000

Author: miwi
Date: Sat Jan 25 16:57:05 2014
New Revision: 341058
URL: http://svnweb.freebsd.org/changeset/ports/341058
QAT: https://qat.redports.org/buildarchive/r341058/

Log:
  - Support CC/CFLAGS properly
  - Support shebangfix USES macro
  - Stage support
  
  PR:		185509
  Submitted by:	Ports Fury

Deleted:
  head/misc/najitool/pkg-plist
Modified:
  head/misc/najitool/Makefile

Modified: head/misc/najitool/Makefile
==============================================================================
--- head/misc/najitool/Makefile	Sat Jan 25 16:54:32 2014	(r341057)
+++ head/misc/najitool/Makefile	Sat Jan 25 16:57:05 2014	(r341058)
@@ -3,6 +3,8 @@
 
 PORTNAME=	najitool
 PORTVERSION=	0.8.4
+DISTVERSIONSUFFIX=	.src
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF
 
@@ -11,13 +13,17 @@ COMMENT=	Generates, converts, and filter
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libnaji.a:${PORTSDIR}/devel/libnaji
 
-DISTVERSIONSUFFIX=	.src
+PLIST_FILES=	bin/najitool
 
-NO_STAGE=	yes
 post-patch:
-	${REINPLACE_CMD} -e 's|cflags =|cflags = -I${LOCALBASE}/include|; s|libnaji.a|${LOCALBASE}/lib/libnaji.a|' ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e \
+		'/^cc/s|=.*|= $${CC}| ; \
+		 /^ld/s|=.*|= $${CC}| ; \
+		 /^cflags/s|=.*|= $${CFLAGS} -I$${LOCALBASE}/include| ; \
+		 s| libnaji.a| $${LOCALBASE}/lib/libnaji.a|' \
+		${WRKSRC}/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/najitool ${PREFIX}/bin
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} najitool ${STAGEDIR}${PREFIX}/bin)
 
 .include <bsd.port.mk>