[pkgsrc/trunk]: pkgsrc/www/nginx nginx: Replace hardcoded /usr/pkg for all mo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/80ce284b1926
branches:  trunk
changeset: 437926:80ce284b1926
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Sep 03 09:48:07 2020 +0000

description:
nginx: Replace hardcoded /usr/pkg for all modules.

diffstat:

 www/nginx/Makefile.common                  |   8 +-------
 www/nginx/distinfo                         |   3 +--
 www/nginx/options.mk                       |  27 ++++++++++++++++++++++++++-
 www/nginx/patches/patch-auto_lib_pcre_conf |  24 ------------------------
 4 files changed, 28 insertions(+), 34 deletions(-)

diffs (132 lines):

diff -r 5cd2f9e9fd67 -r 80ce284b1926 www/nginx/Makefile.common
--- a/www/nginx/Makefile.common Thu Sep 03 09:30:26 2020 +0000
+++ b/www/nginx/Makefile.common Thu Sep 03 09:48:07 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2020/04/27 05:07:25 rillig Exp $
+# $NetBSD: Makefile.common,v 1.19 2020/09/03 09:48:07 jperkin Exp $
 # used by www/nginx/Makefile
 # used by www/nginx-devel/Makefile
 
@@ -75,12 +75,6 @@
 
 BUILD_TARGET=          build
 
-SUBST_CLASSES+=                prefix
-SUBST_STAGE.prefix=    pre-configure
-SUBST_FILES.prefix=    auto/lib/pcre/conf
-SUBST_VARS.prefix=     PREFIX
-SUBST_NOOP_OK.prefix=  yes # not needed for nginx>=17
-
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     conf/nginx.conf
diff -r 5cd2f9e9fd67 -r 80ce284b1926 www/nginx/distinfo
--- a/www/nginx/distinfo        Thu Sep 03 09:30:26 2020 +0000
+++ b/www/nginx/distinfo        Thu Sep 03 09:48:07 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.74 2020/08/16 21:54:08 wiz Exp $
+$NetBSD: distinfo,v 1.75 2020/09/03 09:48:07 jperkin Exp $
 
 SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26
 RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733
@@ -55,5 +55,4 @@
 SHA1 (patch-aa) = 47f0c19b47b115f00ea6e9432d5bb12058c3bc1c
 SHA1 (patch-ab) = 7d126a4372aa8575ef01a4bfd9aec9898861c763
 SHA1 (patch-auto_cc_conf) = 5e6a479ba419cd16dedeb3b4c47dc685d126ef6a
-SHA1 (patch-auto_lib_pcre_conf) = 8cf03fe38e7f75ef6892cc8b93be5cb18c381e97
 SHA1 (patch-src_event_modules_ngx__eventport__module.c) = c8e919f48d68bd5bffc4ad11d9c79dc6da3a0de2
diff -r 5cd2f9e9fd67 -r 80ce284b1926 www/nginx/options.mk
--- a/www/nginx/options.mk      Thu Sep 03 09:30:26 2020 +0000
+++ b/www/nginx/options.mk      Thu Sep 03 09:48:07 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.57 2020/08/16 21:54:08 wiz Exp $
+# $NetBSD: options.mk,v 1.58 2020/09/03 09:48:07 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS= array-var auth-request dav debug echo encrypted-session \
@@ -35,11 +35,21 @@
 .include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-mail_ssl_module
 CONFIGURE_ARGS+=       --with-http_ssl_module
+SUBST_CLASSES+=                fix-ssl
+SUBST_STAGE.fix-ssl=   pre-configure
+SUBST_FILES.fix-ssl=   auto/lib/openssl/conf
+SUBST_SED.fix-ssl=     -e 's,/usr/pkg,${BUILDLINK_PREFIX.openssl},g'
+SUBST_NOOP_OK.fix-ssl= yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mpcre)
 .include "../../devel/pcre/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-pcre-jit
+SUBST_CLASSES+=                fix-pcre
+SUBST_STAGE.fix-pcre=  pre-configure
+SUBST_FILES.fix-pcre=  auto/lib/pcre/conf
+SUBST_SED.fix-pcre=    -e 's,/usr/pkg,${BUILDLINK_PREFIX.pcre},g'
+SUBST_NOOP_OK.fix-pcre=        yes
 .else
 CONFIGURE_ARGS+=       --without-pcre
 CONFIGURE_ARGS+=       --without-http_rewrite_module
@@ -50,6 +60,11 @@
 CONFIGURE_ARGS+=       --add-module=../${DAV_EXT_DISTNAME}
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+SUBST_CLASSES+=                fix-xslt
+SUBST_STAGE.fix-xslt=  pre-configure
+SUBST_FILES.fix-xslt=  auto/lib/libxslt/conf
+SUBST_SED.fix-xslt=    -e 's,/usr/pkg,${BUILDLINK_PREFIX.libxslt},g'
+SUBST_NOOP_OK.fix-xslt=        yes
 .endif
 .if !empty(PKG_OPTIONS:Mdav) || make(makesum) || make(mdi)
 DAV_EXT_VERSION=               3.0.0
@@ -66,6 +81,11 @@
 .if !empty(PKG_OPTIONS:Mgeoip)
 .include "../../net/GeoIP/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-http_geoip_module
+SUBST_CLASSES+=                fix-geo
+SUBST_STAGE.fix-geo=   pre-configure
+SUBST_FILES.fix-geo=   auto/lib/geoip/conf
+SUBST_SED.fix-geo=     -e 's,/usr/pkg,${BUILDLINK_PREFIX.GeoIP},g'
+SUBST_NOOP_OK.fix-geo= yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mhttp2)
@@ -210,6 +230,11 @@
 .if !empty(PKG_OPTIONS:Mimage-filter)
 .include "../../graphics/gd/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-http_image_filter_module
+SUBST_CLASSES+=                fix-gd
+SUBST_STAGE.fix-gd=    pre-configure
+SUBST_FILES.fix-gd=    auto/lib/libgd/conf
+SUBST_SED.fix-gd=      -e 's,/usr/pkg,${BUILDLINK_PREFIX.gd},g'
+SUBST_NOOP_OK.fix-gd=  yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mslice)
diff -r 5cd2f9e9fd67 -r 80ce284b1926 www/nginx/patches/patch-auto_lib_pcre_conf
--- a/www/nginx/patches/patch-auto_lib_pcre_conf        Thu Sep 03 09:30:26 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-auto_lib_pcre_conf,v 1.2 2017/10/28 10:57:29 adam Exp $
-
-Use correct PREFIX.
-
---- 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