diff options
| -rw-r--r-- | www/nginx-devel/Makefile | 5 | ||||
| -rw-r--r-- | www/nginx-devel/Makefile.extmod | 3 | ||||
| -rw-r--r-- | www/nginx-devel/distinfo | 6 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-nginx-vod-module-config | 17 |
4 files changed, 6 insertions, 25 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 0d94f81afdbb..80d545ea9653 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME?= nginx PORTVERSION= 1.23.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -254,8 +254,7 @@ NJS_CONFIGURE_ARGS= --no-pcre2 ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY} || \ ${PORT_OPTIONS:MHTTP_ZIP} || \ ${PORT_OPTIONS:MNAXSI} || \ - ${PORT_OPTIONS:MSRCACHE} || \ - ${PORT_OPTIONS:MVOD} + ${PORT_OPTIONS:MSRCACHE} IGNORE= a patch requires .endif diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index c8edbf55356b..f5a46eab37bc 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -311,12 +311,11 @@ SMALL_LIGHT_VARS= DSO_EXTMODS+=small_light SRCACHE_GH_TUPLE= openresty:srcache-nginx-module:v0.32:srcache SRCACHE_VARS= DSO_EXTMODS+=srcache -VOD_GH_TUPLE= kaltura:nginx-vod-module:1.29:vod +VOD_GH_TUPLE= kaltura:nginx-vod-module:1.30:vod VOD_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libavutil.so:multimedia/ffmpeg VOD_USES= iconv VOD_VARS= DSO_EXTMODS+=vod -VOD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-vod-module-config VTS_GH_TUPLE= vozlt:nginx-module-vts:v0.1.18:vts VTS_VARS= DSO_EXTMODS+=vts diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index c5d0558cf011..ea3f27efbfa4 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1657479744 +TIMESTAMP = 1657485370 SHA256 (nginx-1.23.0.tar.gz) = 820acaa35b9272be9e9e72f6defa4a5f2921824709f8aa4772c78ab31ed94cd1 SIZE (nginx-1.23.0.tar.gz) = 1102940 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -135,8 +135,8 @@ SHA256 (kawakibi-ngx_small_light-2f5e1d0_GH0.tar.gz) = bb7b4943a2db89a6a7020850d SIZE (kawakibi-ngx_small_light-2f5e1d0_GH0.tar.gz) = 57160 SHA256 (openresty-srcache-nginx-module-v0.32_GH0.tar.gz) = fd80e59b672e4ff3b4e943740b3facab421c6965226b5934aed16a514baacf47 SIZE (openresty-srcache-nginx-module-v0.32_GH0.tar.gz) = 49891 -SHA256 (kaltura-nginx-vod-module-1.29_GH0.tar.gz) = 775898874367900f14b6197366501c782e8c86dd2b0c3cc45973abf4e8a9217c -SIZE (kaltura-nginx-vod-module-1.29_GH0.tar.gz) = 469764 +SHA256 (kaltura-nginx-vod-module-1.30_GH0.tar.gz) = db1a7b31b4109eff32519f6624eaa54815db79f8e8b671bd24e5906ea5b3b905 +SIZE (kaltura-nginx-vod-module-1.30_GH0.tar.gz) = 470262 SHA256 (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 17ea41d4083f6d1ab1ab83dad9160eeca66867abe16c5a0421f85a39d7c84b65 SIZE (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 380327 SHA256 (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = aca454bffcee2476dc92682ebfb8c0378a271fda178be7e945d648419d220758 diff --git a/www/nginx-devel/files/extra-patch-nginx-vod-module-config b/www/nginx-devel/files/extra-patch-nginx-vod-module-config deleted file mode 100644 index 5de5f30201aa..000000000000 --- a/www/nginx-devel/files/extra-patch-nginx-vod-module-config +++ /dev/null @@ -1,17 +0,0 @@ ---- ../nginx-vod-module-1.29/config.orig 2018-04-24 17:51:34.654430000 -0400 -+++ ../nginx-vod-module-1.29/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 - |