From owner-svn-ports-all@FreeBSD.ORG  Mon Nov 11 23:11:16 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BB1DBF0E;
 Mon, 11 Nov 2013 23:11:16 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A9A2D2E72;
 Mon, 11 Nov 2013 23:11:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rABNBGVo060819;
 Mon, 11 Nov 2013 23:11:16 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rABNBG3V060818;
 Mon, 11 Nov 2013 23:11:16 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201311112311.rABNBG3V060818@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 11 Nov 2013 23:11:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333539 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Nov 2013 23:11:16 -0000

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}