[arch-commits] Commit in passenger/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

    Date: Monday, January 6, 2020 @ 14:36:53
  Author: bpiotrowski
Revision: 549755

Switch to nginx-src

Modified:
  passenger/trunk/PKGBUILD

----------+
 PKGBUILD |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-06 14:34:28 UTC (rev 549754)
+++ PKGBUILD	2020-01-06 14:36:53 UTC (rev 549755)
@@ -4,19 +4,17 @@
 pkgname=(passenger mod_passenger nginx-mod-passenger)
 pkgver=6.0.4
 pkgrel=2
-_nginxver=1.16.1
 pkgdesc="Fast and robust web server and application server for Ruby, Python and Node.js"
 arch=('x86_64')
 url="https://www.phusionpassenger.com"
 _watch="https://github.com/phusion/passenger/releases"
 license=('MIT')
-makedepends=('ruby-rake' 'ruby-rack' 'curl' 'apache')
+makedepends=('ruby-rake' 'ruby-rack' 'curl' 'apache' 'nginx-src')
 options=('!emptydirs' 'staticlibs')
 validpgpkeys=('D5F0851426939232F437AB722AC745A50A212A8C'
               '16378A33A6EF16762922526E561F9B9CAC40B2F7'  # auto-software-signing at phusion.nl
               'B0F4253373F8F6F510D42178520A9993A1C052F8') # Maxim Dounin <mdounin at mdounin.ru>
 source=(https://s3.amazonaws.com/phusion-passenger/releases/passenger-$pkgver.tar.gz{,.asc}
-        https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc})
 sha256sums=('ec1e4b555c176642c1c316897177d54b6f7d369490280e8ee3e54644e40b250b'
             'SKIP'
             'f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b'
@@ -23,7 +21,8 @@
             'SKIP')
 
 build(){
-  cd "$srcdir"/nginx-$_nginxver
+  cp -r /usr/src/nginx .
+  cd "$srcdir"/nginx
   ./configure --with-compat --add-dynamic-module=../$pkgbase-$pkgver/src/nginx_module
   make modules
 
@@ -59,12 +58,12 @@
 
 package_nginx-mod-passenger() {
   pkgdesc="Passenger nginx module"
-  depends=('passenger' "nginx=$_nginxver")
+  depends=('passenger' "nginx")
 
   install -Dm644 "$srcdir"/$pkgbase-$pkgver/LICENSE \
                  "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 
-  cd "$srcdir"/nginx-$_nginxver/objs
+  cd "$srcdir"/nginx/objs
   for mod in ngx_*.so; do
     install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
   done