[arch-commits] Commit in nodejs/trunk (PKGBUILD)
Felix Yan
fyan at archlinux.org
Sat Jul 19 08:29:40 UTC 2014
Date: Saturday, July 19, 2014 @ 10:29:40
Author: fyan
Revision: 115948
upgpkg: nodejs 0.10.29-2
- update bundled npm to 1.4.21, fixes FS#41254
- symlink man pages into /usr/share/man, fixes FS#40883
Modified:
nodejs/trunk/PKGBUILD
----------+
PKGBUILD | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-07-19 04:03:22 UTC (rev 115947)
+++ PKGBUILD 2014-07-19 08:29:40 UTC (rev 115948)
@@ -10,7 +10,8 @@
pkgname=nodejs
pkgver=0.10.29
-pkgrel=1
+_npmver=1.4.21
+pkgrel=2
pkgdesc='Evented I/O for V8 javascript'
arch=('i686' 'x86_64')
url='http://nodejs.org/'
@@ -17,16 +18,23 @@
license=('MIT')
depends=('openssl')
provides=('nodejs-node-gyp')
-makedepends=('python2')
+makedepends=('python2' 'git' 'procps-ng')
optdepends=('python2: for node-gyp')
checkdepends=('curl')
options=('!emptydirs')
-source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz)
-sha256sums=('47379d01f765f87c1a1498b4e65de30e45201de50334954860d7375a8258b15d')
+source=("http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz"
+ git+https://github.com/npm/npm.git#tag=v$_npmver)
+sha256sums=('47379d01f765f87c1a1498b4e65de30e45201de50334954860d7375a8258b15d'
+ 'SKIP')
prepare() {
cd node-v$pkgver
+ # We need new version of npm to fix bugs
+ rm -r deps/npm
+ ln -s "$srcdir/npm" deps
+ rm -r "$srcdir/npm/.git"
+
msg 'Fixing for python2 name'
find -type f -exec sed \
-e 's_^#!/usr/bin/env python$_&2_' \
@@ -45,6 +53,10 @@
--shared-openssl
make
+
+ cd ../npm
+ ../node-v$pkgver/node cli.js install ronn marked
+ PATH="$srcdir/node-v$pkgver:$PATH" make
}
check() {
@@ -65,7 +77,13 @@
install -D -m644 LICENSE \
"$pkgdir"/usr/share/licenses/nodejs/LICENSE
- # Why the hell wasn't this installed?! FS#40221
+ install -d "$pkgdir"/usr/share/man/{man1,man3,man5,man7}
+ for _dir in man1 man3 man5 man7; do
+ for _file in $(ls "$pkgdir"/usr/lib/node_modules/npm/man/$_dir/*); do
+ ln -s /usr/lib/node_modules/npm/man/$_dir/$_file "$pkgdir"/usr/share/man/$_dir/
+ done
+ done
+
ln -s /usr/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js "$pkgdir"/usr/bin/node-gyp
}
More information about the arch-commits
mailing list