[pkgsrc/trunk]: pkgsrc/www/nginx nginx: don't hard code pkgsrc paths, they're...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ec05f38763b
branches:  trunk
changeset: 355172:0ec05f38763b
user:      maya <maya%pkgsrc.org@localhost>
date:      Thu Nov 24 11:35:23 2016 +0000

description:
nginx: don't hard code pkgsrc paths, they're just defaults.

PR pkg/51593: nginx configure error the HTTP rewrite module requires the PCRE library

diffstat:

 www/nginx/Makefile.common                  |   7 ++++++-
 www/nginx/distinfo                         |   3 ++-
 www/nginx/patches/patch-auto_lib_pcre_conf |  22 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diffs (61 lines):

diff -r 94ee593c54c9 -r 0ec05f38763b www/nginx/Makefile.common
--- a/www/nginx/Makefile.common Thu Nov 24 08:01:15 2016 +0000
+++ b/www/nginx/Makefile.common Thu Nov 24 11:35:23 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2015/10/12 14:53:17 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.8 2016/11/24 11:35:23 maya Exp $
 # used by www/nginx/Makefile
 # used by www/nginx-devel/Makefile
 
@@ -75,6 +75,11 @@
 
 BUILD_TARGET=          build
 
+SUBST_CLASSES+=                prefix
+SUBST_STAGE.prefix+=   pre-configure
+SUBST_FILES.prefix+=   auto/lib/pcre/conf
+SUBST_SED.prefix+=     -e 's,@PREFIX@,${PREFIX},g'
+
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     conf/nginx.conf
diff -r 94ee593c54c9 -r 0ec05f38763b www/nginx/distinfo
--- a/www/nginx/distinfo        Thu Nov 24 08:01:15 2016 +0000
+++ b/www/nginx/distinfo        Thu Nov 24 11:35:23 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2016/06/15 14:49:11 fhajny Exp $
+$NetBSD: distinfo,v 1.53 2016/11/24 11:35:23 maya Exp $
 
 SHA1 (array-var-nginx-module-0.04.tar.gz) = 1fd3bdd05c2d1d7667ed6f7baa612ddf7f630df3
 RMD160 (array-var-nginx-module-0.04.tar.gz) = a751a2ce87dcfb88d072779097b4df9f42a415e4
@@ -46,3 +46,4 @@
 Size (set-misc-nginx-module-0.30.tar.gz) = 28584 bytes
 SHA1 (patch-aa) = 47f0c19b47b115f00ea6e9432d5bb12058c3bc1c
 SHA1 (patch-ab) = 7d126a4372aa8575ef01a4bfd9aec9898861c763
+SHA1 (patch-auto_lib_pcre_conf) = 500f16808c07ae2fd4016dd662b6f1b0b1efbb91
diff -r 94ee593c54c9 -r 0ec05f38763b www/nginx/patches/patch-auto_lib_pcre_conf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/nginx/patches/patch-auto_lib_pcre_conf        Thu Nov 24 11:35:23 2016 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-auto_lib_pcre_conf,v 1.1 2016/11/24 11:35:23 maya Exp $
+
+--- auto/lib/pcre/conf.orig    2016-05-31 13:47:01.000000000 +0000
++++ auto/lib/pcre/conf
+@@ -139,13 +139,13 @@ else
+ 
+             # NetBSD port
+ 
+-            ngx_feature="PCRE library in /usr/pkg/"
+-            ngx_feature_path="/usr/pkg/include"
++            ngx_feature="PCRE library in @PREFIX@"
++            ngx_feature_path="@PREFIX@/include"
+ 
+             if [ $NGX_RPATH = YES ]; then
+-                ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lpcre"
++                ngx_feature_libs="-R@PREFIX@/lib -L@PREFIX@/lib -lpcre"
+             else
+-                ngx_feature_libs="-L/usr/pkg/lib -lpcre"
++                ngx_feature_libs="-L@PREFIX@/lib -lpcre"
+             fi
+ 
+             . auto/feature