From owner-svn-ports-head@FreeBSD.ORG Sun Jan 26 15:07:23 2014 Return-Path: Delivered-To: svn-ports-head@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 449D8A2B; Sun, 26 Jan 2014 15:07:23 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 24D321E74; Sun, 26 Jan 2014 15:07:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0QF7N45087165; Sun, 26 Jan 2014 15:07:23 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0QF7LKk087158; Sun, 26 Jan 2014 15:07:21 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401261507.s0QF7LKk087158@svn.freebsd.org> From: Martin Wilke Date: Sun, 26 Jan 2014 15:07:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341198 - in head/www: xpi-adblock xpi-adblock_plus xpi-bookmarkdd xpi-clear_cache_button xpi-clearfields X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jan 2014 15:07:23 -0000 Author: miwi Date: Sun Jan 26 15:07:21 2014 New Revision: 341198 URL: http://svnweb.freebsd.org/changeset/ports/341198 QAT: https://qat.redports.org/buildarchive/r341198/ Log: - Stage support Modified: head/www/xpi-adblock/Makefile head/www/xpi-adblock/Makefile.xpi head/www/xpi-adblock_plus/Makefile head/www/xpi-bookmarkdd/Makefile head/www/xpi-clear_cache_button/Makefile head/www/xpi-clearfields/Makefile Modified: head/www/xpi-adblock/Makefile ============================================================================== --- head/www/xpi-adblock/Makefile Sun Jan 26 15:06:29 2014 (r341197) +++ head/www/xpi-adblock/Makefile Sun Jan 26 15:07:21 2014 (r341198) @@ -15,7 +15,6 @@ XPI_FILES= chrome/adblock.jar chrome.man defaults/preferences/adblock.js install.js install.rdf license.txt XPI_DIRS= chrome/adblock chrome components defaults/preferences defaults -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|2.0a3|2.0.*|g' ${WRKSRC}/install.rdf @${RM} -f ${WRKSRC}/install.rdf?* Modified: head/www/xpi-adblock/Makefile.xpi ============================================================================== --- head/www/xpi-adblock/Makefile.xpi Sun Jan 26 15:06:29 2014 (r341197) +++ head/www/xpi-adblock/Makefile.xpi Sun Jan 26 15:07:21 2014 (r341198) @@ -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?= ${PREFIX}/lib/xpi -XPI_SLDIR?= ${XPI_LIBDIR}/symlinks +XPI_LIBDIR?= ${STAGEDIR}${PREFIX}/lib/xpi +XPI_SLDIR?= ${STAGEDIR}${XPI_LIBDIR}/symlinks .ifndef XPI_DISTNAMES XPI_XPIDIR?= ${XPI_LIBDIR}/${XPI_ID} .endif -XPI_DIRS_TRY= ${XPI_SLDIRS_ALL:S,^${PREFIX}/,,} \ - ${XPI_SLDIR:S,^${PREFIX}/,,} \ - ${XPI_LIBDIR:S,^${PREFIX}/,,} +XPI_DIRS_TRY= ${XPI_SLDIRS_ALL:S,^${STAGEDIR}${PREFIX}/,,} \ + ${XPI_SLDIR:S,^${STAGEDIR}${PREFIX}/,,} \ + ${XPI_LIBDIR:S,^${STAGEDIR}${PREFIX}/,,} -PLIST_SUB+= XPI_LIBDIR="${XPI_LIBDIR:S,^${PREFIX}/,,}" \ - XPI_XPIDIR="${XPI_XPIDIR:S,^${PREFIX}/,,}" +PLIST_SUB+= XPI_LIBDIR="${XPI_LIBDIR:S,^${STAGEDIR}${PREFIX}/,,}" \ + XPI_XPIDIR="${XPI_XPIDIR:S,^${STAGEDIR}${PREFIX}/,,}" -_TD= ${XPI_XPIDIR:S,^${PREFIX}/,,} +_TD= ${XPI_XPIDIR:S,^${STAGEDIR}${PREFIX}/,,} _TD_FULL= ${XPI_XPIDIR} _A= >> ${TMPPLIST} _Q= 2>/dev/null || true @@ -159,7 +159,7 @@ 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,^${PREFIX}/,,} +_TD_${dist}= ${XPI_XPIDIR_${dist}:S,^${STAGEDIR}${PREFIX}/,,} PLIST_FILES+= ${XPI_FILES_${dist}:S!^!${_TD_${dist}}/!} PLIST_DIRS+= ${XPI_DIRS_${dist}:S!^!${_TD_${dist}}/!} ${_TD_${dist}} .endfor @@ -173,7 +173,7 @@ do-install: @${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} ; } - @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} + @${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} @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} Modified: head/www/xpi-adblock_plus/Makefile ============================================================================== --- head/www/xpi-adblock_plus/Makefile Sun Jan 26 15:06:29 2014 (r341197) +++ head/www/xpi-adblock_plus/Makefile Sun Jan 26 15:07:21 2014 (r341198) @@ -12,6 +12,5 @@ COMMENT= A content filtering extension XPI_NUM= 1865 XPI_ID= {d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d} -NO_STAGE= yes .include "../xpi-adblock/Makefile.xpi" .include Modified: head/www/xpi-bookmarkdd/Makefile ============================================================================== --- head/www/xpi-bookmarkdd/Makefile Sun Jan 26 15:06:29 2014 (r341197) +++ head/www/xpi-bookmarkdd/Makefile Sun Jan 26 15:07:21 2014 (r341198) @@ -17,6 +17,5 @@ XPI_FILES= chrome.manifest install.rdf \ defaults/preferences/prefs.js XPI_DIRS= chrome defaults/preferences defaults -NO_STAGE= yes .include "${.CURDIR}/../xpi-adblock/Makefile.xpi" .include Modified: head/www/xpi-clear_cache_button/Makefile ============================================================================== --- head/www/xpi-clear_cache_button/Makefile Sun Jan 26 15:06:29 2014 (r341197) +++ head/www/xpi-clear_cache_button/Makefile Sun Jan 26 15:07:21 2014 (r341198) @@ -34,7 +34,6 @@ XPI_DIRS= chrome/skin/classic chrome/ski chrome/content \ chrome -NO_STAGE= yes .include "${.CURDIR}/../xpi-adblock/Makefile.xpi" post-patch: Modified: head/www/xpi-clearfields/Makefile ============================================================================== --- head/www/xpi-clearfields/Makefile Sun Jan 26 15:06:29 2014 (r341197) +++ head/www/xpi-clearfields/Makefile Sun Jan 26 15:07:21 2014 (r341198) @@ -13,6 +13,5 @@ XPI_DISTNAME= clear_fields XPI_ID= clearfields@alex.alexander.googlepages.com XPI_NUM= 2408 -NO_STAGE= yes .include "${.CURDIR}/../xpi-adblock/Makefile.xpi" .include