Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 26 Jan 2014 21:36:23 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341292 - head/net/bwn-firmware-kmod
Message-ID:  <201401262136.s0QLaNPQ046235@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Sun Jan 26 21:36:23 2014
New Revision: 341292
URL: http://svnweb.freebsd.org/changeset/ports/341292
QAT: https://qat.redports.org/buildarchive/r341292/

Log:
  - Support stage
  - Requires NEED_ROOT
  
  Approved by:	portmgr (infrastructure blanket)

Modified:
  head/net/bwn-firmware-kmod/Makefile
  head/net/bwn-firmware-kmod/pkg-plist

Modified: head/net/bwn-firmware-kmod/Makefile
==============================================================================
--- head/net/bwn-firmware-kmod/Makefile	Sun Jan 26 21:28:19 2014	(r341291)
+++ head/net/bwn-firmware-kmod/Makefile	Sun Jan 26 21:36:23 2014	(r341292)
@@ -47,10 +47,9 @@ PLIST_SUB=	KMODNAME="${KMODNAME}" \
 
 NO_PACKAGE=	this is a modified version of a restricted firmware
 
-NO_STAGE=	yes
-
 USES=		kmod
-.include <bsd.port.pre.mk>
+
+NEED_ROOT=	yes
 
 do-build:
 	cd ${WRKSRC} && \
@@ -64,7 +63,7 @@ do-build:
 	@${ECHO_CMD} "FIRMWS= ${FIRMWARES:C/.*/&.fw:${FWNAME}_&/}" >> \
 		${WRKSRC}/bg/v4/Makefile
 	@${ECHO_CMD} ".include <bsd.kmod.mk>" >> ${WRKSRC}/bg/v4/Makefile
-	@cd ${WRKSRC}/bg/v4; ${SETENV} KMODDIR="${KMODDIR}" make all
+	@cd ${WRKSRC}/bg/v4; make all
 
 	cd ${WRKSRC} && \
 	tar xjf ${DISTDIR}/${FWFILE_LP}
@@ -76,10 +75,10 @@ do-build:
 	@${ECHO_CMD} "FIRMWS= ${FIRMWARES_LP:C/.*/&.fw:${FWNAME_LP}_&/}" >> \
 		${WRKSRC}/lp/v4/Makefile
 	@${ECHO_CMD} ".include <bsd.kmod.mk>" >> ${WRKSRC}/lp/v4/Makefile
-	@cd ${WRKSRC}/lp/v4; ${SETENV} KMODDIR="${KMODDIR}" make all
+	@cd ${WRKSRC}/lp/v4; make all
 
 do-install:
-	@cd ${WRKSRC}/bg/v4; ${SETENV} KMODDIR="${KMODDIR}" make install
-	@cd ${WRKSRC}/lp/v4; ${SETENV} KMODDIR="${KMODDIR}" make install
+	@cd ${WRKSRC}/bg/v4; ${SETENV} KMODDIR="${STAGEDIR}${KMODDIR}" make install
+	@cd ${WRKSRC}/lp/v4; ${SETENV} KMODDIR="${STAGEDIR}${KMODDIR}" make install
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/bwn-firmware-kmod/pkg-plist
==============================================================================
--- head/net/bwn-firmware-kmod/pkg-plist	Sun Jan 26 21:28:19 2014	(r341291)
+++ head/net/bwn-firmware-kmod/pkg-plist	Sun Jan 26 21:36:23 2014	(r341292)
@@ -1,3 +1,3 @@
-@cwd %%KMODDIR%%
+@cwd /%%KMODDIR%%
 %%KMODNAME%%.ko
 %%KMODNAME_LP%%.ko



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