[arch-commits] Commit in nodejs/trunk (PKGBUILD nodejs.install)

[Felix Yan]

    Date: Friday, May 1, 2015 @ 11:43:32
  Author: fyan
Revision: 132580

upgpkg: nodejs 0.12.2-4

- split npm into separate package
- enable intl (FS#44793)

Added:
  nodejs/trunk/nodejs.install
Modified:
  nodejs/trunk/PKGBUILD

----------------+
 PKGBUILD       |   41 +++++++++--------------------------------
 nodejs.install |    7 +++++++
 2 files changed, 16 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-01 09:32:06 UTC (rev 132579)
+++ PKGBUILD	2015-05-01 09:43:32 UTC (rev 132580)
@@ -10,31 +10,21 @@
 
 pkgname=nodejs
 pkgver=0.12.2
-_npmver=2.8.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64')
 url='http://nodejs.org/'
 license=('MIT')
-depends=('openssl' 'zlib') # 'libuv' 'v8' 'c-ares')
-provides=('nodejs-node-gyp')
-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"
-        git+https://github.com/npm/npm.git#tag=v$_npmver)
-sha256sums=('ac7e78ade93e633e7ed628532bb8e650caba0c9c33af33581957f3382e2a772d'
-            'SKIP')
+depends=('openssl' 'zlib' 'icu') # 'libuv' 'v8' 'c-ares')
+makedepends=('python2' 'procps-ng')
+optdepends=('npm: nodejs package manager')
+install=nodejs.install
+source=("http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz")
+sha256sums=('ac7e78ade93e633e7ed628532bb8e650caba0c9c33af33581957f3382e2a772d')
 
 prepare() {
   cd node-v$pkgver
 
-  # We need newer 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_' \
@@ -50,6 +40,8 @@
   export PYTHON=python2
   ./configure \
     --prefix=/usr \
+    --with-intl=system-icu \
+    --without-npm \
     --shared-openssl \
     --shared-zlib
     # --shared-libuv
@@ -57,11 +49,6 @@
     # --shared-cares
 
   make
-
-  cd ../npm
-  ../node-v$pkgver/node cli.js install ronn marked
-  PATH="$srcdir/node-v$pkgver:$PATH" make
-  ../node-v$pkgver/node cli.js uninstall ronn marked marked-man
 }
 
 check() {
@@ -81,16 +68,6 @@
 
   install -D -m644 LICENSE \
     "$pkgdir"/usr/share/licenses/nodejs/LICENSE
-
-  install -d "$pkgdir"/usr/share/man/{man1,man3,man5,man7}
-  for _dir in man1 man3 man5 man7; do
-    cd "$pkgdir"/usr/lib/node_modules/npm/man/$_dir
-    for _file in *; 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
 }
 
 # vim:set ts=2 sw=2 et:

Added: nodejs.install
===================================================================
--- nodejs.install	                        (rev 0)
+++ nodejs.install	2015-05-01 09:43:32 UTC (rev 132580)
@@ -0,0 +1,7 @@
+post_install () {
+  echo "Notice: npm is not shipped with nodejs since 0.12.2-4, please install npm manually if you need it."
+}
+
+post_upgrade () {
+  post_install
+}