From owner-svn-ports-head@freebsd.org Sat Aug 27 21:34:28 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE3D7B77BCE; Sat, 27 Aug 2016 21:34:28 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 72D67DE; Sat, 27 Aug 2016 21:34:28 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7RLYRaW045103; Sat, 27 Aug 2016 21:34:27 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7RLYRIj045102; Sat, 27 Aug 2016 21:34:27 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201608272134.u7RLYRIj045102@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 27 Aug 2016 21:34:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420999 - head/www/lessc 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.22 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: Sat, 27 Aug 2016 21:34:28 -0000 Author: marino Date: Sat Aug 27 21:34:27 2016 New Revision: 420999 URL: https://svnweb.freebsd.org/changeset/ports/420999 Log: www/lessc: Moving building out of stage phase, fix stage-QA This port would build and install in the stage phase, but building is supposed to be complete by then. Moreover, stage QA checks complain about thousands of "orphaned" files and symbolic links with absolute paths. Fix all the problems by installing in a temporary build directory and moving just the lessc files over the stage directory, and fix the symbolic link by defining a relative path instead. Functionally, the new package is the same as the old one, so no revbump is required. PR: 210567 Approved by: maintainer timeout (2 months) Modified: head/www/lessc/Makefile Modified: head/www/lessc/Makefile ============================================================================== --- head/www/lessc/Makefile Sat Aug 27 20:39:11 2016 (r420998) +++ head/www/lessc/Makefile Sat Aug 27 21:34:27 2016 (r420999) @@ -14,14 +14,26 @@ LICENSE= APACHE20 BUILD_DEPENDS= npm>=0:www/npm RUN_DEPENDS= npm>=0:www/npm -NO_BUILD= yes USE_GITHUB= yes GH_ACCOUNT= less GH_PROJECT= less.js +# npm install both builds and installs. To avoid building in the stage phase, +# allow npm to install in a temporary directory and move from there. +# Moreover, only a fraction of what is installed by npm needs to be packaged +do-build: + ${MKDIR} ${WRKDIR}/build-lib + (cd ${WRKDIR}/build-lib && \ + ${SETENV} HOME=${WRKDIR} npm install ${WRKSRC}) + do-install: - (cd ${STAGEDIR}${PREFIX}/lib ; ${SETENV} HOME=${WRKDIR} npm install ${WRKSRC}) - # this is a dirty hack - ${LN} -s ${PREFIX}/lib/node_modules/.bin/lessc ${STAGEDIR}${PREFIX}/bin/lessc + ${MKDIR} ${STAGEDIR}${PREFIX}/bin \ + ${STAGEDIR}${PREFIX}/lib/node_modules/.bin + ${MV} ${WRKDIR}/build-lib/node_modules/less \ + ${STAGEDIR}${PREFIX}/lib/node_modules + ${MV} ${WRKDIR}/build-lib/node_modules/.bin/lessc \ + ${STAGEDIR}${PREFIX}/lib/node_modules/.bin + (cd ${STAGEDIR}${PREFIX}/bin && \ + ${LN} -s ../lib/node_modules/.bin/lessc lessc) .include