From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 15 21:10:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B7D7B49 for ; Thu, 15 May 2014 21:10:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 7741B23F1 for ; Thu, 15 May 2014 21:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4FLA0gk087065 for ; Thu, 15 May 2014 21:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4FLA0vY087064; Thu, 15 May 2014 21:10:00 GMT (envelope-from gnats) Resent-Date: Thu, 15 May 2014 21:10:00 GMT Resent-Message-Id: <201405152110.s4FLA0vY087064@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Adam Weinberger 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 691D4AF2 for ; Thu, 15 May 2014 21:05:09 +0000 (UTC) Received: from apnoea.adamw.org (apnoea.adamw.org [204.109.59.150]) (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 46D6323BD for ; Thu, 15 May 2014 21:05:08 +0000 (UTC) Received: by apnoea.adamw.org (Postfix, from userid 0) id 0A54D11F8FA; Thu, 15 May 2014 17:05:01 -0400 (EDT) Message-Id: <20140515210501.0A54D11F8FA@apnoea.adamw.org> Date: Thu, 15 May 2014 17:05:01 -0400 (EDT) From: Adam Weinberger Reply-To: Adam Weinberger To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/189843: [patch] update www/npm to 1.4.10 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 May 2014 21:10:00 -0000 >Number: 189843 >Category: ports >Synopsis: [patch] update www/npm to 1.4.10 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu May 15 21:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Adam Weinberger >Release: FreeBSD 10.0-STABLE i386 >Organization: >Environment: System: FreeBSD apnoea.adamw.org 10.0-STABLE FreeBSD 10.0-STABLE #7: Tue May 13 23:19:06 EDT 2014 root@apnoea.adamw.org:/usr/obj/usr/src/sys/PEEP i386 >Description: Attached patch updates npm to 1.4.10. 1.4.9 contained one item marked "critical" so I've raised the severity/priority levels on the PR. In addition to the update, I've also fixed up the maketar target. It was producing a lot of errors but it works cleanly now. 1.4.10 switched to using markdown to generate HTML docs, but they forgot to include the commands to build it from node. I took the shortcut of just using a dependency-less markdown port from the tree and using that for now. >How-To-Repeat: >Fix: --- npm.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 354152) +++ Makefile (working copy) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= npm -PORTVERSION= 1.4.6 +PORTVERSION= 1.4.10 CATEGORIES= www -MASTER_SITES= LOCAL/sunpoet +MASTER_SITES= LOCAL/adamw MAINTAINER= sunpoet@FreeBSD.org COMMENT= Node package manager @@ -35,7 +35,7 @@ @${CHMOD} +x ${STAGEDIR}${PREFIX}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp # maintainer section: -# require: bash, git, gmake, node +# require: bash, git, gmake, node, multimarkdown MS_DISTNAME= ${PORTNAME}-${MS_VERSION} MS_TAGS= ${MS_WRKSRC}/tags @@ -58,9 +58,11 @@ @${MKDIR} ${MS_WRKSRC}/${MS_DISTNAME}/ @${TAR} -xf ${MS_WRKSRC}/${MS_DISTNAME}.tar.gz -C ${MS_WRKSRC}/${MS_DISTNAME}/ --strip-components 1 @${SED} -i '' -e '/manRoot/ s|, "share"||' ${MS_WRKSRC}/${MS_DISTNAME}/lib/build.js ${MS_WRKSRC}/${MS_DISTNAME}/lib/unbuild.js - @${SED} -i '' -e '1 s|#!/bin/bash|#!${LOCALBASE}/bin/bash|' ${MS_WRKSRC}/${MS_DISTNAME}/scripts/doc-build.sh + @${SED} -i '' -e '1 s|#!/bin/bash|#!${LOCALBASE}/bin/bash|; s|make|gmake|' ${MS_WRKSRC}/${MS_DISTNAME}/scripts/doc-build.sh +# this next line can be removed once doc-build.sh is fixed + @${SED} -i '' -e 's|./node_modules/.bin/marked|multimarkdown|' ${MS_WRKSRC}/${MS_DISTNAME}/scripts/doc-build.sh @${GREP} -lr share/man ${MS_WRKSRC}/${MS_DISTNAME}/doc/ ${MS_WRKSRC}/${MS_DISTNAME}/scripts/ | ${XARGS} -I % ${SED} -i '' 's|share/man|man|g' % - @cd ${MS_WRKSRC}/${MS_DISTNAME}/ && ${MAKE_CMD} + @${GMAKE} -C ${MS_WRKSRC}/${MS_DISTNAME}/ @${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type d -exec ${CHMOD} 755 '{}' \; @${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type f -exec ${CHMOD} 644 '{}' \; @${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type f -name '*.sh' -exec ${CHMOD} 755 '{}' \; Index: distinfo =================================================================== --- distinfo (revision 354152) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (npm-1.4.6.tar.xz) = df5c621f2c51d9e5cc7f210165d1e837f4addc2892c5b0e6ed4350b04bd82cfa -SIZE (npm-1.4.6.tar.xz) = 1783848 +SHA256 (npm-1.4.10.tar.xz) = da34a52f6113da95927c38826d3f314dcae0997194ac774dc7e8077736227000 +SIZE (npm-1.4.10.tar.xz) = 1793192 Index: pkg-plist =================================================================== --- pkg-plist (revision 354152) +++ pkg-plist (working copy) @@ -1,6 +1,7 @@ bin/npm etc/man.d/npm.conf lib/node_modules/npm/.npmignore +lib/node_modules/npm/.travis.yml lib/node_modules/npm/AUTHORS lib/node_modules/npm/CONTRIBUTING.md lib/node_modules/npm/LICENSE @@ -885,6 +886,7 @@ lib/node_modules/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/core_module_names.json lib/node_modules/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/extract_description.js lib/node_modules/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/fixer.js +lib/node_modules/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/make_warning.js lib/node_modules/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/normalize.js lib/node_modules/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/safe_format.js lib/node_modules/npm/node_modules/read-package-json/node_modules/normalize-package-data/lib/typos.json @@ -1316,6 +1318,7 @@ lib/node_modules/npm/node_modules/text-table/test/doubledot.js lib/node_modules/npm/node_modules/text-table/test/table.js lib/node_modules/npm/node_modules/uid-number/LICENSE +lib/node_modules/npm/node_modules/uid-number/LICENCE lib/node_modules/npm/node_modules/uid-number/README.md lib/node_modules/npm/node_modules/uid-number/get-uid-gid.js lib/node_modules/npm/node_modules/uid-number/package.json @@ -1411,7 +1414,10 @@ lib/node_modules/npm/test/packages/npm-test-url-dep/README lib/node_modules/npm/test/packages/npm-test-url-dep/package.json lib/node_modules/npm/test/run.js +lib/node_modules/npm/test/tap/00-check-mock-dep.js lib/node_modules/npm/test/tap/404-parent.js +lib/node_modules/npm/test/tap/cache-add-unpublished.js +lib/node_modules/npm/test/tap/cache-shasum.js lib/node_modules/npm/test/tap/circular-dep.js lib/node_modules/npm/test/tap/circular-dep/minimist/package.json lib/node_modules/npm/test/tap/config-meta.js @@ -1430,12 +1436,24 @@ lib/node_modules/npm/test/tap/ignore-shrinkwrap/package.json lib/node_modules/npm/test/tap/install-at-locally.js lib/node_modules/npm/test/tap/install-at-locally/package@1.2.3/package.json +lib/node_modules/npm/test/tap/install-cli-unicode.js +lib/node_modules/npm/test/tap/install-cli/README.md +lib/node_modules/npm/test/tap/install-cli/index.js +lib/node_modules/npm/test/tap/install-cli/package.json lib/node_modules/npm/test/tap/install-save-exact.js lib/node_modules/npm/test/tap/install-save-exact/README.md lib/node_modules/npm/test/tap/install-save-exact/index.js lib/node_modules/npm/test/tap/install-save-exact/package.json +lib/node_modules/npm/test/tap/install-save-prefix.js +lib/node_modules/npm/test/tap/install-save-prefix/README.md +lib/node_modules/npm/test/tap/install-save-prefix/index.js +lib/node_modules/npm/test/tap/install-save-prefix/package.json +lib/node_modules/npm/test/tap/invalid-cmd-exit-code.js lib/node_modules/npm/test/tap/lifecycle-signal.js lib/node_modules/npm/test/tap/lifecycle-signal/package.json +lib/node_modules/npm/test/tap/lifecycle.js +lib/node_modules/npm/test/tap/ls-depth-cli.js +lib/node_modules/npm/test/tap/ls-depth/package.json lib/node_modules/npm/test/tap/ls-no-results.js lib/node_modules/npm/test/tap/noargs-install-config-save.js lib/node_modules/npm/test/tap/npm-api-not-loaded-error.js @@ -1459,9 +1477,12 @@ lib/node_modules/npm/test/tap/outdated/package.json lib/node_modules/npm/test/tap/package-with-peer-dep/package.json lib/node_modules/npm/test/tap/peer-deps-invalid.js +lib/node_modules/npm/test/tap/peer-deps-invalid/file-fail.js +lib/node_modules/npm/test/tap/peer-deps-invalid/file-ok.js lib/node_modules/npm/test/tap/peer-deps-invalid/package.json lib/node_modules/npm/test/tap/peer-deps-without-package-json.js lib/node_modules/npm/test/tap/peer-deps-without-package-json/.gitkeep +lib/node_modules/npm/test/tap/peer-deps-without-package-json/file-js.js lib/node_modules/npm/test/tap/peer-deps.js lib/node_modules/npm/test/tap/peer-deps/desired-ls-results.json lib/node_modules/npm/test/tap/peer-deps/package.json @@ -1469,6 +1490,7 @@ lib/node_modules/npm/test/tap/prune.js lib/node_modules/npm/test/tap/prune/package.json lib/node_modules/npm/test/tap/publish-config.js +lib/node_modules/npm/test/tap/referer.js lib/node_modules/npm/test/tap/repo.js lib/node_modules/npm/test/tap/scripts-whitespace-windows.js lib/node_modules/npm/test/tap/scripts-whitespace-windows/README.md @@ -1480,6 +1502,8 @@ lib/node_modules/npm/test/tap/shrinkwrap-dev-dependency.js lib/node_modules/npm/test/tap/shrinkwrap-dev-dependency/desired-shrinkwrap-results.json lib/node_modules/npm/test/tap/shrinkwrap-dev-dependency/package.json +lib/node_modules/npm/test/tap/shrinkwrap-empty-deps.js +lib/node_modules/npm/test/tap/shrinkwrap-empty-deps/package.json lib/node_modules/npm/test/tap/shrinkwrap-shared-dev-dependency.js lib/node_modules/npm/test/tap/shrinkwrap-shared-dev-dependency/desired-shrinkwrap-results.json lib/node_modules/npm/test/tap/shrinkwrap-shared-dev-dependency/package.json @@ -1486,6 +1510,7 @@ lib/node_modules/npm/test/tap/sorted-package-json.js lib/node_modules/npm/test/tap/startstop.js lib/node_modules/npm/test/tap/startstop/package.json +lib/node_modules/npm/test/tap/test-run-ls.js lib/node_modules/npm/test/tap/uninstall-package.js lib/node_modules/npm/test/tap/uninstall-package/package.json lib/node_modules/npm/test/tap/url-dependencies.js @@ -1492,11 +1517,13 @@ lib/node_modules/npm/test/tap/url-dependencies/package.json lib/node_modules/npm/test/tap/version-no-tags.js lib/node_modules/npm/test/update-test.sh +lib/node_modules/npm/wercker.yml @dirrmtry lib/node_modules @dirrm lib/node_modules/npm/test/tap/url-dependencies @dirrm lib/node_modules/npm/test/tap/uninstall-package @dirrm lib/node_modules/npm/test/tap/startstop @dirrm lib/node_modules/npm/test/tap/shrinkwrap-shared-dev-dependency +@dirrm lib/node_modules/npm/test/tap/shrinkwrap-empty-deps @dirrm lib/node_modules/npm/test/tap/shrinkwrap-dev-dependency @dirrm lib/node_modules/npm/test/tap/scripts-whitespace-windows/dep/bin @dirrm lib/node_modules/npm/test/tap/scripts-whitespace-windows/dep @@ -1511,8 +1538,11 @@ @dirrm lib/node_modules/npm/test/tap/outdated-git @dirrm lib/node_modules/npm/test/tap/outdated-depth @dirrm lib/node_modules/npm/test/tap/outdated +@dirrm lib/node_modules/npm/test/tap/ls-depth @dirrm lib/node_modules/npm/test/tap/lifecycle-signal +@dirrm lib/node_modules/npm/test/tap/install-save-prefix @dirrm lib/node_modules/npm/test/tap/install-save-exact +@dirrm lib/node_modules/npm/test/tap/install-cli @dirrm lib/node_modules/npm/test/tap/install-at-locally/package@1.2.3 @dirrm lib/node_modules/npm/test/tap/install-at-locally @dirrm lib/node_modules/npm/test/tap/ignore-shrinkwrap --- npm.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: