Updated Github third party modules and changed DISTFILES to point to github.com

instead of ftp.NetBSD.org.

* lua-nginx-module 0.9.5 updated to 0.9.16
* echo-nginx-module 0.51 updated to 0.58
* set-misc-nginx-module 0.24 updated to 0.29
* array-var-nginx-module 0.03 updated to 0.04
* encrypted-session-nginx-module 0.03 updated to 0.04
* form-input-nginx-module 0.07 updated to 0.11
* headers-more-nginx-module 0.25 updated to 0.26.1

Only minor revision changes, no features added. Modules don't have Changelog,
git history shows only cosmetic changes and bugfixes.

4 files changed, 72 insertions, 62 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 60f228e0bdc..edfd69be050 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2015/06/26 13:46:53 rodent Exp $
+# $NetBSD: Makefile,v 1.60 2015/09/30 13:36:00 imil Exp $
 
 DISTNAME=		nginx-1.8.0
+PKGREVISION=		1
 MAINTAINER=		joerg@NetBSD.org
 
 .include "../../www/nginx/Makefile.common"
diff --git a/www/nginx/Makefile.common b/www/nginx/Makefile.common
index ecaad8f8b6d..3b707790ce3 100644
--- a/www/nginx/Makefile.common
+++ b/www/nginx/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2014/06/20 18:48:37 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.6 2015/09/30 13:36:00 imil Exp $
 # used by www/nginx/Makefile
 # used by www/nginx-devel/Makefile
 
@@ -98,7 +98,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html
 	${INSTALL_MAN} ${WRKSRC}/man/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 .if !empty(PKG_OPTIONS:Mnaxsi)
-	${INSTALL_DATA} ${WRKDIR}/${NAXSI}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
+	${INSTALL_DATA} ${WRKDIR}/${NAXSI_DISTNAME}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
 .endif
 .if !empty(PKG_OPTIONS:Mperl)
 	${INSTALL_LIB_DIR} ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index bed66103dfe..9fb2d7e4eb1 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,23 +1,23 @@
-$NetBSD: distinfo,v 1.48 2015/09/29 13:48:33 imil Exp $
+$NetBSD: distinfo,v 1.49 2015/09/30 13:36:00 imil Exp $
 
