From owner-svn-ports-all@freebsd.org Sat Jun 6 09:13:42 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 53F4D32CEF2; Sat, 6 Jun 2020 09:13:42 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49fDMp1Z3vz4NB6; Sat, 6 Jun 2020 09:13:42 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3114D1FE85; Sat, 6 Jun 2020 09:13:42 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0569Dg2x044042; Sat, 6 Jun 2020 09:13:42 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0569DfP5044036; Sat, 6 Jun 2020 09:13:41 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <202006060913.0569DfP5044036@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Sat, 6 Jun 2020 09:13:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538078 - in head/www/nginx: . files X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in head/www/nginx: . files X-SVN-Commit-Revision: 538078 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 09:13:42 -0000 Author: joneum Date: Sat Jun 6 09:13:40 2020 New Revision: 538078 URL: https://svnweb.freebsd.org/changeset/ports/538078 Log: Merge r532982 from www/nginx-devel: Convert another 3 third-party modules to dynamic: o) http_json_status o) http_mogilefs o) http_notice Sponsored by: Netzkommune GmbH Added: head/www/nginx/files/extra-patch-nginx-notice-config (contents, props changed) head/www/nginx/files/extra-patch-nginx_mogilefs_module-config (contents, props changed) head/www/nginx/files/extra-patch-ngx_http_json_status_module-config (contents, props changed) Modified: head/www/nginx/Makefile head/www/nginx/Makefile.extmod head/www/nginx/pkg-plist Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sat Jun 6 06:17:44 2020 (r538077) +++ head/www/nginx/Makefile Sat Jun 6 09:13:40 2020 (r538078) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION?= 10 +PORTREVISION?= 11 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Sat Jun 6 06:17:44 2020 (r538077) +++ head/www/nginx/Makefile.extmod Sat Jun 6 09:13:40 2020 (r538078) @@ -125,21 +125,25 @@ HTTP_IP2PROXY_LIB_DEPENDS= libIP2Proxy.so:net/ip2proxy HTTP_IP2PROXY_VARS= DSO_EXTMODS+=ip2proxy HTTP_JSON_STATUS_GH_TUPLE= nginx-modules:ngx_http_json_status_module:1d2f303:json_status -HTTP_JSON_STATUS_CONFIGURE_ON= --add-module=${WRKSRC_json_status} +HTTP_JSON_STATUS_VARS= DSO_EXTMODS+=json_status +HTTP_JSON_STATUS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_json_status_module-config HTTP_MOGILEFS_MASTER_SITES= http://www.grid.net.ru/nginx/download/:mogilefs HTTP_MOGILEFS_DISTFILES= nginx_mogilefs_module-1.0.4.tar.gz:mogilefs -HTTP_MOGILEFS_CONFIGURE_ON= --add-module=${WRKDIR}/nginx_mogilefs_module-1.0.4 -HTTP_MOGILEFS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_mogilefs_module.c +HTTP_MOGILEFS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_mogilefs_module.c \ + ${PATCHDIR}/extra-patch-nginx_mogilefs_module-config +HTTP_MOGILEFS_VARS= DSO_EXTDIRS+=nginx_mogilefs_module-1.0.4 + HTTP_MP4_H264_MASTER_SITES= http://h264.code-shop.com/download/:mp4streaming HTTP_MP4_H264_DISTFILES= nginx_mod_h264_streaming-2.2.7.tar.gz:mp4streaming HTTP_MP4_H264_CONFIGURE_ON= --add-module=${WRKDIR}/nginx_mod_h264_streaming-2.2.7 HTTP_MP4_H264_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_streaming_module.c HTTP_NOTICE_GH_TUPLE= kr:nginx-notice:3c95966:notice -HTTP_NOTICE_CONFIGURE_ON= --add-module=${WRKSRC_notice} -HTTP_NOTICE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_notice_module.c +HTTP_NOTICE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_notice_module.c \ + ${PATCHDIR}/extra-patch-nginx-notice-config +HTTP_NOTICE_VARS= DSO_EXTMODS+=notice HTTP_PUSH_GH_TUPLE= slact:nchan:v1.1.14:push HTTP_PUSH_VARS= DSO_EXTMODS+=push Added: head/www/nginx/files/extra-patch-nginx-notice-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-nginx-notice-config Sat Jun 6 09:13:40 2020 (r538078) @@ -0,0 +1,13 @@ +--- ../nginx-notice-3c95966/config.orig 2020-04-25 18:03:28.543102000 -0400 ++++ ../nginx-notice-3c95966/config 2020-04-25 18:04:14.387235000 -0400 +@@ -1,3 +1,8 @@ + ngx_addon_name=ngx_http_notice_module +-HTTP_MODULES="$HTTP_MODULES ngx_http_notice_module" +-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_notice_module.c" ++ ++ngx_module_name="$ngx_addon_name" ++ngx_module_type=HTTP ++ ++ngx_module_srcs="$ngx_addon_dir/ngx_http_notice_module.c" ++ ++. auto/module Added: head/www/nginx/files/extra-patch-nginx_mogilefs_module-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-nginx_mogilefs_module-config Sat Jun 6 09:13:40 2020 (r538078) @@ -0,0 +1,13 @@ +--- ../nginx_mogilefs_module-1.0.4/config.orig 2020-04-25 17:51:45.544308000 -0400 ++++ ../nginx_mogilefs_module-1.0.4/config 2020-04-25 17:54:01.862958000 -0400 +@@ -1,3 +1,8 @@ + ngx_addon_name=ngx_http_mogilefs_module +-HTTP_MODULES="$HTTP_MODULES ngx_http_mogilefs_module" +-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_mogilefs_module.c" ++ ++ngx_module_name="$ngx_addon_name" ++ngx_module_type=HTTP ++ ++ngx_module_srcs="$ngx_addon_dir/ngx_http_mogilefs_module.c" ++ ++. auto/module Added: head/www/nginx/files/extra-patch-ngx_http_json_status_module-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-ngx_http_json_status_module-config Sat Jun 6 09:13:40 2020 (r538078) @@ -0,0 +1,12 @@ +--- ../ngx_http_json_status_module-1d2f303/config.orig 2020-04-25 16:16:47.024292000 -0400 ++++ ../ngx_http_json_status_module-1d2f303/config 2020-04-25 16:18:39.461340000 -0400 +@@ -1,4 +1,6 @@ + ngx_addon_name=ngx_http_json_status_module +-HTTP_MODULES="$HTTP_MODULES ngx_http_json_status_module" +-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_json_status_module.c" +-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/ngx_http_json_status_module.h" ++ngx_module_name="$ngx_addon_name" ++ngx_module_type=HTTP ++ngx_module_srcs="$ngx_addon_dir/ngx_http_json_status_module.c" ++ngx_module_deps="$ngx_addon_dir/ngx_http_json_status_module.h" ++. auto/module Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Sat Jun 6 06:17:44 2020 (r538077) +++ head/www/nginx/pkg-plist Sat Jun 6 09:13:40 2020 (r538078) @@ -41,6 +41,9 @@ %%DSO%%%%HTTP_IMAGE_FILTER%%libexec/nginx/ngx_http_image_filter_module.so %%DSO%%%%HTTP_IP2LOCATION%%libexec/nginx/ngx_http_ip2location_module.so %%DSO%%%%HTTP_IP2PROXY%%libexec/nginx/ngx_http_ip2proxy_module.so +%%DSO%%%%HTTP_JSON_STATUS%%libexec/nginx/ngx_http_json_status_module.so +%%DSO%%%%HTTP_MOGILEFS%%libexec/nginx/ngx_http_mogilefs_module.so +%%DSO%%%%HTTP_NOTICE%%libexec/nginx/ngx_http_notice_module.so %%DSO%%%%HTTP_PERL%%libexec/nginx/ngx_http_perl_module.so %%DSO%%%%HTTP_PUSH%%libexec/nginx/ngx_nchan_module.so %%DSO%%%%HTTP_PUSH_STREAM%%libexec/nginx/ngx_http_push_stream_module.so