Bug 185509 - net/mknbi: Support CC/CFLAGS properly
Summary: net/mknbi: Support CC/CFLAGS properly
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-05 18:10 UTC by tkato432
Modified: 2014-01-25 17:00 UTC (History)
0 users

See Also:


Attachments
file.diff (10.19 KB, patch)
2014-01-05 18:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2014-01-05 18:10:03 UTC
- Support CC/CFLAGS properly
- Support shebangfix USES macro
Comment 1 Martin Wilke freebsd_committer freebsd_triage 2014-01-23 15:48:29 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

I'll take it.
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2014-01-25 16:57:13 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-01-25 16:57:13 UTC
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>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"