-SHA1 (array-var-nginx-module-0.03.tar.gz) = b2666aa3c092060fcd3931a6d45798a5745c1ad6
-RMD160 (array-var-nginx-module-0.03.tar.gz) = 171c2d9bd02d7a7ede9f87ab348ef035cea14aec
-Size (array-var-nginx-module-0.03.tar.gz) = 9520 bytes
-SHA1 (echo-nginx-module-0.51.tar.gz) = 127d011f146a7e611f328cd4f2f29cdde1227f07
-RMD160 (echo-nginx-module-0.51.tar.gz) = 79bb11c34735381a5a90176eb4d07dec8b469ab4
-Size (echo-nginx-module-0.51.tar.gz) = 63460 bytes
-SHA1 (encrypted-session-nginx-module-0.03.tar.gz) = b33a74b83a200299fe80a2441b4cc014fab02a6a
-RMD160 (encrypted-session-nginx-module-0.03.tar.gz) = 89cab2054f95e1017c109238d399afe23ce499e6
-Size (encrypted-session-nginx-module-0.03.tar.gz) = 8949 bytes
-SHA1 (form-input-nginx-module-0.07.tar.gz) = 4f68ad4b6b19f313582523585aee4e4473666ea3
-RMD160 (form-input-nginx-module-0.07.tar.gz) = 1d543c15c1ced82497987b7fd71d79d7c818b9bf
-Size (form-input-nginx-module-0.07.tar.gz) = 10563 bytes
-SHA1 (headers-more-nginx-module-0.25.tar.gz) = 514bc3df30b24eb0a06533f1ebaa579b898990f5
-RMD160 (headers-more-nginx-module-0.25.tar.gz) = 8270edae05b2cf24f1d46fb1b217d4943bf56372
-Size (headers-more-nginx-module-0.25.tar.gz) = 27973 bytes
-SHA1 (lua-nginx-module-0.9.5.tar.gz) = c9c752461f407ccae40870d4cabfbf2bd8c81bac
-RMD160 (lua-nginx-module-0.9.5.tar.gz) = 180331a69680278bac26f0a9ccd0de52fd88a7ea
-Size (lua-nginx-module-0.9.5.tar.gz) = 476124 bytes
+SHA1 (array-var-nginx-module-0.04.tar.gz) = 1fd3bdd05c2d1d7667ed6f7baa612ddf7f630df3
+RMD160 (array-var-nginx-module-0.04.tar.gz) = a751a2ce87dcfb88d072779097b4df9f42a415e4
+Size (array-var-nginx-module-0.04.tar.gz) = 10777 bytes
+SHA1 (echo-nginx-module-0.58.tar.gz) = 823fb32be19bde5eb07cb4e3aae8d8f4bb46e1a4
+RMD160 (echo-nginx-module-0.58.tar.gz) = 36d8aa8cd01ef492b119a322932c5b5841df4e35
+Size (echo-nginx-module-0.58.tar.gz) = 64779 bytes
+SHA1 (encrypted-session-nginx-module-0.04.tar.gz) = 59b4b52b1090ad396ea7402a9f047d4609e5e6fe
+RMD160 (encrypted-session-nginx-module-0.04.tar.gz) = f1f2b2b3cddd438010958371384256b071ff8f43
+Size (encrypted-session-nginx-module-0.04.tar.gz) = 10006 bytes
+SHA1 (form-input-nginx-module-0.11.tar.gz) = fcb2fe7a4229e9e36151bdf3cfae2dd72435adb9
+RMD160 (form-input-nginx-module-0.11.tar.gz) = 74da6550482c7a2b0c6f9fdc31b55be658e65bc8
+Size (form-input-nginx-module-0.11.tar.gz) = 10699 bytes
+SHA1 (headers-more-nginx-module-0.261.tar.gz) = e17f85b4e21633919a789d34aee8518d54147f1e
+RMD160 (headers-more-nginx-module-0.261.tar.gz) = d71f5b201712e10b937ec6f4f1ccad47052d0582
+Size (headers-more-nginx-module-0.261.tar.gz) = 28022 bytes
+SHA1 (lua-nginx-module-0.9.16.tar.gz) = 5c1e147c6f680bf43899650a37c81a1f67b65b0d
+RMD160 (lua-nginx-module-0.9.16.tar.gz) = 6d72a6f7ba1742ed477a0f146d44fd1c48d19bb3
+Size (lua-nginx-module-0.9.16.tar.gz) = 523900 bytes
 SHA1 (naxsi-0.54.tar.gz) = d5db25db19a564358af7763d4935e978d05bf6f5
 RMD160 (naxsi-0.54.tar.gz) = 094b09c198cf690ec24b3e9d3763647e06ebee64
 Size (naxsi-0.54.tar.gz) = 163809 bytes
@@ -30,8 +30,8 @@ Size (nginx_http_push_module-0.692.tar.gz) = 29119 bytes
 SHA1 (ngx_devel_kit-0.2.19.tar.gz) = 888635e80a8a0e6242b8e9b684ff60ffa70845a2
 RMD160 (ngx_devel_kit-0.2.19.tar.gz) = 64d3737bc4cc948c1363cce80d70e5260878811e
 Size (ngx_devel_kit-0.2.19.tar.gz) = 65029 bytes
-SHA1 (set-misc-nginx-module-0.24.tar.gz) = da404a7dac5fa4a0a86f42b4ec7648b607f4cd66
-RMD160 (set-misc-nginx-module-0.24.tar.gz) = 07d0bb8f2a0840534a82a2d18394163342393cef
-Size (set-misc-nginx-module-0.24.tar.gz) = 40397 bytes
+SHA1 (set-misc-nginx-module-0.29.tar.gz) = 83c9ae27f3ea148023edc5c7611d6a0a48405082
+RMD160 (set-misc-nginx-module-0.29.tar.gz) = c6b403fa9f422bf666d079b84dc2f3ce9ae740f3
+Size (set-misc-nginx-module-0.29.tar.gz) = 35495 bytes
 SHA1 (patch-aa) = 47f0c19b47b115f00ea6e9432d5bb12058c3bc1c
 SHA1 (patch-ab) = 0925a163db1ec36142fc3c32545f0abc1c5545c8
diff --git a/www/nginx/options.mk b/www/nginx/options.mk
index 2a5175a9352..d2031da6eee 100644
--- a/www/nginx/options.mk
+++ b/www/nginx/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.33 2015/09/29 13:48:33 imil Exp $
+# $NetBSD: options.mk,v 1.34 2015/09/30 13:36:00 imil Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS=	dav flv gtools inet6 luajit mail-proxy memcache naxsi \
@@ -22,7 +22,7 @@ PLIST_VARS+=		naxsi perl uwsgi
 # documentation says naxsi must be the first module
 .if !empty(PKG_OPTIONS:Mnaxsi)
 PLIST.naxsi=		yes
