Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Dec 2012 16:40:28 +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: r308486 - head/www/npm
Message-ID:  <201212081640.qB8GeS4o077180@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sat Dec  8 16:40:27 2012
New Revision: 308486
URL: http://svnweb.freebsd.org/changeset/ports/308486

Log:
  - Update to 1.1.68
  - Update maintainer section to match github URL change and generate better diff header
  
  Changes:	https://github.com/isaacs/npm/commits/master
  Feature safe:	yes

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

Modified: head/www/npm/Makefile
==============================================================================
--- head/www/npm/Makefile	Sat Dec  8 16:38:17 2012	(r308485)
+++ head/www/npm/Makefile	Sat Dec  8 16:40:27 2012	(r308486)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	npm
-PORTVERSION=	1.1.62
+PORTVERSION=	1.1.68
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/sunpoet
 
@@ -54,27 +54,27 @@ MS_WRKSRC=	${WRKSRC}/tmp
 
 GITHUB_PROJECT=	${PORTNAME}
 GITHUB_TAGSURL=	https://github.com/isaacs/npm/tags
-GITHUB_TARBALL=	https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${GITHUB_VERSION}
+GITHUB_TARBALL=	https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${GITHUB_VERSION}.tar.gz
 GITHUB_USER=	isaacs
 GITHUB_VERSION=	v${MS_VERSION}
 
 maketar: do-clean extract
