4 files changed, 16 insertions, 14 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 3aa3af2fbd8a..5b34971b8c6c 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -685,10 +685,11 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-nginx-modsecurity-configure
 .endif
 
 .if ${PORT_OPTIONS:MNAXSI}
-NGINX_NAXSI_VERSION=	0.50
-MASTER_SITES+=	http://naxsi.googlecode.com/files/:naxsi
-DISTFILES+=	naxsi-core-${NGINX_NAXSI_VERSION}.tgz:naxsi
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-core-${NGINX_NAXSI_VERSION}/naxsi_src
+NGINX_NAXSI_VERSION=	0.54
+GH_ACCOUNT+=	nbs-system:naxsi
+GH_PROJECT+=	naxsi:naxsi
+GH_TAGNAME+=	${NGINX_NAXSI_VERSION}:naxsi
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_src
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_REWRITE} || defined(USE_HTTP_REWRITE)
@@ -1070,7 +1071,7 @@ do-install:
 
 .if ${PORT_OPTIONS:MNAXSI}
 	${INSTALL_DATA} \
-	${WRKDIR}/naxsi-core-${NGINX_NAXSI_VERSION}/naxsi_config/naxsi_core.rules \
+	${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_config/naxsi_core.rules \
 	${STAGEDIR}${ETCDIR}
 .endif
 
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 7581d2d70541..ec1cbd91859d 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -26,8 +26,6 @@ SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a11032
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
 SHA256 (modsecurity-2.9.0.tar.gz) = e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434
 SIZE (modsecurity-2.9.0.tar.gz) = 4246467
-SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef
-SIZE (naxsi-core-0.50.tgz) = 49809
 SHA256 (passenger-5.0.20.tar.gz) = a5b35780beb7ecd39d18375acab3e4fa1a2e104b7a324f41a1f89c99e7b8b04c
 SIZE (passenger-5.0.20.tar.gz) = 5307200
 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76
@@ -88,6 +86,8 @@ SHA256 (openresty-lua-nginx-module-v0.9.16_GH0.tar.gz) = a3cda55b8cba5bc6632aa27
 SIZE (openresty-lua-nginx-module-v0.9.16_GH0.tar.gz) = 523900
 SHA256 (openresty-memc-nginx-module-v0.15_GH0.tar.gz) = cd1999bc5e4441dd23d056202b0423c07b9a9294245147f4cf2ef6edb81b4122
 SIZE (openresty-memc-nginx-module-v0.15_GH0.tar.gz) = 37948
+SHA256 (nbs-system-naxsi-0.54_GH0.tar.gz) = 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5
+SIZE (nbs-system-naxsi-0.54_GH0.tar.gz) = 163809
 SHA256 (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0_GH0.tar.gz) = ed07cd5d0a1e7ac392854d8aa9243a69c5e33c92790ace90d3ce8694adce7460
 SIZE (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0_GH0.tar.gz) = 40724
 SHA256 (openresty-rds-csv-nginx-module-v0.05_GH0.tar.gz) = b1332b8925b366db1832949b9c12b869ac9cdf2dd63e9003b281f827f64807c1
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 92ec9458d506..bd28b27f2e18 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -671,10 +671,11 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-nginx-modsecurity-configure
 .endif
 
 .if ${PORT_OPTIONS:MNAXSI}
-NGINX_NAXSI_VERSION=	0.50
-MASTER_SITES+=	http://naxsi.googlecode.com/files/:naxsi
-DISTFILES+=	naxsi-core-${NGINX_NAXSI_VERSION}.tgz:naxsi
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-core-${NGINX_NAXSI_VERSION}/naxsi_src
+NGINX_NAXSI_VERSION=	0.54
+GH_ACCOUNT+=	nbs-system:naxsi
+GH_PROJECT+=	naxsi:naxsi
+GH_TAGNAME+=	${NGINX_NAXSI_VERSION}:naxsi
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_src
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_REWRITE} || defined(USE_HTTP_REWRITE)
@@ -1040,7 +1041,7 @@ do-install:
 
 .if ${PORT_OPTIONS:MNAXSI}
 	${INSTALL_DATA} \
-	${WRKDIR}/naxsi-core-${NGINX_NAXSI_VERSION}/naxsi_config/naxsi_core.rules \
+	${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_config/naxsi_core.rules \
 	${STAGEDIR}${ETCDIR}
 .endif
 
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 4d25d0bbcff9..a131e3e46d9b 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -26,8 +26,6 @@ SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a11032
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
 SHA256 (modsecurity-2.9.0.tar.gz) = e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434
 SIZE (modsecurity-2.9.0.tar.gz) = 4246467
-SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef
-SIZE (naxsi-core-0.50.tgz) = 49809
 SHA256 (passenger-5.0.20.tar.gz) = a5b35780beb7ecd39d18375acab3e4fa1a2e104b7a324f41a1f89c99e7b8b04c
 SIZE (passenger-5.0.20.tar.gz) = 5307200
 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76
@@ -86,6 +84,8 @@ SHA256 (openresty-lua-nginx-module-v0.9.16_GH0.tar.gz) = a3cda55b8cba5bc6632aa27
 SIZE (openresty-lua-nginx-module-v0.9.16_GH0.tar.gz) = 523900
 SHA256 (openresty-memc-nginx-module-v0.15_GH0.tar.gz) = cd1999bc5e4441dd23d056202b0423c07b9a9294245147f4cf2ef6edb81b4122
 SIZE (openresty-memc-nginx-module-v0.15_GH0.tar.gz) = 37948
+SHA256 (nbs-system-naxsi-0.54_GH0.tar.gz) = 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5
+SIZE (nbs-system-naxsi-0.54_GH0.tar.gz) = 163809
 SHA256 (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0_GH0.tar.gz) = ed07cd5d0a1e7ac392854d8aa9243a69c5e33c92790ace90d3ce8694adce7460
 SIZE (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0_GH0.tar.gz) = 40724
 SHA256 (openresty-rds-csv-nginx-module-v0.05_GH0.tar.gz) = b1332b8925b366db1832949b9c12b869ac9cdf2dd63e9003b281f827f64807c1