From owner-svn-ports-all@FreeBSD.ORG Thu Apr 24 21:49:07 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 DA00F8F7; Thu, 24 Apr 2014 21:49:07 +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 C7B0D13A7; Thu, 24 Apr 2014 21:49:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3OLn7PO055787; Thu, 24 Apr 2014 21:49:07 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3OLn7xI055786; Thu, 24 Apr 2014 21:49:07 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404242149.s3OLn7xI055786@svn.freebsd.org> From: Antoine Brodin Date: Thu, 24 Apr 2014 21:49:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352071 - 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: Thu, 24 Apr 2014 21:49:07 -0000 Author: antoine Date: Thu Apr 24 21:49:07 2014 New Revision: 352071 URL: http://svnweb.freebsd.org/changeset/ports/352071 QAT: https://qat.redports.org/buildarchive/r352071/ Log: - No need to create in stagedir some symlinks that are regenerated by @exec (actually the symlinks were not created in stagedir, the line was totally buggy) - Generate a plist that is more check-stagedir friendly Modified: head/www/xpi-adblock/Makefile.xpi Modified: head/www/xpi-adblock/Makefile.xpi ============================================================================== --- head/www/xpi-adblock/Makefile.xpi Thu Apr 24 21:44:24 2014 (r352070) +++ head/www/xpi-adblock/Makefile.xpi Thu Apr 24 21:49:07 2014 (r352071) @@ -171,11 +171,10 @@ do-install: @if [ -d ${FILESDIR} -a -f ${FILESDIR}/chrome.manifest ] ; \ 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} - @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} + @for _dir in ${XPI_DIRS_TRY} ; { ${ECHO_CMD} "@unexec rmdir %D/$$_dir ${_Q}" ${_A} ; } .endif .if !target(relink)