Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Nov 2013 23:11:16 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r333539 - head/Mk/Uses
Message-ID:  <201311112311.rABNBG3V060818@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eadler
Date: Mon Nov 11 23:11:16 2013
New Revision: 333539
URL: http://svnweb.freebsd.org/changeset/ports/333539

Log:
  Make Uses/npapi.mk STAGEDIR safe.
  This was tested by commenting out poudriere's leftover testing and using this file with linux-f10-flash.
  
  Approved by:	bapt

Modified:
  head/Mk/Uses/npapi.mk

Modified: head/Mk/Uses/npapi.mk
==============================================================================
--- head/Mk/Uses/npapi.mk	Mon Nov 11 21:41:26 2013	(r333538)
+++ head/Mk/Uses/npapi.mk	Mon Nov 11 23:11:16 2013	(r333539)
@@ -164,11 +164,11 @@ PLIST_DIRS+=	${NPAPI_DIRS_${dist}:S!^!${
 .endfor
 
 npapi-do-install:
-	${INSTALL} -d ${_TD_FULL} ${STAGEDIR}${NPAPI_SLDIRS_ALL}
-	${CP} -p ${NPAPI_FILES:S,^,${NPAPI_WRKSRC}/,} ${_TD_FULL}/
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${_TD_FULL}/
-	${CHMOD} -R a+rX,go-w ${_TD_FULL}/
-	for _dir in ${NPAPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL}/* $$_dir ${_Q} ; }
+	${INSTALL} -d ${STAGEDIR}${_TD_FULL} ${NPAPI_SLDIRS_ALL:S.^.${STAGEDIR}/.}
+	${CP} -p ${NPAPI_FILES:S,^,${NPAPI_WRKSRC}/,} ${STAGEDIR}${_TD_FULL}/
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${_TD_FULL}/
+	${CHMOD} -R a+rX,go-w ${STAGEDIR}${_TD_FULL}/
+	for _dir in ${NPAPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL}/* ${STAGEDIR}$$_dir ${_Q} ; }
 	${ECHO_CMD} '${INSTALL} -d ${NPAPI_SLDIRS_ALL}' > ${_PI}
 	${ECHO_CMD} 'for _dir in ${NPAPI_LINKFARMS} ; \
 	       { ${LN} -sf ${NPAPI_FILES:S,^,${_TD_FULL}/,} $$_dir/ ${_Q}; }' >> ${_PI}



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