ports/185347: misc/najitool: Support CC/CFLAGS properly

[KATO Tsuguru]

>Number:         185347
>Category:       ports
>Synopsis:       misc/najitool: Support CC/CFLAGS properly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 30 21:10:11 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Support CC/CFLAGS properly
- Support PLIST_FILES

Remove file:
pkg-plist

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/misc/najitool/Makefile misc/najitool/Makefile
--- /usr/ports/misc/najitool/Makefile	2013-11-06 22:00:01.000000000 +0900
+++ misc/najitool/Makefile	2013-12-31 00:00:00.000000000 +0900
@@ -3,6 +3,8 @@
 
 PORTNAME=	najitool
 PORTVERSION=	0.8.4
+DISTVERSIONSUFFIX=	.src
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF
 
@@ -11,13 +13,17 @@
 
 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 -urN /usr/ports/misc/najitool/pkg-plist misc/najitool/pkg-plist
--- /usr/ports/misc/najitool/pkg-plist	2013-11-06 22:00:01.000000000 +0900
+++ misc/najitool/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-bin/najitool
>Release-Note:
>Audit-Trail:
>Unformatted: