From owner-svn-ports-all@FreeBSD.ORG Wed Apr 9 12:16:03 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF21F9E0; Wed, 9 Apr 2014 12:16:02 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C14281E77; Wed, 9 Apr 2014 12:16:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s39CG2Ex015450; Wed, 9 Apr 2014 12:16:02 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s39CG2bR015449; Wed, 9 Apr 2014 12:16:02 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404091216.s39CG2bR015449@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 9 Apr 2014 12:16:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350681 - head/www/xpi-adblock 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2014 12:16:03 -0000 Author: bapt Date: Wed Apr 9 12:16:02 2014 New Revision: 350681 URL: http://svnweb.freebsd.org/changeset/ports/350681 QAT: https://qat.redports.org/buildarchive/r350681/ Log: Fix stage support Modified: head/www/xpi-adblock/Makefile.xpi Modified: head/www/xpi-adblock/Makefile.xpi ============================================================================== --- head/www/xpi-adblock/Makefile.xpi Wed Apr 9 12:09:26 2014 (r350680) +++ head/www/xpi-adblock/Makefile.xpi Wed Apr 9 12:16:02 2014 (r350681) @@ -138,19 +138,19 @@ XPI_SLDIRS_ALL= ${XPI_APPS_ALL:S.^.${XPI XPI_SLDIRS= ${USE_XPI:S.^.${XPI_SLDIR}/.} XPI_LINKFARMS= ${XPI_APPS} ${XPI_SLDIRS} -XPI_LIBDIR?= ${STAGEDIR}${PREFIX}/lib/xpi -XPI_SLDIR?= ${STAGEDIR}${XPI_LIBDIR}/symlinks +XPI_LIBDIR?= ${PREFIX}/lib/xpi +XPI_SLDIR?= ${XPI_LIBDIR}/symlinks .ifndef XPI_DISTNAMES XPI_XPIDIR?= ${XPI_LIBDIR}/${XPI_ID} .endif -XPI_DIRS_TRY= ${XPI_SLDIRS_ALL:S,^${STAGEDIR}${PREFIX}/,,} \ - ${XPI_SLDIR:S,^${STAGEDIR}${PREFIX}/,,} \ - ${XPI_LIBDIR:S,^${STAGEDIR}${PREFIX}/,,} +XPI_DIRS_TRY= ${XPI_SLDIRS_ALL:S,^${PREFIX}/,,} \ + ${XPI_SLDIR:S,^${PREFIX}/,,} \ + ${XPI_LIBDIR:S,^${PREFIX}/,,} -PLIST_SUB+= XPI_LIBDIR="${XPI_LIBDIR:S,^${STAGEDIR}${PREFIX}/,,}" \ - XPI_XPIDIR="${XPI_XPIDIR:S,^${STAGEDIR}${PREFIX}/,,}" +PLIST_SUB+= XPI_LIBDIR="${XPI_LIBDIR:S,^${PREFIX}/,,}" \ + XPI_XPIDIR="${XPI_XPIDIR:S,^${PREFIX}/,,}" -_TD= ${XPI_XPIDIR:S,^${STAGEDIR}${PREFIX}/,,} +_TD= ${XPI_XPIDIR:S,^${PREFIX}/,,} _TD_FULL= ${XPI_XPIDIR} _A= >> ${TMPPLIST} _Q= 2>/dev/null || true @@ -159,20 +159,19 @@ PLIST_DIRS+= ${XPI_DIRS:S!^!${_TD}/!} ${ .for dist in ${XPI_DISTNAMES} XPI_XPIDIR_${dist}= ${XPI_LIBDIR}/${XPI_ID_${dist}} -_TD_${dist}= ${XPI_XPIDIR_${dist}:S,^${STAGEDIR}${PREFIX}/,,} +_TD_${dist}= ${XPI_XPIDIR_${dist}:S,^${PREFIX}/,,} PLIST_FILES+= ${XPI_FILES_${dist}:S!^!${_TD_${dist}}/!} PLIST_DIRS+= ${XPI_DIRS_${dist}:S!^!${_TD_${dist}}/!} ${_TD_${dist}} .endfor .if !target(do-install) do-install: - @${INSTALL} -d ${_TD_FULL} ${XPI_SLDIRS_ALL} - @${CP} -R ${WRKSRC}/ ${_TD_FULL}/ + @${MKDIR} ${STAGEDIR}${_TD_FULL} ${XPI_SLDIRS_ALL:S/^/${STAGEDIR}/} + @cd ${WRKSRC}; ${PAX} -rw . ${STAGEDIR}${_TD_FULL}/ @if [ -d ${FILESDIR} -a -f ${FILESDIR}/chrome.manifest ] ; \ - then ${CP} ${FILESDIR}/chrome.manifest ${_TD_FULL}/ ; fi - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${_TD_FULL}/ - @${CHMOD} -R a+rX,go-w ${_TD_FULL}/ - @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q} ; } + then ${INSTALL_DATA} ${FILESDIR}/chrome.manifest ${STAGEDIR}${_TD_FULL}/ ; fi + @${CHMOD} -R a+rX,go-w ${STAGEDIR}${_TD_FULL}/ + @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} ${STAGEDR}$$_dir/ ${_Q} ; } @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${STAGEDIR}${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q}; }' ${_A} @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${XPI_ID} ; }' ${_A}