CVS commit: pkgsrc/www/nginx

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Mar 10 08:20:31 UTC 2020

Modified Files:
        pkgsrc/www/nginx: options.mk

Log Message:
nginx: added geoip option; behave correctly with "make mdi"


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/www/nginx/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.54 pkgsrc/www/nginx/options.mk:1.55
--- pkgsrc/www/nginx/options.mk:1.54    Thu Feb 20 23:34:38 2020
+++ pkgsrc/www/nginx/options.mk Tue Mar 10 08:20:31 2020
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.54 2020/02/20 23:34:38 abs Exp $
+# $NetBSD: options.mk,v 1.55 2020/03/10 08:20:31 adam Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS=         dav flv gtools inet6 luajit mail-proxy memcache naxsi \
-                               pcre push realip ssl sub uwsgi image-filter \
+                               geoip pcre push realip ssl sub uwsgi image-filter \
                                debug slice status nginx-autodetect-cflags echo \
                                set-misc headers-more array-var encrypted-session \
                                form-input perl gzip http2 auth-request secure-link rtmp \
@@ -20,7 +20,7 @@ PLIST_VARS+=          naxsi perl uwsgi
 PLIST.naxsi=                   yes
 CONFIGURE_ARGS+=               --add-module=../${NAXSI_DISTNAME}/naxsi_src
 .endif
-.if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum)
+.if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum) || make(mdi)
 NAXSI_VERSION=                 0.56
 NAXSI_DISTNAME=                        naxsi-${NAXSI_VERSION}
 NAXSI_DISTFILE=                        ${NAXSI_DISTNAME}.tar.gz
@@ -54,6 +54,11 @@ CONFIGURE_ARGS+=     --with-http_dav_module
 CONFIGURE_ARGS+=       --with-http_flv_module
 .endif
 
+.if !empty(PKG_OPTIONS:Mgeoip)
+.include "../../net/GeoIP/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-http_geoip_module
+.endif
+
 .if !empty(PKG_OPTIONS:Mhttp2)
 CONFIGURE_ARGS+=       --with-http_v2_module
 .endif