-CONFIGURE_ARGS+=	--add-module=../${NAXSI}/naxsi_src
+CONFIGURE_ARGS+=	--add-module=../${NAXSI_DISTNAME}/naxsi_src
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
@@ -76,9 +76,10 @@ CONFIGURE_ARGS+=	--without-http_memcached_module
 .endif
 
 .if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum)
-NAXSI=				naxsi-0.54
-NAXSI_DISTFILE=			${NAXSI}.tar.gz
-SITES.${NAXSI_DISTFILE}=	http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+NAXSI_VERSION=			0.54
+NAXSI_DISTNAME=			naxsi-${NAXSI_VERSION}
+NAXSI_DISTFILE=			${NAXSI_DISTNAME}.tar.gz
+SITES.${NAXSI_DISTFILE}=	-https://github.com/nbs-system/naxsi/archive/${NAXSI_VERSION}.tar.gz
 DISTFILES+=			${NAXSI_DISTFILE}
 .endif
 
@@ -93,14 +94,15 @@ CONFIGURE_ARGS+=	--with-ipv6
 # NDK must be added once and before 3rd party modules needing it
 .for _ngx_mod in luajit set-misc array-var form-input encrypted-session
 .	if !defined(NEED_NDK) && !empty(PKG_OPTIONS:M${_ngx_mod}:O)
-CONFIGURE_ARGS+=	--add-module=../${NDK}
+CONFIGURE_ARGS+=	--add-module=../${NDK_DISTNAME}
 NEED_NDK=		yes
 .	endif
 .endfor
 .if defined(NEED_NDK) || make(makesum)
-NDK=			ngx_devel_kit-0.2.19
-NDK_DISTFILE=		${NDK}.tar.gz
-SITES.${NDK_DISTFILE}=	http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+NDK_VERSION=		0.2.19
+NDK_DISTNAME=		ngx_devel_kit-${NDK_VERSION}
+NDK_DISTFILE=		${NDK_DISTNAME}.tar.gz
+SITES.${NDK_DISTFILE}=	-https://github.com/simpl/ngx_devel_kit/archive/v${NDK_VERSION}.tar.gz
 DISTFILES+=		${NDK_DISTFILE}
 .endif
 
@@ -108,72 +110,79 @@ DISTFILES+=		${NDK_DISTFILE}
 .include "../../lang/LuaJIT2/buildlink3.mk"
 CONFIGURE_ENV+=		LUAJIT_LIB=${PREFIX}/lib
 CONFIGURE_ENV+=		LUAJIT_INC=${PREFIX}/include/luajit-2.0
-CONFIGURE_ARGS+=	--add-module=../${LUA}
+CONFIGURE_ARGS+=	--add-module=../${LUA_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mluajit) || make(makesum)
-LUA=			lua-nginx-module-0.9.5
-LUA_DISTFILE=		${LUA}.tar.gz
-SITES.${LUA_DISTFILE}=	http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+LUA_VERSION=		0.9.16
+LUA_DISTNAME=		lua-nginx-module-${LUA_VERSION}
+LUA_DISTFILE=		${LUA_DISTNAME}.tar.gz
+SITES.${LUA_DISTFILE}=	-https://github.com/openresty/lua-nginx-module/archive/v${LUA_VERSION}.tar.gz
 DISTFILES+=		${LUA_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mecho)
-CONFIGURE_ARGS+=	--add-module=../${ECHOMOD}
+CONFIGURE_ARGS+=	--add-module=../${ECHOMOD_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mecho) || make(makesum)
-ECHOMOD=		echo-nginx-module-0.51
-ECHOMOD_DISTFILE=	${ECHOMOD}.tar.gz
-SITES.${ECHOMOD_DISTFILE}=	http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+ECHOMOD_VERSION=	0.58
+ECHOMOD_DISTNAME=	echo-nginx-module-${ECHOMOD_VERSION}
+ECHOMOD_DISTFILE=	${ECHOMOD_DISTNAME}.tar.gz
+SITES.${ECHOMOD_DISTFILE}=	-https://github.com/openresty/echo-nginx-module/archive/v${ECHOMOD_VERSION}.tar.gz
 DISTFILES+=		${ECHOMOD_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mset-misc)
