Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Feb 2015 16:23:55 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r379283 - head/www/npm
Message-ID:  <201502181623.t1IGNt4d067328@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Wed Feb 18 16:23:54 2015
New Revision: 379283
URL: https://svnweb.freebsd.org/changeset/ports/379283
QAT: https://qat.redports.org/buildarchive/r379283/

Log:
  - Fix runtime when DEFAULT_VERSIONS=python=3.*
  - Add missing dependency on USES=python:2 (required by gyp)
  - Pet portlint: use @(owner,group,mode) syntax instead of CHMOD
  - Bump PORTREVISION for dependency and package change

Modified:
  head/www/npm/Makefile
  head/www/npm/pkg-plist

Modified: head/www/npm/Makefile
==============================================================================
--- head/www/npm/Makefile	Wed Feb 18 16:23:50 2015	(r379282)
+++ head/www/npm/Makefile	Wed Feb 18 16:23:54 2015	(r379283)
@@ -3,6 +3,7 @@
 
 PORTNAME=	npm
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/sunpoet
 
@@ -17,7 +18,7 @@ NODE_DEVEL_DESC=Use www/node-devel inste
 MAKE_ARGS=	npm_config_prefix=${STAGEDIR}${PREFIX}
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ''
-USES=		cpe tar:xz
+USES=		cpe python:2 tar:xz
 
 MANPREFIX=	${PREFIX}/lib/node_modules/npm
 
@@ -29,11 +30,11 @@ NODE_DEVEL_RUN_DEPENDS_OFF=	node>=0.8.0:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|node cli.js|& --cache ${WRKDIR}/.cache|' ${WRKSRC}/Makefile
-	@${ECHO_CMD} 'MANPATH ${MANPREFIX}/man' > ${WRKDIR}/npm.conf
+	@${ECHO_CMD} 'MANPATH ${PREFIX}/lib/node_modules/npm/man' > ${WRKDIR}/npm.conf
+	@${REINPLACE_CMD} -e 's|exec python|exec ${PYTHON_CMD}|' ${WRKSRC}/node_modules/node-gyp/gyp/gyp
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/npm.conf ${STAGEDIR}${PREFIX}/etc/man.d/npm.conf
-	${CHMOD} +x ${STAGEDIR}${PREFIX}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp
 
 # maintainer section:
 # require: bash, git, gmake, perl, node

Modified: head/www/npm/pkg-plist
==============================================================================
--- head/www/npm/pkg-plist	Wed Feb 18 16:23:50 2015	(r379282)
+++ head/www/npm/pkg-plist	Wed Feb 18 16:23:54 2015	(r379283)
@@ -9,7 +9,7 @@ lib/node_modules/npm/CONTRIBUTING.md
 lib/node_modules/npm/LICENSE
 lib/node_modules/npm/Makefile
 lib/node_modules/npm/README.md
-lib/node_modules/npm/bin/node-gyp-bin/node-gyp
+@(,,755) lib/node_modules/npm/bin/node-gyp-bin/node-gyp
 lib/node_modules/npm/bin/node-gyp-bin/node-gyp.cmd
 lib/node_modules/npm/bin/npm
 lib/node_modules/npm/bin/npm-cli.js



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502181623.t1IGNt4d067328>