nginx: refactor Makefile

Make modules follow a naming convention, which enables:

1. Inline ADDITIONAL_MODULES into CONFIGURE_ARGS
2. Consolidate some parts of Quilt and Download for each module into
BuildModule

Signed-off-by: Glen Huang <me@glenhuang.com>
[ fix conflict error ]
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

3 files changed, 30 insertions, 30 deletions

diff --git a/net/nginx/patches/dav-nginx/100-drop-libxslt-dep.patch b/net/nginx/patches/nginx-mod-dav-ext/100-drop-libxslt-dep.patch
index aa06f0464..689898d2f 100644
--- a/net/nginx/patches/dav-nginx/100-drop-libxslt-dep.patch
+++ b/net/nginx/patches/nginx-mod-dav-ext/100-drop-libxslt-dep.patch
@@ -1,5 +1,5 @@
---- a/nginx-dav-ext-module/config
-+++ b/nginx-dav-ext-module/config
+--- a/nginx-mod-dav-ext/config
++++ b/nginx-mod-dav-ext/config
 @@ -8,9 +8,8 @@ ngx_module_name=ngx_http_dav_ext_module
  # building nginx with the xslt module, in which case libxslt will
  # be linked anyway.  In other cases libxslt is just redundant.
diff --git a/net/nginx/patches/lua-nginx/100-no_by_lua_block.patch b/net/nginx/patches/nginx-mod-lua/100-no_by_lua_block.patch
index 1b4d1fef1..b51c5e404 100644
--- a/net/nginx/patches/lua-nginx/100-no_by_lua_block.patch
+++ b/net/nginx/patches/nginx-mod-lua/100-no_by_lua_block.patch
@@ -1,5 +1,5 @@
---- a/lua-nginx/src/ngx_http_lua_module.c
-+++ b/lua-nginx/src/ngx_http_lua_module.c
+--- a/nginx-mod-lua/src/ngx_http_lua_module.c
++++ b/nginx-mod-lua/src/ngx_http_lua_module.c
 @@ -207,12 +207,14 @@ static ngx_command_t ngx_http_lua_cmds[]
        offsetof(ngx_http_lua_loc_conf_t, log_socket_errors),
        NULL },
diff --git a/net/nginx/patches/rtmp-nginx/100-bigedian.patch b/net/nginx/patches/nginx-mod-rtmp/100-bigedian.patch
index c0a07bc7c..b7b78fc92 100644
--- a/net/nginx/patches/rtmp-nginx/100-bigedian.patch
+++ b/net/nginx/patches/nginx-mod-rtmp/100-bigedian.patch
@@ -12,8 +12,8 @@ Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
  ngx_rtmp_handler.c    | 108 +++++++++++++++++++++---------------------
  5 files changed, 68 insertions(+), 64 deletions(-)
 
---- a/nginx-rtmp/ngx_rtmp.c
-+++ b/nginx-rtmp/ngx_rtmp.c
+--- a/nginx-mod-rtmp/ngx_rtmp.c
++++ b/nginx-mod-rtmp/ngx_rtmp.c
 @@ -825,22 +825,6 @@ ngx_rtmp_fire_event(ngx_rtmp_session_t *
  }
  