@@ -86,7 +91,7 @@ CONFIGURE_ARGS+=      --add-module=../${NDK_D
 NEED_NDK=              yes
 .  endif
 .endfor
-.if defined(NEED_NDK) || make(makesum)
+.if defined(NEED_NDK) || make(makesum) || make(mdi)
 NDK_VERSION=           0.3.1
 NDK_DISTNAME=          ngx_devel_kit-${NDK_VERSION}
 NDK_DISTFILE=          ${NDK_DISTNAME}.tar.gz
@@ -100,7 +105,7 @@ CONFIGURE_ENV+=             LUAJIT_LIB=${PREFIX}/li
 CONFIGURE_ENV+=                LUAJIT_INC=${PREFIX}/include/luajit-2.0
 CONFIGURE_ARGS+=       --add-module=../${LUA_DISTNAME}
 .endif
-.if !empty(PKG_OPTIONS:Mluajit) || make(makesum)
+.if !empty(PKG_OPTIONS:Mluajit) || make(makesum) || make(mdi)
 LUA_VERSION=           0.10.15
 LUA_DISTNAME=          lua-nginx-module-${LUA_VERSION}
 LUA_DISTFILE=          ${LUA_DISTNAME}.tar.gz
@@ -111,7 +116,7 @@ DISTFILES+=         ${LUA_DISTFILE}
 .if !empty(PKG_OPTIONS:Mecho)
 CONFIGURE_ARGS+=               --add-module=../${ECHOMOD_DISTNAME}
 .endif
-.if !empty(PKG_OPTIONS:Mecho) || make(makesum)
+.if !empty(PKG_OPTIONS:Mecho) || make(makesum) || make(mdi)
 ECHOMOD_VERSION=               0.61
 ECHOMOD_DISTNAME=              echo-nginx-module-${ECHOMOD_VERSION}
 ECHOMOD_DISTFILE=              ${ECHOMOD_DISTNAME}.tar.gz
@@ -122,7 +127,7 @@ DISTFILES+=                 ${ECHOMOD_DISTFILE}
 .if !empty(PKG_OPTIONS:Mset-misc)
 CONFIGURE_ARGS+=               --add-module=../${SETMISC_DISTNAME}
 .endif
-.if !empty(PKG_OPTIONS:Mset-misc) || make(makesum)
+.if !empty(PKG_OPTIONS:Mset-misc) || make(makesum) || make(mdi)
 SETMISC_VERSION=               0.32
 SETMISC_DISTNAME=              set-misc-nginx-module-${SETMISC_VERSION}
 SETMISC_DISTFILE=              ${SETMISC_DISTNAME}.tar.gz
@@ -133,7 +138,7 @@ DISTFILES+=                 ${SETMISC_DISTFILE}
 .if !empty(PKG_OPTIONS:Marray-var)
 CONFIGURE_ARGS+=               --add-module=../${ARRAYVAR_DISTNAME}
 .endif
-.if !empty(PKG_OPTIONS:Marray-var) || make(makesum)
+.if !empty(PKG_OPTIONS:Marray-var) || make(makesum) || make(mdi)
 ARRAYVAR_VERSION=              0.05
 ARRAYVAR_DISTNAME=             array-var-nginx-module-${ARRAYVAR_VERSION}
 ARRAYVAR_DISTFILE=             ${ARRAYVAR_DISTNAME}.tar.gz
@@ -144,7 +149,7 @@ DISTFILES+=                 ${ARRAYVAR_DISTFILE}
 .if !empty(PKG_OPTIONS:Mencrypted-session)
 CONFIGURE_ARGS+=               --add-module=../${ENCSESS_DISTNAME}
 .endif
-.if !empty(PKG_OPTIONS:Mencrypted-session) || make(makesum)
+.if !empty(PKG_OPTIONS:Mencrypted-session) || make(makesum) || make(mdi)
 ENCSESS_VERSION=               0.08
 ENCSESS_DISTNAME=              encrypted-session-nginx-module-${ENCSESS_VERSION}
 ENCSESS_DISTFILE=              ${ENCSESS_DISTNAME}.tar.gz
@@ -155,7 +160,7 @@ DISTFILES+=                 ${ENCSESS_DISTFILE}
 .if !empty(PKG_OPTIONS:Mform-input)
 CONFIGURE_ARGS+=               --add-module=../${FORMINPUT_DISTNAME}
 .endif
-.if !empty(PKG_OPTIONS:Mform-input) || make(makesum)
+.if !empty(PKG_OPTIONS:Mform-input) || make(makesum) || make(mdi)
 FORMINPUT_VERSION=             0.12
 FORMINPUT_DISTNAME=            form-input-nginx-module-${FORMINPUT_VERSION}
 FORMINPUT_DISTFILE=            ${FORMINPUT_DISTNAME}.tar.gz
@@ -166,7 +171,7 @@ DISTFILES+=                 ${FORMINPUT_DISTFILE}
 .if !empty(PKG_OPTIONS:Mheaders-more)
 CONFIGURE_ARGS+=               --add-module=../${HEADMORE_DISTNAME}
 .endif
-.if !empty(PKG_OPTIONS:Mheaders-more) || make(makesum)
+.if !empty(PKG_OPTIONS:Mheaders-more) || make(makesum) || make(mdi)
 HEADMORE_VERSION=              0.33
 HEADMORE_DISTNAME=             headers-more-nginx-module-${HEADMORE_VERSION}
 HEADMORE_DISTFILE=             ${HEADMORE_DISTNAME}.tar.gz
@@ -185,7 +190,7 @@ CONFIGURE_ARGS+=    --without-http_uwsgi_mo
 .if !empty(PKG_OPTIONS:Mpush)
 CONFIGURE_ARGS+=       --add-module=../nchan-${PUSH_VERSION}
 .endif
-.if !empty(PKG_OPTIONS:Mpush) || make(makesum)
+.if !empty(PKG_OPTIONS:Mpush) || make(makesum) || make(mdi)
 PUSH_VERSION=          1.2.6
 PUSH_DISTNAME=         nginx_http_push_module-${PUSH_VERSION}
 PUSH_DISTFILE=         ${PUSH_DISTNAME}.tar.gz
@@ -234,7 +239,7 @@ CONFIGURE_ARGS+=    --with-stream --with-st
 .if !empty(PKG_OPTIONS:Mrtmp)
 CONFIGURE_ARGS+=       --add-module=../${RTMP_DISTNAME}
 .endif
-.if !empty(PKG_OPTIONS:Mrtmp) || make(makesum)
+.if !empty(PKG_OPTIONS:Mrtmp) || make(makesum) || make(mdi)
 RTMP_VERSION=          1.2.1
 RTMP_DISTNAME=         nginx-rtmp-module-${RTMP_VERSION}
 RTMP_DISTFILE=         ${RTMP_DISTNAME}.tar.gz