-	${MKDIR} ${MS_WRKSRC}/
-	${FETCH_BINARY} ${FETCH_ARGS:C/A//} -o ${MS_WRKSRC}/tags ${GITHUB_TAGSURL}
-	${GREP} -o '/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/[^"]*' ${MS_WRKSRC}/tags | ${HEAD} -1 | ${CUT} -d/ -f5 | ${SED} 's|^v||' > ${MS_VERSIONFILE}
-	${ECHO_MSG} "*** Updating from ${PORTVERSION} to ${MS_VERSION} ..."
-	${FETCH_BINARY} ${FETCH_ARGS:C/A//} -o ${MS_WRKSRC}/${MS_DISTNAME}.tar.gz ${GITHUB_TARBALL}
-	${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
-	${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}/ && ${GMAKE}
-	${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type d -exec ${CHMOD} 755 '{}' \;
-	${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type f -exec ${CHMOD} 644 '{}' \;
-	cd ${MS_WRKSRC}/ && ${TAR} -Jcf ${MS_DISTNAME}.tar.xz ${MS_DISTNAME}/
-	${SED} -i '' -e '/^PORTVERSION=/ s|${PORTVERSION}|'${MS_VERSION}'|; /^PORTREVISION=/d' ${.CURDIR}/Makefile
-	${INSTALL} -m 644 ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}.tar.xz ${DISTDIR}/
-	cd ${.CURDIR}/ && ${MAKE} makesum
+	@${MKDIR} ${MS_WRKSRC}/
+	@${FETCH_BINARY} ${FETCH_ARGS:C/A//} -o ${MS_WRKSRC}/tags ${GITHUB_TAGSURL}
+	@${GREP} -o '/${GITHUB_USER}/${GITHUB_PROJECT}/archive/[^"]*\.tar\.gz' ${MS_WRKSRC}/tags | ${HEAD} -1 | ${CUT} -d/ -f5 | ${SED} 's|^v||; s|\.tar\.gz$$||' > ${MS_VERSIONFILE}
+	@${ECHO_MSG} "*** Updating from ${PORTVERSION} to ${MS_VERSION} ..."
+	@${FETCH_BINARY} ${FETCH_ARGS:C/A//} -o ${MS_WRKSRC}/${MS_DISTNAME}.tar.gz ${GITHUB_TARBALL}
+	@${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
+	@${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}/ && ${GMAKE}
+	@${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type d -exec ${CHMOD} 755 '{}' \;
+	@${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type f -exec ${CHMOD} 644 '{}' \;
+	@cd ${MS_WRKSRC}/ && ${TAR} -Jcf ${MS_DISTNAME}.tar.xz ${MS_DISTNAME}/
+	@${SED} -i '' -e '/^PORTVERSION=/ s|${PORTVERSION}|'${MS_VERSION}'|; /^PORTREVISION=/d' ${.CURDIR}/Makefile
+	@${INSTALL} -m 644 ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}.tar.xz ${DISTDIR}/
+	@cd ${.CURDIR}/ && ${MAKE} makesum
 
 .include <bsd.port.mk>

Modified: head/www/npm/distinfo
==============================================================================
--- head/www/npm/distinfo	Sat Dec  8 16:38:17 2012	(r308485)
+++ head/www/npm/distinfo	Sat Dec  8 16:40:27 2012	(r308486)
@@ -1,2 +1,2 @@
-SHA256 (npm-1.1.62.tar.xz) = 25ef0ef432e0df042f66b12fd652c7809c4c3be04b1dbc9f6036bd04cf229dbd
-SIZE (npm-1.1.62.tar.xz) = 1495992
+SHA256 (npm-1.1.68.tar.xz) = 08429e0c08dcd022c52552464b1b202dbf3400880084106a1823b63beecdaed8
+SIZE (npm-1.1.68.tar.xz) = 1414564

Modified: head/www/npm/pkg-plist
==============================================================================
--- head/www/npm/pkg-plist	Sat Dec  8 16:38:17 2012	(r308485)
+++ head/www/npm/pkg-plist	Sat Dec  8 16:40:27 2012	(r308486)
@@ -320,11 +320,6 @@ lib/node_modules/npm/node_modules/chownr
 lib/node_modules/npm/node_modules/chownr/README.md
 lib/node_modules/npm/node_modules/chownr/chownr.js
 lib/node_modules/npm/node_modules/chownr/package.json
-lib/node_modules/npm/node_modules/couch-login/README.md
-lib/node_modules/npm/node_modules/couch-login/couch-login.js
-lib/node_modules/npm/node_modules/couch-login/package.json
-lib/node_modules/npm/node_modules/couch-login/test/basic.js
-lib/node_modules/npm/node_modules/couch-login/test/registry.js
 lib/node_modules/npm/node_modules/fstream-npm/.npmignore
 lib/node_modules/npm/node_modules/fstream-npm/LICENCE
 lib/node_modules/npm/node_modules/fstream-npm/README.md
@@ -385,6 +380,7 @@ lib/node_modules/npm/node_modules/glob/p
 lib/node_modules/npm/node_modules/glob/test/00-setup.js
 lib/node_modules/npm/node_modules/glob/test/bash-comparison.js
 lib/node_modules/npm/node_modules/glob/test/cwd-test.js
+lib/node_modules/npm/node_modules/glob/test/mark.js
 lib/node_modules/npm/node_modules/glob/test/pause-resume.js
 lib/node_modules/npm/node_modules/glob/test/root-nomount.js
 lib/node_modules/npm/node_modules/glob/test/root.js
@@ -449,6 +445,12 @@ lib/node_modules/npm/node_modules/minima
 lib/node_modules/npm/node_modules/minimatch/LICENSE
 lib/node_modules/npm/node_modules/minimatch/README.md
 lib/node_modules/npm/node_modules/minimatch/minimatch.js
+lib/node_modules/npm/node_modules/minimatch/node_modules/sigmund/LICENSE
+lib/node_modules/npm/node_modules/minimatch/node_modules/sigmund/README.md
+lib/node_modules/npm/node_modules/minimatch/node_modules/sigmund/bench.js
+lib/node_modules/npm/node_modules/minimatch/node_modules/sigmund/package.json
+lib/node_modules/npm/node_modules/minimatch/node_modules/sigmund/sigmund.js
+lib/node_modules/npm/node_modules/minimatch/node_modules/sigmund/test/basic.js
 lib/node_modules/npm/node_modules/minimatch/package.json
 lib/node_modules/npm/node_modules/minimatch/test/basic.js
 lib/node_modules/npm/node_modules/minimatch/test/brace-expand.js
@@ -474,6 +476,7 @@ lib/node_modules/npm/node_modules/mkdirp
 lib/node_modules/npm/node_modules/mkdirp/test/sync.js
 lib/node_modules/npm/node_modules/mkdirp/test/umask.js
 lib/node_modules/npm/node_modules/mkdirp/test/umask_sync.js
+lib/node_modules/npm/node_modules/node-gyp/.jshintrc
 lib/node_modules/npm/node_modules/node-gyp/.npmignore
 lib/node_modules/npm/node_modules/node-gyp/LICENSE
 lib/node_modules/npm/node_modules/node-gyp/README.md
@@ -566,6 +569,19 @@ lib/node_modules/npm/node_modules/npm-re
 lib/node_modules/npm/node_modules/npm-registry-client/lib/tag.js
 lib/node_modules/npm/node_modules/npm-registry-client/lib/unpublish.js
 lib/node_modules/npm/node_modules/npm-registry-client/lib/upload.js
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/.npmignore
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/LICENSE
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/README.md
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/couch-login.js
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/package.json
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/test/00-setup.js
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/test/basic.js
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/test/fixtures/_replicator.couch
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/test/fixtures/couch.ini
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/test/fixtures/registry.couch
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/test/registry.js
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/test/reset-then-signup.js
+lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/test/zz-teardown.js
 lib/node_modules/npm/node_modules/npm-registry-client/package.json
 lib/node_modules/npm/node_modules/npm-registry-client/test/00-setup.js
 lib/node_modules/npm/node_modules/npm-registry-client/test/adduser-new.js
@@ -628,14 +644,19 @@ lib/node_modules/npm/node_modules/osenv/
 lib/node_modules/npm/node_modules/osenv/package.json
 lib/node_modules/npm/node_modules/osenv/test/unix.js
 lib/node_modules/npm/node_modules/osenv/test/windows.js
+lib/node_modules/npm/node_modules/read-installed/LICENSE
 lib/node_modules/npm/node_modules/read-installed/README.md
 lib/node_modules/npm/node_modules/read-installed/package.json
 lib/node_modules/npm/node_modules/read-installed/read-installed.js
 lib/node_modules/npm/node_modules/read-installed/test/basic.js
+lib/node_modules/npm/node_modules/read-package-json/LICENSE
 lib/node_modules/npm/node_modules/read-package-json/README.md
 lib/node_modules/npm/node_modules/read-package-json/package.json
 lib/node_modules/npm/node_modules/read-package-json/read-json.js
 lib/node_modules/npm/node_modules/read-package-json/test/basic.js
+lib/node_modules/npm/node_modules/read-package-json/test/bom.js
+lib/node_modules/npm/node_modules/read-package-json/test/fixtures/bom.json
+lib/node_modules/npm/node_modules/read-package-json/test/fixtures/nobom.json
 lib/node_modules/npm/node_modules/read-package-json/test/fixtures/not-json.css
 lib/node_modules/npm/node_modules/read-package-json/test/non-json.js
 lib/node_modules/npm/node_modules/read/.npmignore
@@ -728,6 +749,7 @@ lib/node_modules/npm/node_modules/semver
 lib/node_modules/npm/node_modules/semver/bin/semver
 lib/node_modules/npm/node_modules/semver/package.json
 lib/node_modules/npm/node_modules/semver/semver.js
+lib/node_modules/npm/node_modules/semver/test.js
 lib/node_modules/npm/node_modules/slide/.npmignore
 lib/node_modules/npm/node_modules/slide/LICENSE
 lib/node_modules/npm/node_modules/slide/README.md
@@ -944,6 +966,10 @@ lib/node_modules/npm/test/update-test.sh
 @dirrm lib/node_modules/npm/node_modules/npm-registry-client/test/fixtures/underscore
 @dirrm lib/node_modules/npm/node_modules/npm-registry-client/test/fixtures
 @dirrm lib/node_modules/npm/node_modules/npm-registry-client/test
+@dirrm lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/test/fixtures
+@dirrm lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/test
+@dirrm lib/node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login
+@dirrm lib/node_modules/npm/node_modules/npm-registry-client/node_modules
 @dirrm lib/node_modules/npm/node_modules/npm-registry-client/lib
 @dirrm lib/node_modules/npm/node_modules/npm-registry-client
 @dirrm lib/node_modules/npm/node_modules/nopt/lib
@@ -968,6 +994,9 @@ lib/node_modules/npm/test/update-test.sh
 @dirrm lib/node_modules/npm/node_modules/mkdirp/examples
 @dirrm lib/node_modules/npm/node_modules/mkdirp
 @dirrm lib/node_modules/npm/node_modules/minimatch/test
+@dirrm lib/node_modules/npm/node_modules/minimatch/node_modules/sigmund/test
+@dirrm lib/node_modules/npm/node_modules/minimatch/node_modules/sigmund
+@dirrm lib/node_modules/npm/node_modules/minimatch/node_modules
 @dirrm lib/node_modules/npm/node_modules/minimatch
 @dirrm lib/node_modules/npm/node_modules/lru-cache/test
 @dirrm lib/node_modules/npm/node_modules/lru-cache/lib
@@ -1000,8 +1029,6 @@ lib/node_modules/npm/test/update-test.sh
 @dirrm lib/node_modules/npm/node_modules/fstream-npm/example
 @dirrm lib/node_modules/npm/node_modules/fstream-npm
 @dirrm lib/node_modules/npm/node_modules/fstream
-@dirrm lib/node_modules/npm/node_modules/couch-login/test
-@dirrm lib/node_modules/npm/node_modules/couch-login
 @dirrm lib/node_modules/npm/node_modules/chownr
 @dirrm lib/node_modules/npm/node_modules/block-stream/test
 @dirrm lib/node_modules/npm/node_modules/block-stream/bench



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