diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2018-04-24 22:29:18 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2018-04-24 22:29:18 +0000 |
| commit | 8f19945eed329db2d64ba3494511b395a00cf56e (patch) | |
| tree | 37a195df8a30fc1a33c3ef13d2b4cffbe481f5b5 /www/nginx-devel/files/extra-patch-nginx-vod-module-config | |
| parent | java/java-checkstyle: Update version 8.7=>8.9 (diff) | |
Merge from www/nginx and adopt next revisions:
468201, 468240.
Update third-party modules to their recent versions.
Enable libxml usage for third-party vod module.
Bump PORTREVISION.
Notes
Notes:
svn path=/head/; revision=468248
Diffstat (limited to 'www/nginx-devel/files/extra-patch-nginx-vod-module-config')
| -rw-r--r-- | www/nginx-devel/files/extra-patch-nginx-vod-module-config | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/www/nginx-devel/files/extra-patch-nginx-vod-module-config b/www/nginx-devel/files/extra-patch-nginx-vod-module-config new file mode 100644 index 000000000000..d71f81774644 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-nginx-vod-module-config @@ -0,0 +1,17 @@ +--- ../nginx-vod-module-1.22/config.orig 2018-04-24 17:51:34.654430000 -0400 ++++ ../nginx-vod-module-1.22/config 2018-04-24 18:10:13.517041000 -0400 +@@ -154,8 +154,12 @@ + ngx_feature_run=no + ngx_feature_incs="#include <libxml/parser.h> + #include <libxml/tree.h>" +-ngx_feature_path="/usr/include/libxml2" +-ngx_feature_libs="-lxml2" ++ngx_feature_path="%%PREFIX%%/include/libxml2 %%PREFIX%%/include" ++if [ $NGX_RPATH = YES ]; then ++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -lxml2 -lxslt" ++else ++ ngx_feature_libs="-L%%PREFIX%%/lib -lxml2 -lxslt" ++fi + ngx_feature_test="xmlReadMemory(NULL, 0, NULL, NULL, 0);" + . auto/feature + |