Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Jan 2014 16:57:06 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341058 - head/misc/najitool
Message-ID:  <201401251657.s0PGv6Ze001984@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401251657.s0PGv6Ze001984>