From 303c63256d5e8869e57b47fe0c8681c3df102f1c Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 25 Jan 2014 16:57:05 +0000
Subject: [PATCH] - Support CC/CFLAGS properly - Support shebangfix USES macro
 - Stage support

PR:		185509
Submitted by:	Ports Fury
---
 misc/najitool/Makefile  | 14 ++++++++++----
 misc/najitool/pkg-plist |  1 -
 2 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 misc/najitool/pkg-plist

diff --git a/misc/najitool/Makefile b/misc/najitool/Makefile
index a2cb572fdf3c..ec285ff78c00 100644
--- a/misc/najitool/Makefile
+++ b/misc/najitool/Makefile
@@ -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 filters files
 
 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>
diff --git a/misc/najitool/pkg-plist b/misc/najitool/pkg-plist
deleted file mode 100644
index 3f4df484b3fa..000000000000
--- a/misc/najitool/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/najitool