-CONFIGURE_ARGS+=	--add-module=../${SETMISC}
+CONFIGURE_ARGS+=	--add-module=../${SETMISC_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mset-misc) || make(makesum)
-SETMISC=		set-misc-nginx-module-0.24
-SETMISC_DISTFILE=	${SETMISC}.tar.gz
-SITES.${SETMISC_DISTFILE}=	http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+SETMISC_VERSION=	0.29
+SETMISC_DISTNAME=	set-misc-nginx-module-${SETMISC_VERSION}
+SETMISC_DISTFILE=	${SETMISC_DISTNAME}.tar.gz
+SITES.${SETMISC_DISTFILE}=	-https://github.com/openresty/set-misc-nginx-module/archive/v${SETMISC_VERSION}.tar.gz
 DISTFILES+=		${SETMISC_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Marray-var)
-CONFIGURE_ARGS+=	--add-module=../${ARRAYVAR}
+CONFIGURE_ARGS+=	--add-module=../${ARRAYVAR_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Marray-var) || make(makesum)
-ARRAYVAR=		array-var-nginx-module-0.03
-ARRAYVAR_DISTFILE=	${ARRAYVAR}.tar.gz
-SITES.${ARRAYVAR_DISTFILE}=	http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+ARRAYVAR_VERSION=	0.04
+ARRAYVAR_DISTNAME=	array-var-nginx-module-${ARRAYVAR_VERSION}
+ARRAYVAR_DISTFILE=	${ARRAYVAR_DISTNAME}.tar.gz
+SITES.${ARRAYVAR_DISTFILE}=	-https://github.com/openresty/array-var-nginx-module/archive/v${ARRAYVAR_VERSION}.tar.gz
 DISTFILES+=		${ARRAYVAR_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mencrypted-session)
-CONFIGURE_ARGS+=	--add-module=../${ENCSESS}
+CONFIGURE_ARGS+=	--add-module=../${ENCSESS_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mencrypted-session) || make(makesum)
-ENCSESS=		encrypted-session-nginx-module-0.03
-ENCSESS_DISTFILE=	${ENCSESS}.tar.gz
-SITES.${ENCSESS_DISTFILE}=	http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+ENCSESS_VERSION=	0.04
+ENCSESS_DISTNAME=	encrypted-session-nginx-module-${ENCSESS_VERSION}
+ENCSESS_DISTFILE=	${ENCSESS_DISTNAME}.tar.gz
+SITES.${ENCSESS_DISTFILE}=	-https://github.com/openresty/encrypted-session-nginx-module/archive/v${ENCSESS_VERSION}.tar.gz
 DISTFILES+=		${ENCSESS_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mform-input)
-CONFIGURE_ARGS+=	--add-module=../${FORMINPUT}
+CONFIGURE_ARGS+=	--add-module=../${FORMINPUT_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mform-input) || make(makesum)
-FORMINPUT=		form-input-nginx-module-0.07
-FORMINPUT_DISTFILE=	${FORMINPUT}.tar.gz
-SITES.${FORMINPUT_DISTFILE}=	http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+FORMINPUT_VERSION=	0.11
+FORMINPUT_DISTNAME=	form-input-nginx-module-${FORMINPUT_VERSION}
+FORMINPUT_DISTFILE=	${FORMINPUT_DISTNAME}.tar.gz
+SITES.${FORMINPUT_DISTFILE}=	-https://github.com/calio/form-input-nginx-module/archive/v${FORMINPUT_VERSION}.tar.gz
 DISTFILES+=		${FORMINPUT_DISTFILE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mheaders-more)
-CONFIGURE_ARGS+=	--add-module=../${HEADMORE}
+CONFIGURE_ARGS+=	--add-module=../${HEADMORE_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mheaders-more) || make(makesum)
-HEADMORE=		headers-more-nginx-module-0.25
-HEADMORE_DISTFILE=	${HEADMORE}.tar.gz
-SITES.${HEADMORE_DISTFILE}=	http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+HEADMORE_VERSION=	0.261
+HEADMORE_DISTNAME=	headers-more-nginx-module-${HEADMORE_VERSION}
+HEADMORE_DISTFILE=	${HEADMORE_DISTNAME}.tar.gz
+SITES.${HEADMORE_DISTFILE}=	-https://github.com/openresty/headers-more-nginx-module/archive/v${HEADMORE_VERSION}.tar.gz
 DISTFILES+=		${HEADMORE_DISTFILE}
 .endif