diff options
| author | maya <maya@pkgsrc.org> | 2016-11-24 11:35:23 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2016-11-24 11:35:23 +0000 |
| commit | a839e353f56884d3cc03c66b23c6d47af680d955 (patch) | |
| tree | 800abe2c8a0dc22f8af1cf6244c564eac75c1424 /www | |
| parent | b798c6bb8df146a0b79b453b6999cf03da79f9c9 (diff) | |
| download | pkgsrc-a839e353f56884d3cc03c66b23c6d47af680d955.tar.gz | |
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 (limited to 'www')
| -rw-r--r-- | www/nginx/Makefile.common | 7 | ||||
| -rw-r--r-- | www/nginx/distinfo | 3 | ||||
| -rw-r--r-- | www/nginx/patches/patch-auto_lib_pcre_conf | 22 |
3 files changed, 30 insertions, 2 deletions
diff --git a/www/nginx/Makefile.common b/www/nginx/Makefile.common index 274ee913460..43a2c03f504 100644 --- a/www/nginx/Makefile.common +++ b/www/nginx/Makefile.common @@ -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} ${NGINX_USER} ${NGINX_GROUP} 0700 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 --git a/www/nginx/distinfo b/www/nginx/distinfo index 78d0ad74152..67d73bc9f70 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -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.gz) = f081fc7e8e03f1a61b665d8798999f14d65 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 --git a/www/nginx/patches/patch-auto_lib_pcre_conf b/www/nginx/patches/patch-auto_lib_pcre_conf new file mode 100644 index 00000000000..0d0fbf4db1c --- /dev/null +++ b/www/nginx/patches/patch-auto_lib_pcre_conf @@ -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 |