CVS commit: pkgsrc/www/nginx

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Nov 24 11:35:23 UTC 2016

Modified Files:
        pkgsrc/www/nginx: Makefile.common distinfo
Added Files:
        pkgsrc/www/nginx/patches: patch-auto_lib_pcre_conf

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/nginx/Makefile.common
cvs rdiff -u -r1.52 -r1.53 pkgsrc/www/nginx/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/nginx/patches/patch-auto_lib_pcre_conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/nginx/Makefile.common
diff -u pkgsrc/www/nginx/Makefile.common:1.7 pkgsrc/www/nginx/Makefile.common:1.8
--- pkgsrc/www/nginx/Makefile.common:1.7        Mon Oct 12 14:53:17 2015
+++ pkgsrc/www/nginx/Makefile.common    Thu Nov 24 11:35:23 2016
@@ -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 @@ OWN_DIRS_PERMS+=     ${NGINX_DATADIR} ${NGIN
 
 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

Index: pkgsrc/www/nginx/distinfo
diff -u pkgsrc/www/nginx/distinfo:1.52 pkgsrc/www/nginx/distinfo:1.53
--- pkgsrc/www/nginx/distinfo:1.52      Wed Jun 15 14:49:11 2016
+++ pkgsrc/www/nginx/distinfo   Thu Nov 24 11:35:23 2016
@@ -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 @@ SHA512 (set-misc-nginx-module-0.30.tar.g
 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

Added files:

Index: pkgsrc/www/nginx/patches/patch-auto_lib_pcre_conf
diff -u /dev/null pkgsrc/www/nginx/patches/patch-auto_lib_pcre_conf:1.1
--- /dev/null   Thu Nov 24 11:35:23 2016
+++ pkgsrc/www/nginx/patches/patch-auto_lib_pcre_conf   Thu Nov 24 11:35:23 2016
@@ -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