Bump to 1.13.0 and enable nodejs

2 files changed, 35 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50df98116cd2..72f888d2d8ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nginx-unit
 	pkgdesc = Lightweight, dynamic, open-source server for diverse web applications.
-	pkgver = 1.12.0
+	pkgver = 1.13.0
 	pkgrel = 1
 	url = https://unit.nginx.org/
 	arch = i686
@@ -13,9 +13,9 @@ pkgbase = nginx-unit
 	makedepends = ruby
 	makedepends = perl
 	makedepends = npm
-	source = https://unit.nginx.org/download/unit-1.12.0.tar.gz
+	source = https://unit.nginx.org/download/unit-1.13.0.tar.gz
 	source = unit.service
-	sha256sums = 03388fb39b2e589c85d4bccb6d5a0e99098d250f0ecb5be668b416cc478d17d1
+	sha256sums = 6a0297a8fc503d213cc8dca551a428baf51eca1d1ea6dc2407001d4691105e6e
 	sha256sums = 8c9b2f732d6e50aa747aa7703303e5fff69f5abc6f5fc1741b774b422e029606
 
 pkgname = nginx-unitd
@@ -44,6 +44,11 @@ pkgname = nginx-unit-ruby
 	depends = nginx-unitd
 	depends = ruby
 
+pkgname = nginx-unit-nodejs
+	arch = any
+	depends = nginx-unitd
+	depends = nodejs
+
 pkgname = nginx-unit-go
 	arch = any
 	depends = nginx-unitd
diff --git a/PKGBUILD b/PKGBUILD
index 5df4eeeeac99..311f3b023fae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: KawaiDesu <zmey1992@ya.ru>
+# Contributor: @whoami
 # Contributor: Roman Voropaev <voropaev.roma@gmail.com>
 # Contributor:: Julian Brost <julian@0x4a42.net>
 
@@ -9,10 +10,10 @@ pkgname=('nginx-unitd'
          'nginx-unit-php'
          'nginx-unit-perl'
          'nginx-unit-ruby'
-#         'nginx-unit-nodejs'
+         'nginx-unit-nodejs'
          'nginx-unit-go')
 _shortname='unit'
-pkgver=1.12.0
+pkgver=1.13.0
 pkgrel=1
 pkgdesc="Lightweight, dynamic, open-source server for diverse web applications."
 arch=('i686' 'x86_64')
@@ -20,12 +21,12 @@ url="https://unit.nginx.org/"
 license=('Apache')
 source=("https://unit.nginx.org/download/unit-$pkgver.tar.gz"
         'unit.service')
-sha256sums=('03388fb39b2e589c85d4bccb6d5a0e99098d250f0ecb5be668b416cc478d17d1'
+sha256sums=('6a0297a8fc503d213cc8dca551a428baf51eca1d1ea6dc2407001d4691105e6e'
             '8c9b2f732d6e50aa747aa7703303e5fff69f5abc6f5fc1741b774b422e029606')
 makedepends=('php-embed' 'python' 'python2' 'go' 'ruby' 'perl' 'npm')
 
 build() {
-  cd "$srcdir"/$_shortname-$pkgver
+  cd "${srcdir}/${_shortname}-${pkgver}"
   ./configure --prefix=/usr \
               --sbindir=/usr/bin \
               --modules="/usr/lib/$pkgbase" \
@@ -39,7 +40,7 @@ build() {
   ./configure php
   ./configure perl
   ./configure ruby
-#  ./configure nodejs
+  ./configure nodejs
   ./configure go --go-path=/usr/lib/go
   make all
 }
@@ -47,61 +48,60 @@ build() {
 package_nginx-unitd() {
   depends=('glibc' 'openssl')
 
-  cd "$srcdir"/$_shortname-$pkgver
-  make DESTDIR="$pkgdir" unitd-install
-  install -m 644 -D "$srcdir"/unit.service "$pkgdir"/usr/lib/systemd/system/unit.service
+  cd "${srcdir}/${_shortname}-${pkgver}"
+  make DESTDIR="${pkgdir}" unitd-install
+  install -m 644 -D "${srcdir}/unit.service" "${pkgdir}/usr/lib/systemd/system/unit.service"
 }
 
 package_nginx-unit-python() {
   depends=('nginx-unitd' 'python')
 
-  cd "$srcdir"/$_shortname-$pkgver
-  make DESTDIR="$pkgdir" python3-install
+  cd "${srcdir}/${_shortname}-${pkgver}"
+  make DESTDIR="${pkgdir}" python3-install
 }
 
 package_nginx-unit-python2() {
   depends=('nginx-unitd' 'python2')
 
-  cd "$srcdir"/$_shortname-$pkgver
-  make DESTDIR="$pkgdir" python2-install
+  cd "${srcdir}/${_shortname}-${pkgver}"
+  make DESTDIR="${pkgdir}" python2-install
 }
 
 package_nginx-unit-php() {
   depends=('nginx-unitd' 'php-embed')
 
-  cd "$srcdir"/$_shortname-$pkgver
-  make DESTDIR="$pkgdir" php-install
+  cd "${srcdir}/${_shortname}-${pkgver}"
+  make DESTDIR="${pkgdir}" php-install
 }
 
 package_nginx-unit-go() {
   arch=('any')
   depends=('nginx-unitd' 'go')
 
-  cd "$srcdir"/$_shortname-$pkgver
-  make DESTDIR="$pkgdir" go-install
+  cd "${srcdir}/${_shortname}-${pkgver}"
+  make DESTDIR="${pkgdir}" go-install
 }
 
 package_nginx-unit-perl() {
   arch=('any')
   depends=('nginx-unitd' 'perl')
 
-  cd "$srcdir"/$_shortname-$pkgver
-  make DESTDIR="$pkgdir" perl-install
+  cd "${srcdir}/${_shortname}-${pkgver}"
+  make DESTDIR="${pkgdir}" perl-install
 }
 
 package_nginx-unit-ruby() {
   arch=('any')
   depends=('nginx-unitd' 'ruby')
 
-  cd "$srcdir"/$_shortname-$pkgver
+  cd "${srcdir}/${_shortname}-${pkgver}"
   make DESTDIR="$pkgdir" ruby-install
 }
 
-# Temporary disabled due to build problems
-#package_nginx-unit-nodejs() {
-#  arch=('any')
-#  depends=('nginx-unitd' 'nodejs')
-#
-#  cd "$srcdir"/$_shortname-$pkgver
-#  make DESTDIR="$pkgdir" node-install
-#}
+package_nginx-unit-nodejs() {
+  arch=('any')
+  depends=('nginx-unitd' 'nodejs')
+
+  cd "${srcdir}/${_shortname}-${pkgver}"
+  make DESTDIR="${pkgdir}/usr/lib/" node-local-install
+}