svn commit: r425846 - in head/www: nginx nginx-devel

[Sergey A. Osokin]

Author: osa
Date: Thu Nov 10 14:22:57 2016
New Revision: 425846
URL: https://svnweb.freebsd.org/changeset/ports/425846

Log:
  Add one more third-party module:  ngx_http_geoip2, v.2.0.
  
  PR:	210294

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/distinfo
  head/www/nginx/Makefile
  head/www/nginx/distinfo

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Thu Nov 10 11:55:23 2016	(r425845)
+++ head/www/nginx-devel/Makefile	Thu Nov 10 14:22:57 2016	(r425846)
@@ -78,6 +78,7 @@ OPTIONS_DEFINE=	\
 	HTTP_EVAL \
 	HTTP_FANCYINDEX \
 	HTTP_FOOTER \
+	HTTP_GEOIP2 \
 	HTTP_JSON_STATUS \
 	HTTP_MOGILEFS \
 	HTTP_MP4_H264 \
@@ -186,6 +187,7 @@ HTTP_DAV_EXT_DESC=		3rd party webdav_ext
 HTTP_EVAL_DESC=			3rd party eval module
 HTTP_FANCYINDEX_DESC=		3rd party http_fancyindex module
 HTTP_FOOTER_DESC=		3rd party http_footer module
+HTTP_GEOIP2_DESC=		3rd party geoip2 module
 HTTP_JSON_STATUS_DESC=		3rd party http_json_status module
 HTTP_MOGILEFS_DESC=		3rd party mogilefs module
 HTTP_MP4_H264_DESC=		3rd party mp4/h264 module
@@ -509,6 +511,20 @@ GH_TAGNAME+=	${NGINX_FOOTER_VERSION}:foo
 CONFIGURE_ARGS+=--add-module=${WRKSRC_footer}
 .endif
 
+.if ${PORT_OPTIONS:MHTTP_GEOIP2}
+# WWW: https://github.com/leev/ngx_http_geoip2_module
+NGINX_HTTP_GEOIP2_VERSION=	2.0
+GH_ACCOUNT+=	leev:geoip2
+GH_PROJECT+=	ngx_http_geoip2_module:geoip2
+GH_TAGNAME+=	${NGINX_HTTP_GEOIP2_VERSION}:geoip2
+.if !empty(PORT_OPTIONS:MDSO)
+CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_geoip2}
+.else
+CONFIGURE_ARGS+=--add-module=${WRKSRC_geoip2}
+.endif
+LIB_DEPENDS+=	libmaxminddb.so:net/libmaxminddb
+.endif
+
 .if ${PORT_OPTIONS:MHTTP_FLV}
 CONFIGURE_ARGS+=--with-http_flv_module
 .endif

Modified: head/www/nginx-devel/distinfo
==============================================================================
--- head/www/nginx-devel/distinfo	Thu Nov 10 11:55:23 2016	(r425845)
+++ head/www/nginx-devel/distinfo	Thu Nov 10 14:22:57 2016	(r425846)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1476391310
+TIMESTAMP = 1478786895
 SHA256 (nginx-1.11.5.tar.gz) = 223f8a2345a75f891098cf26ccdf208b293350388f51ce69083674c9432db6f6
 SIZE (nginx-1.11.5.tar.gz) = 956517
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
@@ -55,6 +55,8 @@ SHA256 (aperezdc-ngx-fancyindex-v0.3.6_G
 SIZE (aperezdc-ngx-fancyindex-v0.3.6_GH0.tar.gz) = 17252
 SHA256 (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3493b54460c59370f9f60c6e662862752f1920fc6e684f7a66bb2b3260692813
 SIZE (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3934
+SHA256 (leev-ngx_http_geoip2_module-2.0_GH0.tar.gz) = ebb4652c4f9a2e1ee31fddefc4c93ff78e651a4b2727d3453d026bccbd708d99
+SIZE (leev-ngx_http_geoip2_module-2.0_GH0.tar.gz) = 6766
 SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e712d28f4452ce3858ba05a38cc00703f14502095189c4a1063a36997
 SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736
 SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Thu Nov 10 11:55:23 2016	(r425845)
+++ head/www/nginx/Makefile	Thu Nov 10 14:22:57 2016	(r425846)
@@ -78,6 +78,7 @@ OPTIONS_DEFINE=	\
 	HTTP_EVAL \
 	HTTP_FANCYINDEX \
 	HTTP_FOOTER \
+	HTTP_GEOIP2 \
 	HTTP_JSON_STATUS \
 	HTTP_MOGILEFS \
 	HTTP_MP4_H264 \
@@ -186,6 +187,7 @@ HTTP_DAV_EXT_DESC=		3rd party webdav_ext
 HTTP_EVAL_DESC=			3rd party eval module
 HTTP_FANCYINDEX_DESC=		3rd party http_fancyindex module
 HTTP_FOOTER_DESC=		3rd party http_footer module
+HTTP_GEOIP2_DESC=		3rd party geoip2 module
 HTTP_JSON_STATUS_DESC=		3rd party http_json_status module
 HTTP_MOGILEFS_DESC=		3rd party mogilefs module
 HTTP_MP4_H264_DESC=		3rd party mp4/h264 module
@@ -507,6 +509,20 @@ GH_TAGNAME+=	${NGINX_FOOTER_VERSION}:foo
 CONFIGURE_ARGS+=--add-module=${WRKSRC_footer}
 .endif
 
+.if ${PORT_OPTIONS:MHTTP_GEOIP2}
+# WWW: https://github.com/leev/ngx_http_geoip2_module
+NGINX_HTTP_GEOIP2_VERSION=	2.0
+GH_ACCOUNT+=	leev:geoip2
+GH_PROJECT+=	ngx_http_geoip2_module:geoip2
+GH_TAGNAME+=	${NGINX_HTTP_GEOIP2_VERSION}:geoip2
+.if !empty(PORT_OPTIONS:MDSO)
+CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_geoip2}
+.else
+CONFIGURE_ARGS+=--add-module=${WRKSRC_geoip2}
+.endif
+LIB_DEPENDS+=	libmaxminddb.so:net/libmaxminddb
+.endif
+
 .if ${PORT_OPTIONS:MHTTP_FLV}
 CONFIGURE_ARGS+=--with-http_flv_module
 .endif

Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo	Thu Nov 10 11:55:23 2016	(r425845)
+++ head/www/nginx/distinfo	Thu Nov 10 14:22:57 2016	(r425846)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1476831245
+TIMESTAMP = 1478786895
 SHA256 (nginx-1.10.2.tar.gz) = 1045ac4987a396e2fa5d0011daf8987b612dd2f05181b67507da68cbe7d765c2
 SIZE (nginx-1.10.2.tar.gz) = 910812
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
@@ -55,6 +55,8 @@ SHA256 (aperezdc-ngx-fancyindex-v0.3.6_G
 SIZE (aperezdc-ngx-fancyindex-v0.3.6_GH0.tar.gz) = 17252
 SHA256 (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3493b54460c59370f9f60c6e662862752f1920fc6e684f7a66bb2b3260692813
 SIZE (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3934
+SHA256 (leev-ngx_http_geoip2_module-2.0_GH0.tar.gz) = ebb4652c4f9a2e1ee31fddefc4c93ff78e651a4b2727d3453d026bccbd708d99
+SIZE (leev-ngx_http_geoip2_module-2.0_GH0.tar.gz) = 6766
 SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e712d28f4452ce3858ba05a38cc00703f14502095189c4a1063a36997
 SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736
 SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885