@@ -37,8 +37,8 @@ Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
  static ngx_int_t
  ngx_rtmp_init_process(ngx_cycle_t *cycle)
  {
---- a/nginx-rtmp/ngx_rtmp.h
-+++ b/nginx-rtmp/ngx_rtmp.h
+--- a/nginx-mod-rtmp/ngx_rtmp.h
++++ b/nginx-mod-rtmp/ngx_rtmp.h
 @@ -417,34 +417,33 @@ ngx_int_t ngx_rtmp_fire_event(ngx_rtmp_s
  ngx_int_t ngx_rtmp_set_chunk_size(ngx_rtmp_session_t *s, ngx_uint_t size);
  
@@ -92,8 +92,8 @@ Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
  
  /* Receiving messages */
  ngx_int_t ngx_rtmp_receive_message(ngx_rtmp_session_t *s,
---- a/nginx-rtmp/ngx_rtmp_amf.c
-+++ b/nginx-rtmp/ngx_rtmp_amf.c
+--- a/nginx-mod-rtmp/ngx_rtmp_amf.c
++++ b/nginx-mod-rtmp/ngx_rtmp_amf.c
 @@ -10,23 +10,6 @@
  #include "ngx_rtmp.h"
  #include <string.h>
@@ -244,8 +244,8 @@ Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
                  {
                      return NGX_ERROR;
                  }
---- a/nginx-rtmp/ngx_rtmp_flv_module.c
-+++ b/nginx-rtmp/ngx_rtmp_flv_module.c
+--- a/nginx-mod-rtmp/ngx_rtmp_flv_module.c
++++ b/nginx-mod-rtmp/ngx_rtmp_flv_module.c
 @@ -102,7 +102,7 @@ ngx_rtmp_flv_fill_index(ngx_rtmp_amf_ctx
          return NGX_ERROR;
      }
@@ -294,8 +294,8 @@ Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
  
      ctx->offset += (sizeof(ngx_rtmp_flv_header) + size + 4);
  
---- a/nginx-rtmp/ngx_rtmp_handler.c
-+++ b/nginx-rtmp/ngx_rtmp_handler.c
+--- a/nginx-mod-rtmp/ngx_rtmp_handler.c
++++ b/nginx-mod-rtmp/ngx_rtmp_handler.c
 @@ -200,7 +200,7 @@ ngx_rtmp_recv(ngx_event_t *rev)
      ngx_rtmp_stream_t          *st, *st0;
      ngx_chain_t                *in, *head;
@@ -470,8 +470,8 @@ Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
  
          /* This CONTRADICTS the standard
           * but that's the way flash client
---- a/nginx-rtmp/ngx_rtmp_send.c
-+++ b/nginx-rtmp/ngx_rtmp_send.c
+--- a/nginx-mod-rtmp/ngx_rtmp_send.c
++++ b/nginx-mod-rtmp/ngx_rtmp_send.c
 @@ -33,13 +33,13 @@
      *(__b->last++) = (u_char)(utype);
  
@@ -491,8 +491,8 @@ Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
  
  #define NGX_RTMP_USER_END(s)                                                \
      ngx_rtmp_prepare_message(s, &__h, NULL, __l);                           \
---- a/nginx-rtmp/hls/ngx_rtmp_hls_module.c
-+++ b/nginx-rtmp/hls/ngx_rtmp_hls_module.c
+--- a/nginx-mod-rtmp/hls/ngx_rtmp_hls_module.c
++++ b/nginx-mod-rtmp/hls/ngx_rtmp_hls_module.c
 @@ -296,7 +296,7 @@ static ngx_command_t ngx_rtmp_hls_comman
        ngx_conf_set_enum_slot,
        NGX_RTMP_APP_CONF_OFFSET,
@@ -534,8 +534,8 @@ Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
  
          if (len == 0) {
              continue;
---- a/nginx-rtmp/ngx_rtmp_bitop.h
-+++ b/nginx-rtmp/ngx_rtmp_bitop.h
+--- a/nginx-mod-rtmp/ngx_rtmp_bitop.h
++++ b/nginx-mod-rtmp/ngx_rtmp_bitop.h
 @@ -40,7 +40,7 @@ uint64_t ngx_rtmp_bit_read_golomb(ngx_rt
      ((uint32_t) ngx_rtmp_bit_read(br, 32))
  
@@ -545,8 +545,8 @@ Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
  
  
  #endif /* _NGX_RTMP_BITOP_H_INCLUDED_ */
---- a/nginx-rtmp/ngx_rtmp_eval.c
-+++ b/nginx-rtmp/ngx_rtmp_eval.c
+--- a/nginx-mod-rtmp/ngx_rtmp_eval.c
++++ b/nginx-mod-rtmp/ngx_rtmp_eval.c
 @@ -166,7 +166,7 @@ ngx_rtmp_eval(void *ctx, ngx_str_t *in,
                          state = ESCAPE;
                          continue;
@@ -556,8 +556,8 @@ Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
              case ESCAPE:
                  ngx_rtmp_eval_append(&b, &c, 1, log);
                  state = NORMAL;
---- a/nginx-rtmp/ngx_rtmp_handshake.c
-+++ b/nginx-rtmp/ngx_rtmp_handshake.c
+--- a/nginx-mod-rtmp/ngx_rtmp_handshake.c
++++ b/nginx-mod-rtmp/ngx_rtmp_handshake.c
 @@ -264,7 +264,8 @@ ngx_rtmp_handshake_create_challenge(ngx_
      b = s->hs_buf;
      b->last = b->pos = b->start;
@@ -578,8 +578,8 @@ Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
  
      p = b->pos + 4;
      ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
---- a/nginx-rtmp/ngx_rtmp_mp4_module.c
-+++ b/nginx-rtmp/ngx_rtmp_mp4_module.c
+--- a/nginx-mod-rtmp/ngx_rtmp_mp4_module.c
++++ b/nginx-mod-rtmp/ngx_rtmp_mp4_module.c
 @@ -528,9 +528,9 @@ ngx_rtmp_mp4_parse_mdhd(ngx_rtmp_session
              }
  
@@ -1330,8 +1330,8 @@ Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
              shift += sizeof(extended_size);
  
          } else if (size == 0) {
---- a/nginx-rtmp/ngx_rtmp_receive.c
-+++ b/nginx-rtmp/ngx_rtmp_receive.c
+--- a/nginx-mod-rtmp/ngx_rtmp_receive.c
++++ b/nginx-mod-rtmp/ngx_rtmp_receive.c
 @@ -17,7 +17,6 @@ ngx_rtmp_protocol_message_handler(ngx_rt
          ngx_rtmp_header_t *h, ngx_chain_t *in)
  {
@@ -1424,8 +1424,8 @@ Subject: [PATCH 1/3] arut's e0e278bc7fedd6f7465648d1d20df1a8422d60bf [removed
      return NGX_OK;
  }
  
---- a/nginx-rtmp/ngx_rtmp_record_module.c
-+++ b/nginx-rtmp/ngx_rtmp_record_module.c
+--- a/nginx-mod-rtmp/ngx_rtmp_record_module.c
++++ b/nginx-mod-rtmp/ngx_rtmp_record_module.c
 @@ -454,7 +454,7 @@ ngx_rtmp_record_node_open(ngx_rtmp_sessi
      ngx_err_t                   err;
      ngx_str_t                   path;