Convert nginx, nginx-devel and tengine to USE_GITHUB.

Sponsored by: Absolight
author: Mathieu Arnold <mat@FreeBSD.org> 2015-05-29 14:01:14 +0000
committer: Mathieu Arnold <mat@FreeBSD.org> 2015-05-29 14:01:14 +0000
commit: 081db6cdc1abf38a3e4e495608953d791c65c90b (patch)
tree: 69e4475e163a25cf8e61e9a6b2302136b7a0badf /www
parent: lang/ocaml: Set BROKEN on 2 new ARCHES (diff)
24 files changed, 612 insertions, 608 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 27e49c70c096..5ac850348759 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -18,6 +18,7 @@ USES+=		cpe
 
 CPE_VENDOR=	nginx
 CPE_PRODUCT=	nginx
+USE_GITHUB=	nodefault
 
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=	\
@@ -265,9 +266,10 @@ CONFIGURE_ARGS+=--http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \
 
 .if ${PORT_OPTIONS:MHTTP_ACCEPT_LANGUAGE}
 GIT_ACCEPT_LANGUAGE_VERSION=	2f69842
-MASTER_SITES+=	https://github.com/giom/nginx_accept_language_module/tarball/master/:accept_language
-DISTFILES+=	giom-nginx_accept_language_module-${GIT_ACCEPT_LANGUAGE_VERSION}.tar.gz:accept_language
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/giom-nginx_accept_language_module-${GIT_ACCEPT_LANGUAGE_VERSION}
+GH_ACCOUNT+=	giom:accept_language
+GH_PROJECT+=	nginx_accept_language_module:accept_language
+GH_TAGNAME+=	${GIT_ACCEPT_LANGUAGE_VERSION}:accept_language
+CONFIGURE_ARGS+=--add-module=${WRKSRC_accept_language}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
@@ -283,9 +285,10 @@ CONFIGURE_ARGS+=--with-http_addition_module
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_DIGEST}
 GIT_AUTH_DIGEST_VERSION=	bd1c86a
-MASTER_SITES+=	https://github.com/samizdatco/nginx-http-auth-digest/tarball/master/:auth_digest
-DISTFILES+=	samizdatco-nginx-http-auth-digest-${GIT_AUTH_DIGEST_VERSION}.tar.gz:auth_digest
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/samizdatco-nginx-http-auth-digest-${GIT_AUTH_DIGEST_VERSION}
+GH_ACCOUNT+=	samizdatco:auth_digest
+GH_PROJECT+=	nginx-http-auth-digest:auth_digest
+GH_TAGNAME+=	${GIT_AUTH_DIGEST_VERSION}:auth_digest
+CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_digest}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_LDAP}
@@ -321,18 +324,18 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_VERSI
 
 .if ${PORT_OPTIONS:MECHO}
 NGINX_ECHO_VERSION=	0.57
-GIT_ECHO_VERSION=	0-g91ee9a8
-MASTER_SITES+=	https://github.com/openresty/echo-nginx-module/tarball/v${NGINX_ECHO_VERSION}/:echo
-DISTFILES+=	openresty-echo-nginx-module-v${NGINX_ECHO_VERSION}-${GIT_ECHO_VERSION}.tar.gz:echo
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-echo-nginx-module-${GIT_ECHO_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:echo
+GH_PROJECT+=	echo-nginx-module:echo
+GH_TAGNAME+=	v${NGINX_ECHO_VERSION}:echo
+CONFIGURE_ARGS+=--add-module=${WRKSRC_echo}
 .endif
 
 .if ${PORT_OPTIONS:MHEADERS_MORE}
 NGINX_HEADERS_MORE_VERSION=	0.26
-GIT_HEADERS_MORE_VERSION=	0-gd20bf26
-MASTER_SITES+=	https://github.com/openresty/headers-more-nginx-module/tarball/v${NGINX_HEADERS_MORE_VERSION}/:headers_more
-DISTFILES+=	openresty-headers-more-nginx-module-v${NGINX_HEADERS_MORE_VERSION}-${GIT_HEADERS_MORE_VERSION}.tar.gz:headers_more
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-headers-more-nginx-module-${GIT_HEADERS_MORE_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:headers_more
+GH_PROJECT+=	headers-more-nginx-module:headers_more
+GH_TAGNAME+=	v${NGINX_HEADERS_MORE_VERSION}:headers_more
+CONFIGURE_ARGS+=--add-module=${WRKSRC_headers_more}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_DAV} || defined(USE_HTTP_DAV)
@@ -343,34 +346,34 @@ CONFIGURE_ARGS+=--with-http_dav_module
 USE_HTTP_DAV=	yes
 LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2
 NGINX_DAV_EXT_VERSION=	0.0.3
-GIT_DAV_EXT_VERSION=	0-g6974186
-MASTER_SITES+=	https://github.com/arut/nginx-dav-ext-module/tarball/v${NGINX_DAV_EXT_VERSION}/:dav_ext
-DISTFILES+=	arut-nginx-dav-ext-module-v${NGINX_DAV_EXT_VERSION}-${GIT_DAV_EXT_VERSION}.tar.gz:dav_ext
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/arut-nginx-dav-ext-module-${GIT_DAV_EXT_VERSION:S/^0-g//}
+GH_ACCOUNT+=	arut:dav_ext
+GH_PROJECT+=	nginx-dav-ext-module:dav_ext
+GH_TAGNAME+=	v${NGINX_DAV_EXT_VERSION}:dav_ext
+CONFIGURE_ARGS+=--add-module=${WRKSRC_dav_ext}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_EVAL}
 NGINX_EVAL_VERSION=	1.0.3
-GIT_EVAL_VERSION=	0-g125fa2e
-MASTER_SITES+=	https://github.com/vkholodkov/nginx-eval-module/tarball/${NGINX_EVAL_VERSION}/:eval
-DISTFILES+=	vkholodkov-nginx-eval-module-${NGINX_EVAL_VERSION}-${GIT_EVAL_VERSION}.tar.gz:eval
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/vkholodkov-nginx-eval-module-${GIT_EVAL_VERSION:S/^0-g//}
+GH_ACCOUNT+=	vkholodkov:eval
+GH_PROJECT+=	nginx-eval-module:eval
+GH_TAGNAME+=	${NGINX_EVAL_VERSION}:eval
+CONFIGURE_ARGS+=--add-module=${WRKSRC_eval}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_FANCYINDEX}
 NGINX_FANCYINDEX_VERSION=	0.3.4
-GIT_FANCYINDEX_VERSION=		0-g3de8a4d
-MASTER_SITES+=	https://github.com/aperezdc/ngx-fancyindex/tarball/v${NGINX_FANCYINDEX_VERSION}/:fancyindex
-DISTFILES+=	aperezdc-ngx-fancyindex-v${NGINX_FANCYINDEX_VERSION}-${GIT_FANCYINDEX_VERSION}.tar.gz:fancyindex
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/aperezdc-ngx-fancyindex-${GIT_FANCYINDEX_VERSION:S/^0-g//}
+GH_ACCOUNT+=	aperezdc:fancyindex
+GH_PROJECT+=	ngx-fancyindex:fancyindex
+GH_TAGNAME+=	v${NGINX_FANCYINDEX_VERSION}:fancyindex
+CONFIGURE_ARGS+=--add-module=${WRKSRC_fancyindex}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_FOOTER}
 NGINX_FOOTER_VERSION=	1.2.2
-GIT_FOOTER_VERSION=	0-g3572184
-MASTER_SITES+=	https://github.com/alibaba/nginx-http-footer-filter/tarball/${NGINX_FOOTER_VERSION}/:footer
-DISTFILES+=	alibaba-nginx-footer-filter-${NGINX_FOOTER_VERSION}-${GIT_FOOTER_VERSION}.tar.gz:footer
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/alibaba-nginx-http-footer-filter-${GIT_FOOTER_VERSION:S/^0-g//}
+GH_ACCOUNT+=	alibaba:footer
+GH_PROJECT+=	nginx-http-footer-filter:footer
+GH_TAGNAME+=	${NGINX_FOOTER_VERSION}:footer
+CONFIGURE_ARGS+=--add-module=${WRKSRC_footer}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_FLV}
@@ -416,10 +419,11 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_streaming_module.c
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_NOTICE}
-GIT_NOTICE_VERSION=	0-g3c95966
-MASTER_SITES+=	https://github.com/kr/nginx-notice/tarball/master/:notice
-DISTFILES+=	kr-nginx-notice-${GIT_NOTICE_VERSION}.tar.gz:notice
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/kr-nginx-notice-${GIT_NOTICE_VERSION:S/^0-g//}
+GIT_NOTICE_VERSION=	3c95966
+GH_ACCOUNT+=	kr:notice
+GH_PROJECT+=	nginx-notice:notice
+GH_TAGNAME+=	${GIT_NOTICE_VERSION}:notice
+CONFIGURE_ARGS+=--add-module=${WRKSRC_notice}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_notice_module.c
 .endif
 
@@ -438,10 +442,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_http_push_module-${NGINX_PUSH_VERSI
 
 .if ${PORT_OPTIONS:MHTTP_PUSH_STREAM}
 NGINX_PUSH_STREAM_VERSION=	0.3.5
-GIT_PUSH_STREAM_VERSION=	0-gb6a8c46
-MASTER_SITES+=	https://github.com/wandenberg/nginx-push-stream-module/tarball/${NGINX_PUSH_STREAM_VERSION}/:pushstream
-DISTFILES+=	wandenberg-nginx-push-stream-module-${NGINX_PUSH_STREAM_VERSION}-${GIT_PUSH_STREAM_VERSION}.tar.gz:pushstream
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/wandenberg-nginx-push-stream-module-${GIT_PUSH_STREAM_VERSION:S/^0-g//}
+GH_ACCOUNT+=	wandenberg:pushstream
+GH_PROJECT+=	nginx-push-stream-module:pushstream
+GH_TAGNAME+=	${NGINX_PUSH_STREAM_VERSION}:pushstream
+CONFIGURE_ARGS+=--add-module=${WRKSRC_pushstream}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_RANDOM_INDEX}
@@ -468,10 +472,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_response-${NGINX_RESPONSE_VERSIO
 
 .if ${PORT_OPTIONS:MHTTP_SUBS_FILTER}
 NGINX_HTTP_SUBS_FILTER_VERSION=	0.6.2
-GIT_HTTP_SUBS_FILTER_VERSION=	0-g27a01b3
-MASTER_SITES+=	https://github.com/yaoweibin/ngx_http_substitutions_filter_module/tarball/${NGINX_HTTP_SUBS_FILTER_VERSION}/:subs_filter
-DISTFILES+=	yaoweibin-ngx_http_substitutions_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION}-${GIT_HTTP_SUBS_FILTER_VERSION}.tar.gz:subs_filter
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/yaoweibin-ngx_http_substitutions_filter_module-${GIT_HTTP_SUBS_FILTER_VERSION:S/^0-g//}
+GH_ACCOUNT+=	yaoweibin:subs_filter
+GH_PROJECT+=	ngx_http_substitutions_filter_module:subs_filter
+GH_TAGNAME+=	${NGINX_HTTP_SUBS_FILTER_VERSION}:subs_filter
+CONFIGURE_ARGS+=--add-module=${WRKSRC_subs_filter}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_SECURE_LINK}
@@ -488,10 +492,10 @@ CONFIGURE_ARGS+=--with-http_sub_module
 
 .if ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS}
 NGINX_UPLOADPROGRESS_VERSION=	0.9.0
-GIT_UPLOADPROGRESS_VERSION=	0-ga788dea
-MASTER_SITES+=	https://github.com/masterzen/nginx-upload-progress-module/tarball/v${NGINX_UPLOADPROGRESS_VERSION}/:uploadprogress
-DISTFILES+=	masterzen-nginx-upload-progress-module-v${NGINX_UPLOADPROGRESS_VERSION}-${GIT_UPLOADPROGRESS_VERSION}.tar.gz:uploadprogress
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${GIT_UPLOADPROGRESS_VERSION:S/^0-g//}
+GH_ACCOUNT+=	masterzen:uploadprogress
+GH_PROJECT+=	nginx-upload-progress-module:uploadprogress
+GH_TAGNAME+=	v${NGINX_UPLOADPROGRESS_VERSION}:uploadprogress
+CONFIGURE_ARGS+=--add-module=${WRKSRC_uploadprogress}
 .endif
 
 .if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR)
@@ -524,48 +528,45 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}
 .if ${PORT_OPTIONS:MDRIZZLE}
 LIB_DEPENDS+=	libdrizzle.so:${PORTSDIR}/databases/libdrizzle
 NGINX_DRIZZLE_VERSION=	0.1.8
-GIT_DRIZZLE_VERSION=	0-gfba80cf
-MASTER_SITES+=	https://github.com/openresty/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
-DISTFILES+=	drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:drizzle
+GH_PROJECT+=	drizzle-nginx-module:drizzle
+GH_TAGNAME+=	v${NGINX_DRIZZLE_VERSION}:drizzle
+CONFIGURE_ARGS+=--add-module=${WRKSRC_drizzle}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config \
 		${PATCHDIR}/extra-patch-ngx_http_drizzle_util.c
 .endif
 
 .if ${PORT_OPTIONS:MARRAYVAR} || ${PORT_OPTIONS:MENCRYPTSESSION} || ${PORT_OPTIONS:MFORMINPUT} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MSET_MISC}
 NGINX_DEVEL_KIT_VERSION=	0.2.19
-GIT_DEVEL_KIT_VERSION=	0-g8dd0df5
-MASTER_SITES+=	https://github.com/simpl/ngx_devel_kit/tarball/v${NGINX_DEVEL_KIT_VERSION}/:devel_kit
-DISTFILES+=	simpl-ngx_devel_kit-v${NGINX_DEVEL_KIT_VERSION}-${GIT_DEVEL_KIT_VERSION}.tar.gz:devel_kit
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/simpl-ngx_devel_kit-${GIT_DEVEL_KIT_VERSION:S/^0-g//}
+GH_ACCOUNT+=	simpl:devel_kit
+GH_PROJECT+=	ngx_devel_kit:devel_kit
+GH_TAGNAME+=	v${NGINX_DEVEL_KIT_VERSION}:devel_kit
+CONFIGURE_ARGS+=--add-module=${WRKSRC_devel_kit}
 .endif
 
 .if ${PORT_OPTIONS:MENCRYPTSESSION}
 NGINX_ENCRYPTSESSION_VERSION=	0.03
-GIT_ENCRYPTSESSION_VERSION=	0-g49d741b
-MASTER_SITES+=	https://github.com/openresty/encrypted-session-nginx-module/tarball/v${NGINX_ENCRYPTSESSION_VERSION}/:encryptsession
-DISTFILES+=	openresty-encrypted-session-nginx-module-v${NGINX_ENCRYPTSESSION_VERSION}-${GIT_ENCRYPTSESSION_VERSION}.tar.gz:encryptsession
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-encrypted-session-nginx-module-${GIT_ENCRYPTSESSION_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:encryptsession
+GH_PROJECT+=	encrypted-session-nginx-module:encryptsession
+GH_TAGNAME+=	v${NGINX_ENCRYPTSESSION_VERSION}:encryptsession
+CONFIGURE_ARGS+=--add-module=${WRKSRC_encryptsession}
 .endif
 
 .if ${PORT_OPTIONS:MGRIDFS}
 NGINX_GRIDFS_VERSION=	0.8
-GIT_GRIDFS_VERSION=	0-gb5f8113
 MONGO_C_DRIVER_VERSION=		0.3.1
-GIT_MONGO_C_DRIVER_VERSION=	0-g9b4b232
-MASTER_SITES+=	https://github.com/mdirolf/nginx-gridfs/tarball/v${NGINX_GRIDFS_VERSION}/:gridfs
-MASTER_SITES+=	https://github.com/mongodb/mongo-c-driver/tarball/v${MONGO_C_DRIVER_VERSION}/:mongo_c
-DISTFILES+=	mdirolf-nginx-gridfs-v${NGINX_GRIDFS_VERSION}-${GIT_GRIDFS_VERSION}.tar.gz:gridfs
-DISTFILES+=	mongodb-mongo-c-driver-v${MONGO_C_DRIVER_VERSION}-${GIT_MONGO_C_DRIVER_VERSION}.tar.gz:mongo_c
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}
+GH_ACCOUNT+=	mdirolf:gridfs mongodb:mongo_c
+GH_PROJECT+=	nginx-gridfs:gridfs mongo-c-driver:mongo_c
+GH_TAGNAME+=	v${NGINX_GRIDFS_VERSION}:gridfs v${MONGO_C_DRIVER_VERSION}:mongo_c
+CONFIGURE_ARGS+=--add-module=${WRKSRC_gridfs}
 .endif
 
 .if ${PORT_OPTIONS:MLET}
 NGINX_LET_VERSION=	0.0.4
-GIT_LET_VERSION=	0-ga5e1dc5
-MASTER_SITES+=	https://github.com/arut/nginx-let-module/tarball/v${NGINX_LET_VERSION}/:let
-DISTFILES+=	arut-nginx-let-module-v${NGINX_LET_VERSION}-${GIT_LET_VERSION}.tar.gz:let
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/arut-nginx-let-module-${GIT_LET_VERSION:S/^0-g//}
+GH_ACCOUNT+=	arut:let
+GH_PROJECT+=	nginx-let-module:let
+GH_TAGNAME+=	v${NGINX_LET_VERSION}:let
+CONFIGURE_ARGS+=--add-module=${WRKSRC_let}
 .endif
 
 .if ${PORT_OPTIONS:MLUA}
@@ -573,19 +574,19 @@ LIB_DEPENDS+=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
 CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
 CONFIGURE_ENV+=	"LUAJIT_LIB=${LOCALBASE}/lib"
 NGINX_LUA_VERSION=	0.9.15
-GIT_LUA_VERSION=	0-g4388b1e
-MASTER_SITES+=	https://github.com/openresty/lua-nginx-module/tarball/v${NGINX_LUA_VERSION}/:lua
-DISTFILES+=	openresty-lua-nginx-module-v${NGINX_LUA_VERSION}-${GIT_LUA_VERSION}.tar.gz:lua
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:lua
+GH_PROJECT+=	lua-nginx-module:lua
+GH_TAGNAME+=	v${NGINX_LUA_VERSION}:lua
+CONFIGURE_ARGS+=--add-module=${WRKSRC_lua}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_lua_socket_udp.c
 .endif
 
 .if ${PORT_OPTIONS:MMEMC}
 NGINX_MEMC_VERSION=	0.15
-GIT_MEMC_VERSION=	0-g1518da4
-MASTER_SITES+=	https://github.com/openresty/memc-nginx-module/tarball/v${NGINX_MEMC_VERSION}/:memc
-DISTFILES+=	openresty-memc-nginx-module-v${NGINX_MEMC_VERSION}-${GIT_MEMC_VERSION}.tar.gz:memc
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-memc-nginx-module-${GIT_MEMC_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:memc
+GH_PROJECT+=	memc-nginx-module:memc
+GH_TAGNAME+=	v${NGINX_MEMC_VERSION}:memc
+CONFIGURE_ARGS+=--add-module=${WRKSRC_memc}
 .endif
 
 .if ${PORT_OPTIONS:MMODSECURITY}
@@ -632,52 +633,53 @@ CFLAGS+=	-DNDEBUG
 
 .if ${PORT_OPTIONS:MPOSTGRES}
 USES+=	pgsql
-NGINX_POSTGRES_VERSION=		1.0rc5
-GIT_NGINX_POSTGRES_VERSION=	1-g49855a0
-MASTER_SITES+=	https://github.com/FRiCKLE/ngx_postgres/tarball/${GIT_NGINX_POSTGRES_VERSION:S/^1-g//}/:postgres
-DISTFILES+=	FRiCKLE-ngx_postgres-${NGINX_POSTGRES_VERSION}-${GIT_NGINX_POSTGRES_VERSION}.tar.gz:postgres
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/FRiCKLE-ngx_postgres-${GIT_NGINX_POSTGRES_VERSION:S/^1-g//}
+NGINX_POSTGRES_VERSION=		1.0rc5-1-g49855a0
+GH_ACCOUNT+=	FRiCKLE:postgres
+GH_PROJECT+=	ngx_postgres:postgres
+GH_TAGNAME+=	${NGINX_POSTGRES_VERSION}:postgres
+CONFIGURE_ARGS+=--add-module=${WRKSRC_postgres}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres-config \
 		${PATCHDIR}/extra-patch-ngx_postgres_util.c
 .endif
 
 .if ${PORT_OPTIONS:MRDS_CSV}
 NGINX_RDS_CSV_VERSION=	0.05
-GIT_RDS_CSV_VERSION=	0-g607e26b
-MASTER_SITES+=	https://github.com/openresty/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_VERSION}/:rdscsv
-DISTFILES+=	openresty-rds-csv-nginx-module-v${NGINX_RDS_CSV_VERSION}-${GIT_RDS_CSV_VERSION}.tar.gz:rdscsv
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-csv-nginx-module-${GIT_RDS_CSV_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:rdscsv
+GH_PROJECT+=	rds-csv-nginx-module:rdscsv
+GH_TAGNAME+=	v${NGINX_RDS_CSV_VERSION}:rdscsv
+CONFIGURE_ARGS+=--add-module=${WRKSRC_rdscsv}
 .endif
 
 .if ${PORT_OPTIONS:MRDS_JSON}
 NGINX_RDS_JSON_VERSION=	0.13
-GIT_RDS_JSON_VERSION=	0-g8292070
-MASTER_SITES+=	https://github.com/openresty/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_VERSION}/:rdsjson
-DISTFILES+=	openresty-rds-json-nginx-module-v${NGINX_RDS_JSON_VERSION}-${GIT_RDS_JSON_VERSION}.tar.gz:rdsjson
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-json-nginx-module-${GIT_RDS_JSON_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:rdsjson
+GH_PROJECT+=	rds-json-nginx-module:rdsjson
+GH_TAGNAME+=	v${NGINX_RDS_JSON_VERSION}:rdsjson
+CONFIGURE_ARGS+=--add-module=${WRKSRC_rdsjson}
 .endif
 
 .if ${PORT_OPTIONS:MREDIS2}
 NGINX_REDIS2_VERSION=	0.11
-GIT_REDIS2_VERSION=	0-g828803d
-MASTER_SITES+=	https://github.com/openresty/redis2-nginx-module/tarball/v${NGINX_REDIS2_VERSION}/:redis2
-DISTFILES+=	openresty-redis2-nginx-module-v${NGINX_REDIS2_VERSION}-${GIT_REDIS2_VERSION}.tar.gz:redis2
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-redis2-nginx-module-${GIT_REDIS2_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:redis2
+GH_PROJECT+=	redis2-nginx-module:redis2
+GH_TAGNAME+=	v${NGINX_REDIS2_VERSION}:redis2
+CONFIGURE_ARGS+=--add-module=${WRKSRC_redis2}
 .endif
 
 .if ${PORT_OPTIONS:MRTMP}
 NGINX_RTMP_VERSION=	1.1.7
-MASTER_SITES+=	https://github.com/arut/nginx-rtmp-module/archive/v${NGINX_RTMP_VERSION}/:rtmp
-DISTFILES+=	rtmp-nginx-module-v${NGINX_RTMP_VERSION}.tar.gz:rtmp
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-rtmp-module-${NGINX_RTMP_VERSION}
+GH_ACCOUNT+=	arut:rtmp
+GH_PROJECT+=	nginx-rtmp-module:rtmp
+GH_TAGNAME+=	v${NGINX_RTMP_VERSION}:rtmp
+CONFIGURE_ARGS+=--add-module=${WRKSRC_rtmp}
 .endif
 
 .if ${PORT_OPTIONS:MSET_MISC}
 NGINX_SET_MISC_VERSION=	0.28
-GIT_SET_MISC_VERSION=	0-gf72abf1
-MASTER_SITES+=	https://github.com/openresty/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc
-DISTFILES+=	openresty-set-misc-nginx-module-v${NGINX_SET_MISC_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:setmisc
+GH_PROJECT+=	set-misc-nginx-module:setmisc
+GH_TAGNAME+=	v${NGINX_SET_MISC_VERSION}:setmisc
+CONFIGURE_ARGS+=--add-module=${WRKSRC_setmisc}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-openresty-set-misc-nginx-module-config
 .endif
 
@@ -700,10 +702,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VER
 
 .if ${PORT_OPTIONS:MSRCACHE}
 NGINX_SRCACHE_VERSION=	0.29
-GIT_SRCACHE_VERSION=	0-gc521830
-MASTER_SITES+=	https://github.com/openresty/srcache-nginx-module/tarball/v${NGINX_SRCACHE_VERSION}/:srcache
-DISTFILES+=	openresty-srcache-nginx-module-v${NGINX_SRCACHE_VERSION}-${GIT_SRCACHE_VERSION}.tar.gz:srcache
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-srcache-nginx-module-${GIT_SRCACHE_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:srcache
+GH_PROJECT+=	srcache-nginx-module:srcache
+GH_TAGNAME+=	v${NGINX_SRCACHE_VERSION}:srcache
+CONFIGURE_ARGS+=--add-module=${WRKSRC_srcache}
 .endif
 
 .if ${PORT_OPTIONS:MUDPLOG}
@@ -716,17 +718,18 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_udplog_module.c
 
 .if ${PORT_OPTIONS:MXRID_HEADER}
 GIT_XRID_VERSION=	0daa3cc
-MASTER_SITES+=	https://github.com/gabor/nginx-x-rid-header/tarball/master/:xrid
-DISTFILES+=	gabor-nginx-x-rid-header-${GIT_XRID_VERSION}.tar.gz:xrid
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/gabor-nginx-x-rid-header-${GIT_XRID_VERSION}
+GH_ACCOUNT+=	gabor:xrid
+GH_PROJECT+=	nginx-x-rid-header:xrid
+GH_TAGNAME+=	${GIT_XRID_VERSION}:xrid
+CONFIGURE_ARGS+=--add-module=${WRKSRC_xrid}
 .endif
 
 .if ${PORT_OPTIONS:MXSS}
 NGINX_XSS_VERSION=	0.04
-GIT_XSS_VERSION=	0-g7e37038
-MASTER_SITES+=	https://github.com/openresty/xss-nginx-module/tarball/v${NGINX_XSS_VERSION}/:xss
-DISTFILES+=	openresty-xss-nginx-module-v${NGINX_XSS_VERSION}-${GIT_XSS_VERSION}.tar.gz:xss
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-xss-nginx-module-${GIT_XSS_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:xss
+GH_PROJECT+=	xss-nginx-module:xss
+GH_TAGNAME+=	v${NGINX_XSS_VERSION}:xss
+CONFIGURE_ARGS+=--add-module=${WRKSRC_xss}
 .endif
 
 .if ${PORT_OPTIONS:MSPDY}
@@ -783,27 +786,27 @@ CONFIGURE_ARGS+=--with-http_ssl_module
 
 .if ${PORT_OPTIONS:MARRAYVAR}
 NGINX_ARRAYVAR_VERSION=	0.03
-GIT_ARRAYVAR_VERSION=	0-g4676747
-MASTER_SITES+=	https://github.com/openresty/array-var-nginx-module/tarball/v${NGINX_ARRAYVAR_VERSION}/:arrayvar
-DISTFILES+=	openresty-array-var-nginx-module-v${NGINX_ARRAYVAR_VERSION}-${GIT_ARRAYVAR_VERSION}.tar.gz:arrayvar
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-array-var-nginx-module-${GIT_ARRAYVAR_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:arrayvar
+GH_PROJECT+=	array-var-nginx-module:arrayvar
+GH_TAGNAME+=	v${NGINX_ARRAYVAR_VERSION}:arrayvar
+CONFIGURE_ARGS+=--add-module=${WRKSRC_arrayvar}
 .endif
 
 .if ${PORT_OPTIONS:MFORMINPUT}
 NGINX_FORMINPUT_VERSION=	0.07
-GIT_FORMINPUT_VERSION=	0-g78de845
-MASTER_SITES+=	https://github.com/calio/form-input-nginx-module/tarball/v${NGINX_FORMINPUT_VERSION}/:forminput
-DISTFILES+=	calio-form-input-nginx-module-v${NGINX_FORMINPUT_VERSION}-${GIT_FORMINPUT_VERSION}.tar.gz:forminput
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/calio-form-input-nginx-module-${GIT_FORMINPUT_VERSION:S/^0-g//}
+GH_ACCOUNT+=	calio:forminput
+GH_PROJECT+=	form-input-nginx-module:forminput
+GH_TAGNAME+=	v${NGINX_FORMINPUT_VERSION}:forminput
+CONFIGURE_ARGS+=--add-module=${WRKSRC_forminput}
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
 USES+=		iconv
 NGINX_ICONV_VERSION=	0.10
-GIT_ICONV_VERSION=	0-gb37efb5
-MASTER_SITES+=	https://github.com/calio/iconv-nginx-module/tarball/v${NGINX_ICONV_VERSION}/:iconv
-DISTFILES+=	calio-iconv-nginx-module-v${NGINX_ICONV_VERSION}-${GIT_ICONV_VERSION}.tar.gz:iconv
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/calio-iconv-nginx-module-${GIT_ICONV_VERSION:S/^0-g//}
+GH_ACCOUNT+=	calio:iconv
+GH_PROJECT+=	iconv-nginx-module:iconv
+GH_TAGNAME+=	v${NGINX_ICONV_VERSION}:iconv
+CONFIGURE_ARGS+=--add-module=${WRKSRC_iconv}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
 .endif
 
@@ -833,10 +836,8 @@ pre-everything::
 
 post-extract:
 .if ${PORT_OPTIONS:MGRIDFS}
-	@${RMDIR} ${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}/mongo-c-driver/
-	@${MV} \
-	${WRKDIR}/mongodb-mongo-c-driver-${GIT_MONGO_C_DRIVER_VERSION:S/^0-g//}/ \
-	${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}/mongo-c-driver/
+	@${RMDIR} ${WRKSRC_gridfs}/mongo-c-driver/
+	@${MV} ${WRKSRC_mongo_c} ${WRKSRC_gridfs}/mongo-c-driver
 .endif
 
 post-patch:
@@ -857,13 +858,13 @@ post-patch:
 .if ${PORT_OPTIONS:MDRIZZLE}
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
-		${WRKDIR}/openresty-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/config
+		${WRKSRC_drizzle}/config
 .endif
 # Respect CFLAGS by remove needless --std=c99 flag
 .if ${PORT_OPTIONS:MGRIDFS}
 	@${REINPLACE_CMD} \
 		's!--std=c99!-DMONGO_HAVE_STDINT!' \
-		${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}/config
+		${WRKSRC_gridfs}/config
 .endif
 .if ${PORT_OPTIONS:MPASSENGER}
 	@${REINPLACE_CMD} \
@@ -881,7 +882,7 @@ post-patch:
 .if ${PORT_OPTIONS:MPOSTGRES}
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
-		${WRKDIR}/FRiCKLE-ngx_postgres-${GIT_NGINX_POSTGRES_VERSION:S/^1-g//}/config
+		${WRKSRC_postgres}/config
 .endif
 .if ${PORT_OPTIONS:MSFLOW}
 	@${REINPLACE_CMD} \
@@ -890,13 +891,13 @@ post-patch:
 .endif
 .if ${PORT_OPTIONS:MLUA}
 	@${REINPLACE_CMD} 's!ngx_http_set_connection_log!ngx_set_connection_log!g' \
-		${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}/src/ngx_http_lua_initworkerby.c \
-		${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}/src/ngx_http_lua_timer.c
+		${WRKSRC_lua}/src/ngx_http_lua_initworkerby.c \
+		${WRKSRC_lua}/src/ngx_http_lua_timer.c
 .endif
 .if ${PORT_OPTIONS:MICONV}
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
-		${WRKDIR}/calio-iconv-nginx-module-${GIT_ICONV_VERSION:S/^0-g//}/config
+		${WRKSRC_iconv}/config
 .endif
 .if ${PORT_OPTIONS:MMODSECURITY}
 	@${REINPLACE_CMD} \
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index ccb56298040f..04f89ce25723 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,102 +1,102 @@
 SHA256 (nginx-1.9.1.tar.gz) = 09f555fae694c0944f172b575ad239f56d40d14559d98e843de0a690f38c1dad
 SIZE (nginx-1.9.1.tar.gz) = 855402
-SHA256 (giom-nginx_accept_language_module-2f69842.tar.gz) = fbcdf792160a1eff7b9549aeb5209d6e76716ff8e86b05e42c90b2d2f858e011
-SIZE (giom-nginx_accept_language_module-2f69842.tar.gz) = 3399
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
 SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632
-SHA256 (samizdatco-nginx-http-auth-digest-bd1c86a.tar.gz) = e223f55fd97e56425e232d8698e024707d1b2ed3714eff7d91a4d1ca76b4cbee
-SIZE (samizdatco-nginx-http-auth-digest-bd1c86a.tar.gz) = 14454
 SHA256 (http_auth_ldap-c4dc7c9153.tar.gz) = ac082a36afdbcfd883303bc2b1aaea5f2b4d2a772ad8eec9ecf3328e81300e1a
 SIZE (http_auth_ldap-c4dc7c9153.tar.gz) = 5323
 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9
 SIZE (ngx_http_auth_pam_module-1.2.tar.gz) = 5424
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
 SIZE (ngx_cache_purge-2.3.tar.gz) = 12248
-SHA256 (openresty-echo-nginx-module-v0.57-0-g91ee9a8.tar.gz) = 1c20511adb616917cfa13868a19b8dfefe7f9c7c31730a81ad6f0a8a67d61d04
-SIZE (openresty-echo-nginx-module-v0.57-0-g91ee9a8.tar.gz) = 65082
-SHA256 (openresty-headers-more-nginx-module-v0.26-0-gd20bf26.tar.gz) = 5ef76a714f4a0444f8c0ff12c50ca7cc2ba21c76799bd84d8e14fbfc0d43b646
-SIZE (openresty-headers-more-nginx-module-v0.26-0-gd20bf26.tar.gz) = 28015
-SHA256 (arut-nginx-dav-ext-module-v0.0.3-0-g6974186.tar.gz) = 6f40a158be9f60918162cd1cdf4ab01c7ad2d07c94983e44240ce4201a4f07a0
-SIZE (arut-nginx-dav-ext-module-v0.0.3-0-g6974186.tar.gz) = 6264
-SHA256 (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 945046c42d973be9293e03ab41e3a0e04677524b2cd813cfc5146cf1d2f0ab8f
-SIZE (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 5727
-SHA256 (aperezdc-ngx-fancyindex-v0.3.4-0-g3de8a4d.tar.gz) = 16df46ef8f58ab0985f3698b1503f7d565b87d8b0cf1166dbe7b10b0b1030022
-SIZE (aperezdc-ngx-fancyindex-v0.3.4-0-g3de8a4d.tar.gz) = 14289
-SHA256 (alibaba-nginx-footer-filter-1.2.2-0-g3572184.tar.gz) = 48a23f879416c0d8da5795c419b94f1ffa42ee06602545f494db4d9aba646e8f
-SIZE (alibaba-nginx-footer-filter-1.2.2-0-g3572184.tar.gz) = 3934
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
 SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
 SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19
 SIZE (nginx_mod_h264_streaming-2.2.7.tar.gz) = 44012
-SHA256 (kr-nginx-notice-0-g3c95966.tar.gz) = bb0b8c603b2df206aeb13100fb60c1328aa6a69d0ac7f411e5dabe8fdb2affce
-SIZE (kr-nginx-notice-0-g3c95966.tar.gz) = 3348
 SHA256 (nginx_http_push_module-0.692.tar.gz) = 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
 SIZE (nginx_http_push_module-0.692.tar.gz) = 29119
-SHA256 (wandenberg-nginx-push-stream-module-0.3.5-0-gb6a8c46.tar.gz) = f2c5b2cc3430f023442381b734a1e547dd2ba75a05cd34f2cdcf2431acc4f77e
-SIZE (wandenberg-nginx-push-stream-module-0.3.5-0-gb6a8c46.tar.gz) = 153187
 SHA256 (ngx_http_redis-0.3.7.tar.gz) = 9dfc14db81f431fdf3d69f3661a37daf110aef5f9479aa7c88cf362bb5d62604
 SIZE (ngx_http_redis-0.3.7.tar.gz) = 12165
 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
 SIZE (ngx_http_response-0.3.tar.gz) = 2244
-SHA256 (yaoweibin-ngx_http_substitutions_filter_module-0.6.2-0-g27a01b3.tar.gz) = 81864aa6ca85df70d55a2574ce8aefd21ad7ea88fc012a328e59c125e56d1e77
-SIZE (yaoweibin-ngx_http_substitutions_filter_module-0.6.2-0-g27a01b3.tar.gz) = 91895
-SHA256 (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2
-SIZE (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 17020
 SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b
 SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024
 SHA256 (1.2.4.tar.gz) = f79521a25322cb4f504547a0b0f76fd9d024c14440e5d790e26dda70ea4f701a
 SIZE (1.2.4.tar.gz) = 120448
 SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
-SHA256 (drizzle-nginx-module-v0.1.8-0-gfba80cf.tar.gz) = daab1199aef03111cdbfe682a7e81123e8f93698de2ff6a0a2a57b3f1785a982
-SIZE (drizzle-nginx-module-v0.1.8-0-gfba80cf.tar.gz) = 58862
-SHA256 (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 9a8c372f8e750d33018d9587d288c17f755e8da38592bca8ef9bf9ea4bab59a7
-SIZE (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 65033
-SHA256 (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 0c8b74f2fbe6114f6d59fecbf3539f5d13944f40895d1c379fdb5dfb0838c1e3
-SIZE (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 8954
-SHA256 (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = f55617873c9b123d610d59e4da52703c07be0bae5c719ef0cc3d45a53480d29c
-SIZE (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = 18882
-SHA256 (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = bfcdd60c6b53bd499e2bf22fefc96848de37e7d57dfaf7303bb00376dcb812f0
-SIZE (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = 53033
-SHA256 (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 9253581f11966329f64b4b4a49a2a60798665812f9007222592586e64bcd66da
-SIZE (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 20543
-SHA256 (openresty-lua-nginx-module-v0.9.15-0-g4388b1e.tar.gz) = dbab0dbdc826ef666c7747afdfad9eb0af33c888eb376c0059b4ef6675f8c1eb
-SIZE (openresty-lua-nginx-module-v0.9.15-0-g4388b1e.tar.gz) = 520220
-SHA256 (openresty-memc-nginx-module-v0.15-0-g1518da4.tar.gz) = 14cd97e1df875ac81e411e732fcb942e89e538a24f7ca19b13675e8f8e5ce59d
-SIZE (openresty-memc-nginx-module-v0.15-0-g1518da4.tar.gz) = 37931
 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.8.tar.gz) = 4da783986fad73f898a00aa118ada33ea99d83ff065fd11ab3d508a4f63f0920
 SIZE (passenger-5.0.8.tar.gz) = 4964167
-SHA256 (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0.tar.gz) = 460d7b1993752e0020397458a7de5fa000e833e03cd98cff5f29a1f52f074991
-SIZE (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0.tar.gz) = 40707
-SHA256 (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = d5f14e45c6dc0d039ad52ae889775b5af1ff80a1c8edb69361c1581aca5d0b8f
-SIZE (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18416
-SHA256 (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = e0813f2d1e0d499c4f44f7957253c7804ccc0d3a7d4446ac0c6eec834e9c21f4
-SIZE (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 32961
-SHA256 (openresty-redis2-nginx-module-v0.11-0-g828803d.tar.gz) = 8a587cc7e90e33123dc0cd01bdba9e1ff7f1db26ba555e88a0070ea8a90afa29
-SIZE (openresty-redis2-nginx-module-v0.11-0-g828803d.tar.gz) = 28530
-SHA256 (rtmp-nginx-module-v1.1.7.tar.gz) = 7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3
-SIZE (rtmp-nginx-module-v1.1.7.tar.gz) = 519735
-SHA256 (openresty-set-misc-nginx-module-v0.28-0-gf72abf1.tar.gz) = a2644dca302c1903402259446fddd79f21272d4b9c4dbd3d5a5391f8588987a6
-SIZE (openresty-set-misc-nginx-module-v0.28-0-gf72abf1.tar.gz) = 35494
 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76
 SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
-SHA256 (openresty-srcache-nginx-module-v0.29-0-gc521830.tar.gz) = 3d671f7e07b89fa4d8130aec419c3fd3b7e070b09d1fda58468793f0d95364fc
-SIZE (openresty-srcache-nginx-module-v0.29-0-gc521830.tar.gz) = 58867
 SHA256 (nginx_udplog_module-1.0.0.tar.gz) = e0c0bfa524c3a675ad6c08b916d08e57ef45f9818cb8a0d848c2c83785c6e659
 SIZE (nginx_udplog_module-1.0.0.tar.gz) = 6284
-SHA256 (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 136239b8f9ab2fbefb2aabc6897d3f12cc8063ce817901f9b8a624e12fbc6035
-SIZE (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 2714
-SHA256 (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 0199bc3b53269f49073365fe08dc2c02decbaea614dc33db4666c7ab2cdb8bfa
-SIZE (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 10542
-SHA256 (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = bc33d26af3f01882a187b312c27fb547f802eb36eedfa7d2caedf3ed9c424442
-SIZE (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9518
-SHA256 (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = d5b2c42a3b9fd2970107eb74c2226cbbfbad48c89807303db903932d21ff76aa
-SIZE (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = 10580
-SHA256 (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = e90a406a14d5f419bd500e19082da81390e8ba6040926857926f1a899a53379d
-SIZE (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = 12510
+SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0
+SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393
+SHA256 (samizdatco-nginx-http-auth-digest-bd1c86a_GH0.tar.gz) = d3071ca4b70cfd7f437add772a2aa6ab585dafb5d5a2e3f5cc70af74da72acf2
+SIZE (samizdatco-nginx-http-auth-digest-bd1c86a_GH0.tar.gz) = 14458
+SHA256 (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 8467237ca0fae74ca7a32fbd34fc6044df307098415d48068214c9c235695a07
+SIZE (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 65073
+SHA256 (openresty-headers-more-nginx-module-v0.26_GH0.tar.gz) = d6bdc51f9e778a3b23e41a51cae542c1467a1e5e55c1329a7ffc454be084fb6f
+SIZE (openresty-headers-more-nginx-module-v0.26_GH0.tar.gz) = 28028
+SHA256 (arut-nginx-dav-ext-module-v0.0.3_GH0.tar.gz) = d428a0236c933779cb40ac8c91afb19d5c25a376dc3caab825bfd543e1ee530d
+SIZE (arut-nginx-dav-ext-module-v0.0.3_GH0.tar.gz) = 6260
+SHA256 (vkholodkov-nginx-eval-module-1.0.3_GH0.tar.gz) = 849381433a9020ee1162fa6211b047369fde38dc1a8b5de79f03f8fff2407fe2
+SIZE (vkholodkov-nginx-eval-module-1.0.3_GH0.tar.gz) = 5724
+SHA256 (aperezdc-ngx-fancyindex-v0.3.4_GH0.tar.gz) = d7a84e66b3b3571e6a7e2531d00767f4354f85ce2f281d532ace2bcc35035f8b
+SIZE (aperezdc-ngx-fancyindex-v0.3.4_GH0.tar.gz) = 14275
+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 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885
+SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343
+SHA256 (wandenberg-nginx-push-stream-module-0.3.5_GH0.tar.gz) = 8a9e27a79020bf088dd120e528db77398c29db8aa75c962e7e45c8a20451d4f7
+SIZE (wandenberg-nginx-push-stream-module-0.3.5_GH0.tar.gz) = 153122
+SHA256 (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 2814340bf57581a04873e26d773ec216bfceebb1abb87d4904ce314790897b17
+SIZE (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 91878
+SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1
+SIZE (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 16990
+SHA256 (openresty-drizzle-nginx-module-v0.1.8_GH0.tar.gz) = 5aa5a66568bb25af459d37547d14fc7867c970e4f90299895e1fad2cf20751a8
+SIZE (openresty-drizzle-nginx-module-v0.1.8_GH0.tar.gz) = 58891
+SHA256 (simpl-ngx_devel_kit-v0.2.19_GH0.tar.gz) = 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679
+SIZE (simpl-ngx_devel_kit-v0.2.19_GH0.tar.gz) = 65029
+SHA256 (openresty-encrypted-session-nginx-module-v0.03_GH0.tar.gz) = 4d0da617b3122b145dd46ec8618c6248db79c992704b23ed78e01bddf14173d3
+SIZE (openresty-encrypted-session-nginx-module-v0.03_GH0.tar.gz) = 8949
+SHA256 (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = ef843824e0aac1dd60b392802861cc06426a4bc5f87d472c7ee00b1296693f2a
+SIZE (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = 18883
+SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c114433ee783b4b06c0105921a830c9486172
+SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024
+SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270
+SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534
+SHA256 (openresty-lua-nginx-module-v0.9.15_GH0.tar.gz) = 659fe4c201f4a4ae1007fa029cef472aaa837bf0904babb6158f83b86536c5b7
+SIZE (openresty-lua-nginx-module-v0.9.15_GH0.tar.gz) = 520190
+SHA256 (openresty-memc-nginx-module-v0.15_GH0.tar.gz) = cd1999bc5e4441dd23d056202b0423c07b9a9294245147f4cf2ef6edb81b4122
+SIZE (openresty-memc-nginx-module-v0.15_GH0.tar.gz) = 37948
+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
+SIZE (openresty-rds-csv-nginx-module-v0.05_GH0.tar.gz) = 18417
+SHA256 (openresty-rds-json-nginx-module-v0.13_GH0.tar.gz) = fc7d425c727e22420d103e638f531c9ab8adf5f494841d50e9387c51dd3770d0
+SIZE (openresty-rds-json-nginx-module-v0.13_GH0.tar.gz) = 32977
+SHA256 (openresty-redis2-nginx-module-v0.11_GH0.tar.gz) = 877558e21304f413943e3bdf17b97659d8aed7e4bfdfd3ca964921a72de74c05
+SIZE (openresty-redis2-nginx-module-v0.11_GH0.tar.gz) = 28532
+SHA256 (arut-nginx-rtmp-module-v1.1.7_GH0.tar.gz) = 7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3
+SIZE (arut-nginx-rtmp-module-v1.1.7_GH0.tar.gz) = 519735
+SHA256 (openresty-set-misc-nginx-module-v0.28_GH0.tar.gz) = cf06a976785446e0552beb1e11b8dff8a4973f7628935c4d2655812a03ceb60a
+SIZE (openresty-set-misc-nginx-module-v0.28_GH0.tar.gz) = 35431
+SHA256 (openresty-srcache-nginx-module-v0.29_GH0.tar.gz) = 3fa24ecc658864d5286df33914f73fc3b47e6dffcefd2abfa0c7f72ed158af20
+SIZE (openresty-srcache-nginx-module-v0.29_GH0.tar.gz) = 58841
+SHA256 (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = de784142d867a35ecc5443fa347c2903af0935669cdf2eaa9274f5253aac2267
+SIZE (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = 2711
+SHA256 (openresty-xss-nginx-module-v0.04_GH0.tar.gz) = 4e5230a644779b8298063d5c0bd7dc19531496369456d69dc5281ae1cca4d6ec
+SIZE (openresty-xss-nginx-module-v0.04_GH0.tar.gz) = 10536
+SHA256 (openresty-array-var-nginx-module-v0.03_GH0.tar.gz) = f9892ec9a2e872d8aabeb2234d0d4c66cf85b8dbb2ca5c108a20c3d8c2111189
+SIZE (openresty-array-var-nginx-module-v0.03_GH0.tar.gz) = 9520
+SHA256 (calio-form-input-nginx-module-v0.07_GH0.tar.gz) = c0c56cc697a290e98b88d4888bac8828041ef6f3049247d3cd3c63f2808d1e20
+SIZE (calio-form-input-nginx-module-v0.07_GH0.tar.gz) = 10563
+SHA256 (calio-iconv-nginx-module-v0.10_GH0.tar.gz) = 88e326eba7fdf9fd2376b1ba033b48cb0eee45136528cf5430ac9340088ce324
+SIZE (calio-iconv-nginx-module-v0.10_GH0.tar.gz) = 12513
diff --git a/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module-config b/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module-config
index e564d207c3f1..376c5ba8d809 100644
--- a/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module-config
+++ b/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module-config
@@ -1,5 +1,5 @@
---- ../calio-iconv-nginx-module-b37efb5/config.orig	2013-04-16 17:57:17.000000000 -0700
-+++ ../calio-iconv-nginx-module-b37efb5/config	2013-05-01 17:16:28.134624745 -0700
+--- ../iconv-nginx-module-0.10/config.orig	2013-04-16 17:57:17.000000000 -0700
++++ ../iconv-nginx-module-0.10/config	2013-05-01 17:16:28.134624745 -0700
 @@ -39,12 +39,12 @@
      fi
  
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_drizzle_util.c b/www/nginx-devel/files/extra-patch-ngx_http_drizzle_util.c
index 298bb4a70cb6..5f459b2142e2 100644
--- a/www/nginx-devel/files/extra-patch-ngx_http_drizzle_util.c
+++ b/www/nginx-devel/files/extra-patch-ngx_http_drizzle_util.c
@@ -1,5 +1,5 @@
---- ../openresty-drizzle-nginx-module-fba80cf/src/ngx_http_drizzle_util.c.orig	2015-05-28 02:39:19.661703000 +0300
-+++ ../openresty-drizzle-nginx-module-fba80cf/src/ngx_http_drizzle_util.c	2015-05-28 02:41:12.655554000 +0300
+--- ../drizzle-nginx-module-0.1.8/src/ngx_http_drizzle_util.c.orig	2015-05-28 02:39:19.661703000 +0300
++++ ../drizzle-nginx-module-0.1.8/src/ngx_http_drizzle_util.c	2015-05-28 02:41:12.655554000 +0300
 @@ -114,10 +114,8 @@
          u->resolved->ctx = NULL;
      }
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_lua_socket_udp.c b/www/nginx-devel/files/extra-patch-ngx_http_lua_socket_udp.c
index 903a9a4840e8..0761fcc26702 100644
--- a/www/nginx-devel/files/extra-patch-ngx_http_lua_socket_udp.c
+++ b/www/nginx-devel/files/extra-patch-ngx_http_lua_socket_udp.c
@@ -1,5 +1,5 @@
---- ../openresty-lua-nginx-module-4388b1e/src/ngx_http_lua_socket_udp.c.orig	2015-04-21 21:18:31.080702000 +0300
-+++ ../openresty-lua-nginx-module-4388b1e/src/ngx_http_lua_socket_udp.c	2015-04-21 21:18:47.449758000 +0300
+--- ../lua-nginx-module-0.9.15/src/ngx_http_lua_socket_udp.c.orig	2015-04-21 21:18:31.080702000 +0300
++++ ../lua-nginx-module-0.9.15/src/ngx_http_lua_socket_udp.c	2015-04-21 21:18:47.449758000 +0300
 @@ -1400,17 +1400,6 @@
  
      c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_notice_module.c b/www/nginx-devel/files/extra-patch-ngx_http_notice_module.c
index feb39a964b23..d62135ed6f9c 100644
--- a/www/nginx-devel/files/extra-patch-ngx_http_notice_module.c
+++ b/www/nginx-devel/files/extra-patch-ngx_http_notice_module.c
@@ -1,5 +1,5 @@
---- ../kr-nginx-notice-3c95966/ngx_http_notice_module.c.orig	2009-07-16 18:37:57.000000000 +0200
-+++ ../kr-nginx-notice-3c95966/ngx_http_notice_module.c	2009-07-16 08:09:38.000000000 +0200
+--- ../nginx-notice-3c95966/ngx_http_notice_module.c.orig	2009-07-16 18:37:57.000000000 +0200
++++ ../nginx-notice-3c95966/ngx_http_notice_module.c	2009-07-16 08:09:38.000000000 +0200
 @@ -153,7 +153,7 @@
          return NGX_HTTP_NOT_ALLOWED;
      }
diff --git a/www/nginx-devel/files/extra-patch-ngx_postgres-config b/www/nginx-devel/files/extra-patch-ngx_postgres-config
index 623edc114c3f..e7440eb360f7 100644
--- a/www/nginx-devel/files/extra-patch-ngx_postgres-config
+++ b/www/nginx-devel/files/extra-patch-ngx_postgres-config
@@ -1,5 +1,5 @@
---- ../FRiCKLE-ngx_postgres-49855a0/config.orig	2015-05-26 20:52:25.649166000 +0300
-+++ ../FRiCKLE-ngx_postgres-49855a0/config	2015-05-26 20:53:10.331122000 +0300
+--- ../ngx_postgres-1.0rc5-1-g49855a0/config.orig	2015-05-26 20:52:25.649166000 +0300
++++ ../ngx_postgres-1.0rc5-1-g49855a0/config	2015-05-26 20:53:10.331122000 +0300
 @@ -48,12 +48,12 @@
  
      if [ $ngx_found = no ]; then
diff --git a/www/nginx-devel/files/extra-patch-ngx_postgres_util.c b/www/nginx-devel/files/extra-patch-ngx_postgres_util.c
index da112a3f285f..569c753935f7 100644
--- a/www/nginx-devel/files/extra-patch-ngx_postgres_util.c
+++ b/www/nginx-devel/files/extra-patch-ngx_postgres_util.c
@@ -1,5 +1,5 @@
---- ../FRiCKLE-ngx_postgres-49855a0/src/ngx_postgres_util.c.orig	2015-05-28 02:58:30.914607000 +0300
-+++ ../FRiCKLE-ngx_postgres-49855a0/src/ngx_postgres_util.c	2015-05-28 02:59:57.539743000 +0300
+--- ../ngx_postgres-1.0rc5-1-g49855a0/src/ngx_postgres_util.c.orig	2015-05-28 02:58:30.914607000 +0300
++++ ../ngx_postgres-1.0rc5-1-g49855a0/src/ngx_postgres_util.c	2015-05-28 02:59:57.539743000 +0300
 @@ -61,10 +61,8 @@
          u->resolved->ctx = NULL;
      }
diff --git a/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config b/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config
index 3b623da517fd..263f0cd45df8 100644
--- a/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config
+++ b/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config
@@ -1,5 +1,5 @@
---- ../openresty-drizzle-nginx-module-fba80cf/config.orig	2011-12-30 10:26:53.000000000 +0400
-+++ ../openresty-drizzle-nginx-module-fba80cf/config	2011-12-30 10:28:20.000000000 +0400
+--- ../drizzle-nginx-module-0.1.8/config.orig	2011-12-30 10:26:53.000000000 +0400
++++ ../drizzle-nginx-module-0.1.8/config	2011-12-30 10:28:20.000000000 +0400
 @@ -22,12 +22,12 @@
  
      if [ $ngx_found = no ]; then
diff --git a/www/nginx-devel/files/extra-patch-openresty-set-misc-nginx-module-config b/www/nginx-devel/files/extra-patch-openresty-set-misc-nginx-module-config
index 9d956fdf2fd9..aa206342d3ca 100644
--- a/www/nginx-devel/files/extra-patch-openresty-set-misc-nginx-module-config
+++ b/www/nginx-devel/files/extra-patch-openresty-set-misc-nginx-module-config
@@ -1,5 +1,5 @@
---- ../openresty-set-misc-nginx-module-f72abf1/config.orig       2011-12-09 10:27:53.861265188 +0300
-+++ ../openresty-set-misc-nginx-module-f72abf1/config    2011-12-09 10:28:07.107259301 +0300
+--- ../set-misc-nginx-module-0.28/config.orig       2011-12-09 10:27:53.861265188 +0300
++++ ../set-misc-nginx-module-0.28/config    2011-12-09 10:28:07.107259301 +0300
 @@ -1,10 +1,3 @@
 -if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then
 -    echo "found ngx_devel_kit for ngx_set_misc; looks good."
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 5334f1782a2c..0d303482fbd1 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -19,6 +19,7 @@ USES+=		cpe
 
 CPE_VENDOR=	nginx
 CPE_PRODUCT=	nginx
+USE_GITHUB=	nodefault
 
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=	\
@@ -262,9 +263,10 @@ CONFIGURE_ARGS+=--http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \
 
 .if ${PORT_OPTIONS:MHTTP_ACCEPT_LANGUAGE}
 GIT_ACCEPT_LANGUAGE_VERSION=	2f69842
-MASTER_SITES+=	https://github.com/giom/nginx_accept_language_module/tarball/master/:accept_language
-DISTFILES+=	giom-nginx_accept_language_module-${GIT_ACCEPT_LANGUAGE_VERSION}.tar.gz:accept_language
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/giom-nginx_accept_language_module-${GIT_ACCEPT_LANGUAGE_VERSION}
+GH_ACCOUNT+=	giom:accept_language
+GH_PROJECT+=	nginx_accept_language_module:accept_language
+GH_TAGNAME+=	${GIT_ACCEPT_LANGUAGE_VERSION}:accept_language
+CONFIGURE_ARGS+=--add-module=${WRKSRC_accept_language}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
@@ -280,9 +282,10 @@ CONFIGURE_ARGS+=--with-http_addition_module
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_DIGEST}
 GIT_AUTH_DIGEST_VERSION=	bd1c86a
-MASTER_SITES+=	https://github.com/samizdatco/nginx-http-auth-digest/tarball/master/:auth_digest
-DISTFILES+=	samizdatco-nginx-http-auth-digest-${GIT_AUTH_DIGEST_VERSION}.tar.gz:auth_digest
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/samizdatco-nginx-http-auth-digest-${GIT_AUTH_DIGEST_VERSION}
+GH_ACCOUNT+=	samizdatco:auth_digest
+GH_PROJECT+=	nginx-http-auth-digest:auth_digest
+GH_TAGNAME+=	${GIT_AUTH_DIGEST_VERSION}:auth_digest
+CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_digest}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_LDAP}
@@ -318,18 +321,18 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_VERSI
 
 .if ${PORT_OPTIONS:MECHO}
 NGINX_ECHO_VERSION=	0.57
-GIT_ECHO_VERSION=	0-g91ee9a8
-MASTER_SITES+=	https://github.com/openresty/echo-nginx-module/tarball/v${NGINX_ECHO_VERSION}/:echo
-DISTFILES+=	openresty-echo-nginx-module-v${NGINX_ECHO_VERSION}-${GIT_ECHO_VERSION}.tar.gz:echo
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-echo-nginx-module-${GIT_ECHO_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:echo
+GH_PROJECT+=	echo-nginx-module:echo
+GH_TAGNAME+=	v${NGINX_ECHO_VERSION}:echo
+CONFIGURE_ARGS+=--add-module=${WRKSRC_echo}
 .endif
 
 .if ${PORT_OPTIONS:MHEADERS_MORE}
 NGINX_HEADERS_MORE_VERSION=	0.26
-GIT_HEADERS_MORE_VERSION=	0-gd20bf26
-MASTER_SITES+=	https://github.com/openresty/headers-more-nginx-module/tarball/v${NGINX_HEADERS_MORE_VERSION}/:headers_more
-DISTFILES+=	openresty-headers-more-nginx-module-v${NGINX_HEADERS_MORE_VERSION}-${GIT_HEADERS_MORE_VERSION}.tar.gz:headers_more
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-headers-more-nginx-module-${GIT_HEADERS_MORE_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:headers_more
+GH_PROJECT+=	headers-more-nginx-module:headers_more
+GH_TAGNAME+=	v${NGINX_HEADERS_MORE_VERSION}:headers_more
+CONFIGURE_ARGS+=--add-module=${WRKSRC_headers_more}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_DAV} || defined(USE_HTTP_DAV)
@@ -340,34 +343,34 @@ CONFIGURE_ARGS+=--with-http_dav_module
 USE_HTTP_DAV=	yes
 LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2
 NGINX_DAV_EXT_VERSION=	0.0.3
-GIT_DAV_EXT_VERSION=	0-g6974186
-MASTER_SITES+=	https://github.com/arut/nginx-dav-ext-module/tarball/v${NGINX_DAV_EXT_VERSION}/:dav_ext
-DISTFILES+=	arut-nginx-dav-ext-module-v${NGINX_DAV_EXT_VERSION}-${GIT_DAV_EXT_VERSION}.tar.gz:dav_ext
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/arut-nginx-dav-ext-module-${GIT_DAV_EXT_VERSION:S/^0-g//}
+GH_ACCOUNT+=	arut:dav_ext
+GH_PROJECT+=	nginx-dav-ext-module:dav_ext
+GH_TAGNAME+=	v${NGINX_DAV_EXT_VERSION}:dav_ext
+CONFIGURE_ARGS+=--add-module=${WRKSRC_dav_ext}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_EVAL}
 NGINX_EVAL_VERSION=	1.0.3
-GIT_EVAL_VERSION=	0-g125fa2e
-MASTER_SITES+=	https://github.com/vkholodkov/nginx-eval-module/tarball/${NGINX_EVAL_VERSION}/:eval
-DISTFILES+=	vkholodkov-nginx-eval-module-${NGINX_EVAL_VERSION}-${GIT_EVAL_VERSION}.tar.gz:eval
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/vkholodkov-nginx-eval-module-${GIT_EVAL_VERSION:S/^0-g//}
+GH_ACCOUNT+=	vkholodkov:eval
+GH_PROJECT+=	nginx-eval-module:eval
+GH_TAGNAME+=	${NGINX_EVAL_VERSION}:eval
+CONFIGURE_ARGS+=--add-module=${WRKSRC_eval}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_FANCYINDEX}
 NGINX_FANCYINDEX_VERSION=	0.3.4
-GIT_FANCYINDEX_VERSION=		0-g3de8a4d
-MASTER_SITES+=	https://github.com/aperezdc/ngx-fancyindex/tarball/v${NGINX_FANCYINDEX_VERSION}/:fancyindex
-DISTFILES+=	aperezdc-ngx-fancyindex-v${NGINX_FANCYINDEX_VERSION}-${GIT_FANCYINDEX_VERSION}.tar.gz:fancyindex
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/aperezdc-ngx-fancyindex-${GIT_FANCYINDEX_VERSION:S/^0-g//}
+GH_ACCOUNT+=	aperezdc:fancyindex
+GH_PROJECT+=	ngx-fancyindex:fancyindex
+GH_TAGNAME+=	v${NGINX_FANCYINDEX_VERSION}:fancyindex
+CONFIGURE_ARGS+=--add-module=${WRKSRC_fancyindex}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_FOOTER}
 NGINX_FOOTER_VERSION=	1.2.2
-GIT_FOOTER_VERSION=	0-g3572184
-MASTER_SITES+=	https://github.com/alibaba/nginx-http-footer-filter/tarball/${NGINX_FOOTER_VERSION}/:footer
-DISTFILES+=	alibaba-nginx-footer-filter-${NGINX_FOOTER_VERSION}-${GIT_FOOTER_VERSION}.tar.gz:footer
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/alibaba-nginx-http-footer-filter-${GIT_FOOTER_VERSION:S/^0-g//}
+GH_ACCOUNT+=	alibaba:footer
+GH_PROJECT+=	nginx-http-footer-filter:footer
+GH_TAGNAME+=	${NGINX_FOOTER_VERSION}:footer
+CONFIGURE_ARGS+=--add-module=${WRKSRC_footer}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_FLV}
@@ -413,10 +416,11 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_streaming_module.c
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_NOTICE}
-GIT_NOTICE_VERSION=	0-g3c95966
-MASTER_SITES+=	https://github.com/kr/nginx-notice/tarball/master/:notice
-DISTFILES+=	kr-nginx-notice-${GIT_NOTICE_VERSION}.tar.gz:notice
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/kr-nginx-notice-${GIT_NOTICE_VERSION:S/^0-g//}
+GIT_NOTICE_VERSION=	3c95966
+GH_ACCOUNT+=	kr:notice
+GH_PROJECT+=	nginx-notice:notice
+GH_TAGNAME+=	${GIT_NOTICE_VERSION}:notice
+CONFIGURE_ARGS+=--add-module=${WRKSRC_notice}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_notice_module.c
 .endif
 
@@ -435,10 +439,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_http_push_module-${NGINX_PUSH_VERSI
 
 .if ${PORT_OPTIONS:MHTTP_PUSH_STREAM}
 NGINX_PUSH_STREAM_VERSION=	0.3.5
-GIT_PUSH_STREAM_VERSION=	0-gb6a8c46
-MASTER_SITES+=	https://github.com/wandenberg/nginx-push-stream-module/tarball/${NGINX_PUSH_STREAM_VERSION}/:pushstream
-DISTFILES+=	wandenberg-nginx-push-stream-module-${NGINX_PUSH_STREAM_VERSION}-${GIT_PUSH_STREAM_VERSION}.tar.gz:pushstream
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/wandenberg-nginx-push-stream-module-${GIT_PUSH_STREAM_VERSION:S/^0-g//}
+GH_ACCOUNT+=	wandenberg:pushstream
+GH_PROJECT+=	nginx-push-stream-module:pushstream
+GH_TAGNAME+=	${NGINX_PUSH_STREAM_VERSION}:pushstream
+CONFIGURE_ARGS+=--add-module=${WRKSRC_pushstream}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_RANDOM_INDEX}
@@ -465,10 +469,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_response-${NGINX_RESPONSE_VERSIO
 
 .if ${PORT_OPTIONS:MHTTP_SUBS_FILTER}
 NGINX_HTTP_SUBS_FILTER_VERSION=	0.6.2
-GIT_HTTP_SUBS_FILTER_VERSION=	0-g27a01b3
-MASTER_SITES+=	https://github.com/yaoweibin/ngx_http_substitutions_filter_module/tarball/${NGINX_HTTP_SUBS_FILTER_VERSION}/:subs_filter
-DISTFILES+=	yaoweibin-ngx_http_substitutions_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION}-${GIT_HTTP_SUBS_FILTER_VERSION}.tar.gz:subs_filter
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/yaoweibin-ngx_http_substitutions_filter_module-${GIT_HTTP_SUBS_FILTER_VERSION:S/^0-g//}
+GH_ACCOUNT+=	yaoweibin:subs_filter
+GH_PROJECT+=	ngx_http_substitutions_filter_module:subs_filter
+GH_TAGNAME+=	${NGINX_HTTP_SUBS_FILTER_VERSION}:subs_filter
+CONFIGURE_ARGS+=--add-module=${WRKSRC_subs_filter}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_SECURE_LINK}
@@ -485,10 +489,10 @@ CONFIGURE_ARGS+=--with-http_sub_module
 
 .if ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS}
 NGINX_UPLOADPROGRESS_VERSION=	0.9.0
-GIT_UPLOADPROGRESS_VERSION=	0-ga788dea
-MASTER_SITES+=	https://github.com/masterzen/nginx-upload-progress-module/tarball/v${NGINX_UPLOADPROGRESS_VERSION}/:uploadprogress
-DISTFILES+=	masterzen-nginx-upload-progress-module-v${NGINX_UPLOADPROGRESS_VERSION}-${GIT_UPLOADPROGRESS_VERSION}.tar.gz:uploadprogress
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${GIT_UPLOADPROGRESS_VERSION:S/^0-g//}
+GH_ACCOUNT+=	masterzen:uploadprogress
+GH_PROJECT+=	nginx-upload-progress-module:uploadprogress
+GH_TAGNAME+=	v${NGINX_UPLOADPROGRESS_VERSION}:uploadprogress
+CONFIGURE_ARGS+=--add-module=${WRKSRC_uploadprogress}
 .endif
 
 .if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR)
@@ -521,47 +525,44 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}
 .if ${PORT_OPTIONS:MDRIZZLE}
 LIB_DEPENDS+=	libdrizzle.so:${PORTSDIR}/databases/libdrizzle
 NGINX_DRIZZLE_VERSION=	0.1.8
-GIT_DRIZZLE_VERSION=	0-gfba80cf
-MASTER_SITES+=	https://github.com/openresty/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
-DISTFILES+=	drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:drizzle
+GH_PROJECT+=	drizzle-nginx-module:drizzle
+GH_TAGNAME+=	v${NGINX_DRIZZLE_VERSION}:drizzle
+CONFIGURE_ARGS+=--add-module=${WRKSRC_drizzle}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config
 .endif
 
 .if ${PORT_OPTIONS:MARRAYVAR} || ${PORT_OPTIONS:MENCRYPTSESSION} || ${PORT_OPTIONS:MFORMINPUT} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MSET_MISC}
 NGINX_DEVEL_KIT_VERSION=	0.2.19
-GIT_DEVEL_KIT_VERSION=	0-g8dd0df5
-MASTER_SITES+=	https://github.com/simpl/ngx_devel_kit/tarball/v${NGINX_DEVEL_KIT_VERSION}/:devel_kit
-DISTFILES+=	simpl-ngx_devel_kit-v${NGINX_DEVEL_KIT_VERSION}-${GIT_DEVEL_KIT_VERSION}.tar.gz:devel_kit
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/simpl-ngx_devel_kit-${GIT_DEVEL_KIT_VERSION:S/^0-g//}
+GH_ACCOUNT+=	simpl:devel_kit
+GH_PROJECT+=	ngx_devel_kit:devel_kit
+GH_TAGNAME+=	v${NGINX_DEVEL_KIT_VERSION}:devel_kit
+CONFIGURE_ARGS+=--add-module=${WRKSRC_devel_kit}
 .endif
 
 .if ${PORT_OPTIONS:MENCRYPTSESSION}
 NGINX_ENCRYPTSESSION_VERSION=	0.03
-GIT_ENCRYPTSESSION_VERSION=	0-g49d741b
-MASTER_SITES+=	https://github.com/openresty/encrypted-session-nginx-module/tarball/v${NGINX_ENCRYPTSESSION_VERSION}/:encryptsession
-DISTFILES+=	openresty-encrypted-session-nginx-module-v${NGINX_ENCRYPTSESSION_VERSION}-${GIT_ENCRYPTSESSION_VERSION}.tar.gz:encryptsession
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-encrypted-session-nginx-module-${GIT_ENCRYPTSESSION_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:encryptsession
+GH_PROJECT+=	encrypted-session-nginx-module:encryptsession
+GH_TAGNAME+=	v${NGINX_ENCRYPTSESSION_VERSION}:encryptsession
+CONFIGURE_ARGS+=--add-module=${WRKSRC_encryptsession}
 .endif
 
 .if ${PORT_OPTIONS:MGRIDFS}
 NGINX_GRIDFS_VERSION=	0.8
-GIT_GRIDFS_VERSION=	0-gb5f8113
 MONGO_C_DRIVER_VERSION=		0.3.1
-GIT_MONGO_C_DRIVER_VERSION=	0-g9b4b232
-MASTER_SITES+=	https://github.com/mdirolf/nginx-gridfs/tarball/v${NGINX_GRIDFS_VERSION}/:gridfs
-MASTER_SITES+=	https://github.com/mongodb/mongo-c-driver/tarball/v${MONGO_C_DRIVER_VERSION}/:mongo_c
-DISTFILES+=	mdirolf-nginx-gridfs-v${NGINX_GRIDFS_VERSION}-${GIT_GRIDFS_VERSION}.tar.gz:gridfs
-DISTFILES+=	mongodb-mongo-c-driver-v${MONGO_C_DRIVER_VERSION}-${GIT_MONGO_C_DRIVER_VERSION}.tar.gz:mongo_c
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}
+GH_ACCOUNT+=	mdirolf:gridfs mongodb:mongo_c
+GH_PROJECT+=	nginx-gridfs:gridfs mongo-c-driver:mongo_c
+GH_TAGNAME+=	v${NGINX_GRIDFS_VERSION}:gridfs v${MONGO_C_DRIVER_VERSION}:mongo_c
+CONFIGURE_ARGS+=--add-module=${WRKSRC_gridfs}
 .endif
 
 .if ${PORT_OPTIONS:MLET}
 NGINX_LET_VERSION=	0.0.4
-GIT_LET_VERSION=	0-ga5e1dc5
-MASTER_SITES+=	https://github.com/arut/nginx-let-module/tarball/v${NGINX_LET_VERSION}/:let
-DISTFILES+=	arut-nginx-let-module-v${NGINX_LET_VERSION}-${GIT_LET_VERSION}.tar.gz:let
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/arut-nginx-let-module-${GIT_LET_VERSION:S/^0-g//}
+GH_ACCOUNT+=	arut:let
+GH_PROJECT+=	nginx-let-module:let
+GH_TAGNAME+=	v${NGINX_LET_VERSION}:let
+CONFIGURE_ARGS+=--add-module=${WRKSRC_let}
 .endif
 
 .if ${PORT_OPTIONS:MLUA}
@@ -569,19 +570,19 @@ LIB_DEPENDS+=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
 CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
 CONFIGURE_ENV+=	"LUAJIT_LIB=${LOCALBASE}/lib"
 NGINX_LUA_VERSION=	0.9.15
-GIT_LUA_VERSION=	0-g4388b1e
-MASTER_SITES+=	https://github.com/openresty/lua-nginx-module/tarball/v${NGINX_LUA_VERSION}/:lua
-DISTFILES+=	openresty-lua-nginx-module-v${NGINX_LUA_VERSION}-${GIT_LUA_VERSION}.tar.gz:lua
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:lua
+GH_PROJECT+=	lua-nginx-module:lua
+GH_TAGNAME+=	v${NGINX_LUA_VERSION}:lua
+CONFIGURE_ARGS+=--add-module=${WRKSRC_lua}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_lua_socket_udp.c
 .endif
 
 .if ${PORT_OPTIONS:MMEMC}
 NGINX_MEMC_VERSION=	0.15
-GIT_MEMC_VERSION=	0-g1518da4
-MASTER_SITES+=	https://github.com/openresty/memc-nginx-module/tarball/v${NGINX_MEMC_VERSION}/:memc
-DISTFILES+=	openresty-memc-nginx-module-v${NGINX_MEMC_VERSION}-${GIT_MEMC_VERSION}.tar.gz:memc
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-memc-nginx-module-${GIT_MEMC_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:memc
+GH_PROJECT+=	memc-nginx-module:memc
+GH_TAGNAME+=	v${NGINX_MEMC_VERSION}:memc
+CONFIGURE_ARGS+=--add-module=${WRKSRC_memc}
 .endif
 
 .if ${PORT_OPTIONS:MMODSECURITY}
@@ -628,51 +629,52 @@ CFLAGS+=	-DNDEBUG
 
 .if ${PORT_OPTIONS:MPOSTGRES}
 USES+=	pgsql
-NGINX_POSTGRES_VERSION=		1.0rc5
-GIT_NGINX_POSTGRES_VERSION=	1-g49855a0
-MASTER_SITES+=	https://github.com/FRiCKLE/ngx_postgres/tarball/${GIT_NGINX_POSTGRES_VERSION:S/^1-g//}/:postgres
-DISTFILES+=	FRiCKLE-ngx_postgres-${NGINX_POSTGRES_VERSION}-${GIT_NGINX_POSTGRES_VERSION}.tar.gz:postgres
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/FRiCKLE-ngx_postgres-${GIT_NGINX_POSTGRES_VERSION:S/^1-g//}
+NGINX_POSTGRES_VERSION=		1.0rc5-1-g49855a0
+GH_ACCOUNT+=	FRiCKLE:postgres
+GH_PROJECT+=	ngx_postgres:postgres
+GH_TAGNAME+=	${NGINX_POSTGRES_VERSION}:postgres
+CONFIGURE_ARGS+=--add-module=${WRKSRC_postgres}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres-config
 .endif
 
 .if ${PORT_OPTIONS:MRDS_CSV}
 NGINX_RDS_CSV_VERSION=	0.05
-GIT_RDS_CSV_VERSION=	0-g607e26b
-MASTER_SITES+=	https://github.com/openresty/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_VERSION}/:rdscsv
-DISTFILES+=	openresty-rds-csv-nginx-module-v${NGINX_RDS_CSV_VERSION}-${GIT_RDS_CSV_VERSION}.tar.gz:rdscsv
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-csv-nginx-module-${GIT_RDS_CSV_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:rdscsv
+GH_PROJECT+=	rds-csv-nginx-module:rdscsv
+GH_TAGNAME+=	v${NGINX_RDS_CSV_VERSION}:rdscsv
+CONFIGURE_ARGS+=--add-module=${WRKSRC_rdscsv}
 .endif
 
 .if ${PORT_OPTIONS:MRDS_JSON}
 NGINX_RDS_JSON_VERSION=	0.13
-GIT_RDS_JSON_VERSION=	0-g8292070
-MASTER_SITES+=	https://github.com/openresty/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_VERSION}/:rdsjson
-DISTFILES+=	openresty-rds-json-nginx-module-v${NGINX_RDS_JSON_VERSION}-${GIT_RDS_JSON_VERSION}.tar.gz:rdsjson
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-json-nginx-module-${GIT_RDS_JSON_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:rdsjson
+GH_PROJECT+=	rds-json-nginx-module:rdsjson
+GH_TAGNAME+=	v${NGINX_RDS_JSON_VERSION}:rdsjson
+CONFIGURE_ARGS+=--add-module=${WRKSRC_rdsjson}
 .endif
 
 .if ${PORT_OPTIONS:MREDIS2}
 NGINX_REDIS2_VERSION=	0.11
-GIT_REDIS2_VERSION=	0-g828803d
-MASTER_SITES+=	https://github.com/openresty/redis2-nginx-module/tarball/v${NGINX_REDIS2_VERSION}/:redis2
-DISTFILES+=	openresty-redis2-nginx-module-v${NGINX_REDIS2_VERSION}-${GIT_REDIS2_VERSION}.tar.gz:redis2
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-redis2-nginx-module-${GIT_REDIS2_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:redis2
+GH_PROJECT+=	redis2-nginx-module:redis2
+GH_TAGNAME+=	v${NGINX_REDIS2_VERSION}:redis2
+CONFIGURE_ARGS+=--add-module=${WRKSRC_redis2}
 .endif
 
 .if ${PORT_OPTIONS:MRTMP}
 NGINX_RTMP_VERSION=	1.1.7
-MASTER_SITES+=	https://github.com/arut/nginx-rtmp-module/archive/v${NGINX_RTMP_VERSION}/:rtmp
-DISTFILES+=	rtmp-nginx-module-v${NGINX_RTMP_VERSION}.tar.gz:rtmp
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-rtmp-module-${NGINX_RTMP_VERSION}
+GH_ACCOUNT+=	arut:rtmp
+GH_PROJECT+=	nginx-rtmp-module:rtmp
+GH_TAGNAME+=	v${NGINX_RTMP_VERSION}:rtmp
+CONFIGURE_ARGS+=--add-module=${WRKSRC_rtmp}
 .endif
 
 .if ${PORT_OPTIONS:MSET_MISC}
 NGINX_SET_MISC_VERSION=	0.28
-GIT_SET_MISC_VERSION=	0-gf72abf1
-MASTER_SITES+=	https://github.com/openresty/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc
-DISTFILES+=	openresty-set-misc-nginx-module-v${NGINX_SET_MISC_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:setmisc
+GH_PROJECT+=	set-misc-nginx-module:setmisc
+GH_TAGNAME+=	v${NGINX_SET_MISC_VERSION}:setmisc
+CONFIGURE_ARGS+=--add-module=${WRKSRC_setmisc}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-openresty-set-misc-nginx-module-config
 .endif
 
@@ -695,10 +697,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VER
 
 .if ${PORT_OPTIONS:MSRCACHE}
 NGINX_SRCACHE_VERSION=	0.29
-GIT_SRCACHE_VERSION=	0-gc521830
-MASTER_SITES+=	https://github.com/openresty/srcache-nginx-module/tarball/v${NGINX_SRCACHE_VERSION}/:srcache
-DISTFILES+=	openresty-srcache-nginx-module-v${NGINX_SRCACHE_VERSION}-${GIT_SRCACHE_VERSION}.tar.gz:srcache
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-srcache-nginx-module-${GIT_SRCACHE_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:srcache
+GH_PROJECT+=	srcache-nginx-module:srcache
+GH_TAGNAME+=	v${NGINX_SRCACHE_VERSION}:srcache
+CONFIGURE_ARGS+=--add-module=${WRKSRC_srcache}
 .endif
 
 .if ${PORT_OPTIONS:MUDPLOG}
@@ -711,17 +713,18 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_udplog_module.c
 
 .if ${PORT_OPTIONS:MXRID_HEADER}
 GIT_XRID_VERSION=	0daa3cc
-MASTER_SITES+=	https://github.com/gabor/nginx-x-rid-header/tarball/master/:xrid
-DISTFILES+=	gabor-nginx-x-rid-header-${GIT_XRID_VERSION}.tar.gz:xrid
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/gabor-nginx-x-rid-header-${GIT_XRID_VERSION}
+GH_ACCOUNT+=	gabor:xrid
+GH_PROJECT+=	nginx-x-rid-header:xrid
+GH_TAGNAME+=	${GIT_XRID_VERSION}:xrid
+CONFIGURE_ARGS+=--add-module=${WRKSRC_xrid}
 .endif
 
 .if ${PORT_OPTIONS:MXSS}
 NGINX_XSS_VERSION=	0.04
-GIT_XSS_VERSION=	0-g7e37038
-MASTER_SITES+=	https://github.com/openresty/xss-nginx-module/tarball/v${NGINX_XSS_VERSION}/:xss
-DISTFILES+=	openresty-xss-nginx-module-v${NGINX_XSS_VERSION}-${GIT_XSS_VERSION}.tar.gz:xss
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-xss-nginx-module-${GIT_XSS_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:xss
+GH_PROJECT+=	xss-nginx-module:xss
+GH_TAGNAME+=	v${NGINX_XSS_VERSION}:xss
+CONFIGURE_ARGS+=--add-module=${WRKSRC_xss}
 .endif
 
 .if ${PORT_OPTIONS:MSPDY}
@@ -769,27 +772,27 @@ CONFIGURE_ARGS+=--with-http_ssl_module
 
 .if ${PORT_OPTIONS:MARRAYVAR}
 NGINX_ARRAYVAR_VERSION=	0.03
-GIT_ARRAYVAR_VERSION=	0-g4676747
-MASTER_SITES+=	https://github.com/openresty/array-var-nginx-module/tarball/v${NGINX_ARRAYVAR_VERSION}/:arrayvar
-DISTFILES+=	openresty-array-var-nginx-module-v${NGINX_ARRAYVAR_VERSION}-${GIT_ARRAYVAR_VERSION}.tar.gz:arrayvar
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-array-var-nginx-module-${GIT_ARRAYVAR_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:arrayvar
+GH_PROJECT+=	array-var-nginx-module:arrayvar
+GH_TAGNAME+=	v${NGINX_ARRAYVAR_VERSION}:arrayvar
+CONFIGURE_ARGS+=--add-module=${WRKSRC_arrayvar}
 .endif
 
 .if ${PORT_OPTIONS:MFORMINPUT}
 NGINX_FORMINPUT_VERSION=	0.07
-GIT_FORMINPUT_VERSION=	0-g78de845
-MASTER_SITES+=	https://github.com/calio/form-input-nginx-module/tarball/v${NGINX_FORMINPUT_VERSION}/:forminput
-DISTFILES+=	calio-form-input-nginx-module-v${NGINX_FORMINPUT_VERSION}-${GIT_FORMINPUT_VERSION}.tar.gz:forminput
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/calio-form-input-nginx-module-${GIT_FORMINPUT_VERSION:S/^0-g//}
+GH_ACCOUNT+=	calio:forminput
+GH_PROJECT+=	form-input-nginx-module:forminput
+GH_TAGNAME+=	v${NGINX_FORMINPUT_VERSION}:forminput
+CONFIGURE_ARGS+=--add-module=${WRKSRC_forminput}
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
 USES+=		iconv
 NGINX_ICONV_VERSION=	0.10
-GIT_ICONV_VERSION=	0-gb37efb5
-MASTER_SITES+=	https://github.com/calio/iconv-nginx-module/tarball/v${NGINX_ICONV_VERSION}/:iconv
-DISTFILES+=	calio-iconv-nginx-module-v${NGINX_ICONV_VERSION}-${GIT_ICONV_VERSION}.tar.gz:iconv
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/calio-iconv-nginx-module-${GIT_ICONV_VERSION:S/^0-g//}
+GH_ACCOUNT+=	calio:iconv
+GH_PROJECT+=	iconv-nginx-module:iconv
+GH_TAGNAME+=	v${NGINX_ICONV_VERSION}:iconv
+CONFIGURE_ARGS+=--add-module=${WRKSRC_iconv}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
 .endif
 
@@ -819,10 +822,8 @@ pre-everything::
 
 post-extract:
 .if ${PORT_OPTIONS:MGRIDFS}
-	@${RMDIR} ${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}/mongo-c-driver/
-	@${MV} \
-	${WRKDIR}/mongodb-mongo-c-driver-${GIT_MONGO_C_DRIVER_VERSION:S/^0-g//}/ \
-	${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}/mongo-c-driver/
+	@${RMDIR} ${WRKSRC_gridfs}/mongo-c-driver/
+	@${MV} ${WRKSRC_mongo_c} ${WRKSRC_gridfs}/mongo-c-driver
 .endif
 
 post-patch:
@@ -843,13 +844,13 @@ post-patch:
 .if ${PORT_OPTIONS:MDRIZZLE}
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
-		${WRKDIR}/openresty-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/config
+		${WRKSRC_drizzle}/config
 .endif
 # Respect CFLAGS by remove needless --std=c99 flag
 .if ${PORT_OPTIONS:MGRIDFS}
 	@${REINPLACE_CMD} \
 		's!--std=c99!-DMONGO_HAVE_STDINT!' \
-		${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}/config
+		${WRKSRC_gridfs}/config
 .endif
 .if ${PORT_OPTIONS:MPASSENGER}
 	@${REINPLACE_CMD} \
@@ -867,7 +868,7 @@ post-patch:
 .if ${PORT_OPTIONS:MPOSTGRES}
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
-		${WRKDIR}/FRiCKLE-ngx_postgres-${GIT_NGINX_POSTGRES_VERSION:S/^1-g//}/config
+		${WRKSRC_postgres}/config
 .endif
 .if ${PORT_OPTIONS:MSFLOW}
 	@${REINPLACE_CMD} \
@@ -877,7 +878,7 @@ post-patch:
 .if ${PORT_OPTIONS:MICONV}
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
-		${WRKDIR}/calio-iconv-nginx-module-${GIT_ICONV_VERSION:S/^0-g//}/config
+		${WRKSRC_iconv}/config
 .endif
 .if ${PORT_OPTIONS:MMODSECURITY}
 	@${REINPLACE_CMD} \
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index a5fd08a0eb48..4ff0941d5f74 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,102 +1,102 @@
 SHA256 (nginx-1.8.0.tar.gz) = 23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5
 SIZE (nginx-1.8.0.tar.gz) = 832104
-SHA256 (giom-nginx_accept_language_module-2f69842.tar.gz) = fbcdf792160a1eff7b9549aeb5209d6e76716ff8e86b05e42c90b2d2f858e011
-SIZE (giom-nginx_accept_language_module-2f69842.tar.gz) = 3399
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
 SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632
-SHA256 (samizdatco-nginx-http-auth-digest-bd1c86a.tar.gz) = e223f55fd97e56425e232d8698e024707d1b2ed3714eff7d91a4d1ca76b4cbee
-SIZE (samizdatco-nginx-http-auth-digest-bd1c86a.tar.gz) = 14454
 SHA256 (http_auth_ldap-c4dc7c9153.tar.gz) = ac082a36afdbcfd883303bc2b1aaea5f2b4d2a772ad8eec9ecf3328e81300e1a
 SIZE (http_auth_ldap-c4dc7c9153.tar.gz) = 5323
 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9
 SIZE (ngx_http_auth_pam_module-1.2.tar.gz) = 5424
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
 SIZE (ngx_cache_purge-2.3.tar.gz) = 12248
-SHA256 (openresty-echo-nginx-module-v0.57-0-g91ee9a8.tar.gz) = 1c20511adb616917cfa13868a19b8dfefe7f9c7c31730a81ad6f0a8a67d61d04
-SIZE (openresty-echo-nginx-module-v0.57-0-g91ee9a8.tar.gz) = 65082
-SHA256 (openresty-headers-more-nginx-module-v0.26-0-gd20bf26.tar.gz) = 5ef76a714f4a0444f8c0ff12c50ca7cc2ba21c76799bd84d8e14fbfc0d43b646
-SIZE (openresty-headers-more-nginx-module-v0.26-0-gd20bf26.tar.gz) = 28015
-SHA256 (arut-nginx-dav-ext-module-v0.0.3-0-g6974186.tar.gz) = 6f40a158be9f60918162cd1cdf4ab01c7ad2d07c94983e44240ce4201a4f07a0
-SIZE (arut-nginx-dav-ext-module-v0.0.3-0-g6974186.tar.gz) = 6264
-SHA256 (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 945046c42d973be9293e03ab41e3a0e04677524b2cd813cfc5146cf1d2f0ab8f
-SIZE (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 5727
-SHA256 (aperezdc-ngx-fancyindex-v0.3.4-0-g3de8a4d.tar.gz) = 16df46ef8f58ab0985f3698b1503f7d565b87d8b0cf1166dbe7b10b0b1030022
-SIZE (aperezdc-ngx-fancyindex-v0.3.4-0-g3de8a4d.tar.gz) = 14289
-SHA256 (alibaba-nginx-footer-filter-1.2.2-0-g3572184.tar.gz) = 48a23f879416c0d8da5795c419b94f1ffa42ee06602545f494db4d9aba646e8f
-SIZE (alibaba-nginx-footer-filter-1.2.2-0-g3572184.tar.gz) = 3934
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
 SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
 SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19
 SIZE (nginx_mod_h264_streaming-2.2.7.tar.gz) = 44012
-SHA256 (kr-nginx-notice-0-g3c95966.tar.gz) = bb0b8c603b2df206aeb13100fb60c1328aa6a69d0ac7f411e5dabe8fdb2affce
-SIZE (kr-nginx-notice-0-g3c95966.tar.gz) = 3348
 SHA256 (nginx_http_push_module-0.692.tar.gz) = 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
 SIZE (nginx_http_push_module-0.692.tar.gz) = 29119
-SHA256 (wandenberg-nginx-push-stream-module-0.3.5-0-gb6a8c46.tar.gz) = f2c5b2cc3430f023442381b734a1e547dd2ba75a05cd34f2cdcf2431acc4f77e
-SIZE (wandenberg-nginx-push-stream-module-0.3.5-0-gb6a8c46.tar.gz) = 153187
 SHA256 (ngx_http_redis-0.3.7.tar.gz) = 9dfc14db81f431fdf3d69f3661a37daf110aef5f9479aa7c88cf362bb5d62604
 SIZE (ngx_http_redis-0.3.7.tar.gz) = 12165
 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
 SIZE (ngx_http_response-0.3.tar.gz) = 2244
-SHA256 (yaoweibin-ngx_http_substitutions_filter_module-0.6.2-0-g27a01b3.tar.gz) = 81864aa6ca85df70d55a2574ce8aefd21ad7ea88fc012a328e59c125e56d1e77
-SIZE (yaoweibin-ngx_http_substitutions_filter_module-0.6.2-0-g27a01b3.tar.gz) = 91895
-SHA256 (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2
-SIZE (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 17020
 SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b
 SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024
 SHA256 (1.2.4.tar.gz) = f79521a25322cb4f504547a0b0f76fd9d024c14440e5d790e26dda70ea4f701a
 SIZE (1.2.4.tar.gz) = 120448
 SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
-SHA256 (drizzle-nginx-module-v0.1.8-0-gfba80cf.tar.gz) = daab1199aef03111cdbfe682a7e81123e8f93698de2ff6a0a2a57b3f1785a982
-SIZE (drizzle-nginx-module-v0.1.8-0-gfba80cf.tar.gz) = 58862
-SHA256 (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 9a8c372f8e750d33018d9587d288c17f755e8da38592bca8ef9bf9ea4bab59a7
-SIZE (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 65033
-SHA256 (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 0c8b74f2fbe6114f6d59fecbf3539f5d13944f40895d1c379fdb5dfb0838c1e3
-SIZE (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 8954
-SHA256 (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = f55617873c9b123d610d59e4da52703c07be0bae5c719ef0cc3d45a53480d29c
-SIZE (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = 18882
-SHA256 (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = bfcdd60c6b53bd499e2bf22fefc96848de37e7d57dfaf7303bb00376dcb812f0
-SIZE (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = 53033
-SHA256 (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 9253581f11966329f64b4b4a49a2a60798665812f9007222592586e64bcd66da
-SIZE (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 20543
-SHA256 (openresty-lua-nginx-module-v0.9.15-0-g4388b1e.tar.gz) = dbab0dbdc826ef666c7747afdfad9eb0af33c888eb376c0059b4ef6675f8c1eb
-SIZE (openresty-lua-nginx-module-v0.9.15-0-g4388b1e.tar.gz) = 520220
-SHA256 (openresty-memc-nginx-module-v0.15-0-g1518da4.tar.gz) = 14cd97e1df875ac81e411e732fcb942e89e538a24f7ca19b13675e8f8e5ce59d
-SIZE (openresty-memc-nginx-module-v0.15-0-g1518da4.tar.gz) = 37931
 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.8.tar.gz) = 4da783986fad73f898a00aa118ada33ea99d83ff065fd11ab3d508a4f63f0920
 SIZE (passenger-5.0.8.tar.gz) = 4964167
-SHA256 (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0.tar.gz) = 460d7b1993752e0020397458a7de5fa000e833e03cd98cff5f29a1f52f074991
-SIZE (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0.tar.gz) = 40707
-SHA256 (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = d5f14e45c6dc0d039ad52ae889775b5af1ff80a1c8edb69361c1581aca5d0b8f
-SIZE (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18416
-SHA256 (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = e0813f2d1e0d499c4f44f7957253c7804ccc0d3a7d4446ac0c6eec834e9c21f4
-SIZE (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 32961
-SHA256 (openresty-redis2-nginx-module-v0.11-0-g828803d.tar.gz) = 8a587cc7e90e33123dc0cd01bdba9e1ff7f1db26ba555e88a0070ea8a90afa29
-SIZE (openresty-redis2-nginx-module-v0.11-0-g828803d.tar.gz) = 28530
-SHA256 (rtmp-nginx-module-v1.1.7.tar.gz) = 7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3
-SIZE (rtmp-nginx-module-v1.1.7.tar.gz) = 519735
-SHA256 (openresty-set-misc-nginx-module-v0.28-0-gf72abf1.tar.gz) = a2644dca302c1903402259446fddd79f21272d4b9c4dbd3d5a5391f8588987a6
-SIZE (openresty-set-misc-nginx-module-v0.28-0-gf72abf1.tar.gz) = 35494
 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76
 SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
-SHA256 (openresty-srcache-nginx-module-v0.29-0-gc521830.tar.gz) = 3d671f7e07b89fa4d8130aec419c3fd3b7e070b09d1fda58468793f0d95364fc
-SIZE (openresty-srcache-nginx-module-v0.29-0-gc521830.tar.gz) = 58867
 SHA256 (nginx_udplog_module-1.0.0.tar.gz) = e0c0bfa524c3a675ad6c08b916d08e57ef45f9818cb8a0d848c2c83785c6e659
 SIZE (nginx_udplog_module-1.0.0.tar.gz) = 6284
-SHA256 (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 136239b8f9ab2fbefb2aabc6897d3f12cc8063ce817901f9b8a624e12fbc6035
-SIZE (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 2714
-SHA256 (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 0199bc3b53269f49073365fe08dc2c02decbaea614dc33db4666c7ab2cdb8bfa
-SIZE (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 10542
-SHA256 (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = bc33d26af3f01882a187b312c27fb547f802eb36eedfa7d2caedf3ed9c424442
-SIZE (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9518
-SHA256 (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = d5b2c42a3b9fd2970107eb74c2226cbbfbad48c89807303db903932d21ff76aa
-SIZE (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = 10580
-SHA256 (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = e90a406a14d5f419bd500e19082da81390e8ba6040926857926f1a899a53379d
-SIZE (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = 12510
+SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0
+SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393
+SHA256 (samizdatco-nginx-http-auth-digest-bd1c86a_GH0.tar.gz) = d3071ca4b70cfd7f437add772a2aa6ab585dafb5d5a2e3f5cc70af74da72acf2
+SIZE (samizdatco-nginx-http-auth-digest-bd1c86a_GH0.tar.gz) = 14458
+SHA256 (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 8467237ca0fae74ca7a32fbd34fc6044df307098415d48068214c9c235695a07
+SIZE (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 65073
+SHA256 (openresty-headers-more-nginx-module-v0.26_GH0.tar.gz) = d6bdc51f9e778a3b23e41a51cae542c1467a1e5e55c1329a7ffc454be084fb6f
+SIZE (openresty-headers-more-nginx-module-v0.26_GH0.tar.gz) = 28028
+SHA256 (arut-nginx-dav-ext-module-v0.0.3_GH0.tar.gz) = d428a0236c933779cb40ac8c91afb19d5c25a376dc3caab825bfd543e1ee530d
+SIZE (arut-nginx-dav-ext-module-v0.0.3_GH0.tar.gz) = 6260
+SHA256 (vkholodkov-nginx-eval-module-1.0.3_GH0.tar.gz) = 849381433a9020ee1162fa6211b047369fde38dc1a8b5de79f03f8fff2407fe2
+SIZE (vkholodkov-nginx-eval-module-1.0.3_GH0.tar.gz) = 5724
+SHA256 (aperezdc-ngx-fancyindex-v0.3.4_GH0.tar.gz) = d7a84e66b3b3571e6a7e2531d00767f4354f85ce2f281d532ace2bcc35035f8b
+SIZE (aperezdc-ngx-fancyindex-v0.3.4_GH0.tar.gz) = 14275
+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 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885
+SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343
+SHA256 (wandenberg-nginx-push-stream-module-0.3.5_GH0.tar.gz) = 8a9e27a79020bf088dd120e528db77398c29db8aa75c962e7e45c8a20451d4f7
+SIZE (wandenberg-nginx-push-stream-module-0.3.5_GH0.tar.gz) = 153122
+SHA256 (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 2814340bf57581a04873e26d773ec216bfceebb1abb87d4904ce314790897b17
+SIZE (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 91878
+SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1
+SIZE (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 16990
+SHA256 (openresty-drizzle-nginx-module-v0.1.8_GH0.tar.gz) = 5aa5a66568bb25af459d37547d14fc7867c970e4f90299895e1fad2cf20751a8
+SIZE (openresty-drizzle-nginx-module-v0.1.8_GH0.tar.gz) = 58891
+SHA256 (simpl-ngx_devel_kit-v0.2.19_GH0.tar.gz) = 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679
+SIZE (simpl-ngx_devel_kit-v0.2.19_GH0.tar.gz) = 65029
+SHA256 (openresty-encrypted-session-nginx-module-v0.03_GH0.tar.gz) = 4d0da617b3122b145dd46ec8618c6248db79c992704b23ed78e01bddf14173d3
+SIZE (openresty-encrypted-session-nginx-module-v0.03_GH0.tar.gz) = 8949
+SHA256 (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = ef843824e0aac1dd60b392802861cc06426a4bc5f87d472c7ee00b1296693f2a
+SIZE (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = 18883
+SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c114433ee783b4b06c0105921a830c9486172
+SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024
+SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270
+SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534
+SHA256 (openresty-lua-nginx-module-v0.9.15_GH0.tar.gz) = 659fe4c201f4a4ae1007fa029cef472aaa837bf0904babb6158f83b86536c5b7
+SIZE (openresty-lua-nginx-module-v0.9.15_GH0.tar.gz) = 520190
+SHA256 (openresty-memc-nginx-module-v0.15_GH0.tar.gz) = cd1999bc5e4441dd23d056202b0423c07b9a9294245147f4cf2ef6edb81b4122
+SIZE (openresty-memc-nginx-module-v0.15_GH0.tar.gz) = 37948
+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
+SIZE (openresty-rds-csv-nginx-module-v0.05_GH0.tar.gz) = 18417
+SHA256 (openresty-rds-json-nginx-module-v0.13_GH0.tar.gz) = fc7d425c727e22420d103e638f531c9ab8adf5f494841d50e9387c51dd3770d0
+SIZE (openresty-rds-json-nginx-module-v0.13_GH0.tar.gz) = 32977
+SHA256 (openresty-redis2-nginx-module-v0.11_GH0.tar.gz) = 877558e21304f413943e3bdf17b97659d8aed7e4bfdfd3ca964921a72de74c05
+SIZE (openresty-redis2-nginx-module-v0.11_GH0.tar.gz) = 28532
+SHA256 (arut-nginx-rtmp-module-v1.1.7_GH0.tar.gz) = 7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3
+SIZE (arut-nginx-rtmp-module-v1.1.7_GH0.tar.gz) = 519735
+SHA256 (openresty-set-misc-nginx-module-v0.28_GH0.tar.gz) = cf06a976785446e0552beb1e11b8dff8a4973f7628935c4d2655812a03ceb60a
+SIZE (openresty-set-misc-nginx-module-v0.28_GH0.tar.gz) = 35431
+SHA256 (openresty-srcache-nginx-module-v0.29_GH0.tar.gz) = 3fa24ecc658864d5286df33914f73fc3b47e6dffcefd2abfa0c7f72ed158af20
+SIZE (openresty-srcache-nginx-module-v0.29_GH0.tar.gz) = 58841
+SHA256 (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = de784142d867a35ecc5443fa347c2903af0935669cdf2eaa9274f5253aac2267
+SIZE (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = 2711
+SHA256 (openresty-xss-nginx-module-v0.04_GH0.tar.gz) = 4e5230a644779b8298063d5c0bd7dc19531496369456d69dc5281ae1cca4d6ec
+SIZE (openresty-xss-nginx-module-v0.04_GH0.tar.gz) = 10536
+SHA256 (openresty-array-var-nginx-module-v0.03_GH0.tar.gz) = f9892ec9a2e872d8aabeb2234d0d4c66cf85b8dbb2ca5c108a20c3d8c2111189
+SIZE (openresty-array-var-nginx-module-v0.03_GH0.tar.gz) = 9520
+SHA256 (calio-form-input-nginx-module-v0.07_GH0.tar.gz) = c0c56cc697a290e98b88d4888bac8828041ef6f3049247d3cd3c63f2808d1e20
+SIZE (calio-form-input-nginx-module-v0.07_GH0.tar.gz) = 10563
+SHA256 (calio-iconv-nginx-module-v0.10_GH0.tar.gz) = 88e326eba7fdf9fd2376b1ba033b48cb0eee45136528cf5430ac9340088ce324
+SIZE (calio-iconv-nginx-module-v0.10_GH0.tar.gz) = 12513
diff --git a/www/nginx/files/extra-patch-calio-iconv-nginx-module-config b/www/nginx/files/extra-patch-calio-iconv-nginx-module-config
index e564d207c3f1..376c5ba8d809 100644
--- a/www/nginx/files/extra-patch-calio-iconv-nginx-module-config
+++ b/www/nginx/files/extra-patch-calio-iconv-nginx-module-config
@@ -1,5 +1,5 @@
---- ../calio-iconv-nginx-module-b37efb5/config.orig	2013-04-16 17:57:17.000000000 -0700
-+++ ../calio-iconv-nginx-module-b37efb5/config	2013-05-01 17:16:28.134624745 -0700
+--- ../iconv-nginx-module-0.10/config.orig	2013-04-16 17:57:17.000000000 -0700
++++ ../iconv-nginx-module-0.10/config	2013-05-01 17:16:28.134624745 -0700
 @@ -39,12 +39,12 @@
      fi
  
diff --git a/www/nginx/files/extra-patch-ngx_http_lua_socket_udp.c b/www/nginx/files/extra-patch-ngx_http_lua_socket_udp.c
index 903a9a4840e8..0761fcc26702 100644
--- a/www/nginx/files/extra-patch-ngx_http_lua_socket_udp.c
+++ b/www/nginx/files/extra-patch-ngx_http_lua_socket_udp.c
@@ -1,5 +1,5 @@
---- ../openresty-lua-nginx-module-4388b1e/src/ngx_http_lua_socket_udp.c.orig	2015-04-21 21:18:31.080702000 +0300
-+++ ../openresty-lua-nginx-module-4388b1e/src/ngx_http_lua_socket_udp.c	2015-04-21 21:18:47.449758000 +0300
+--- ../lua-nginx-module-0.9.15/src/ngx_http_lua_socket_udp.c.orig	2015-04-21 21:18:31.080702000 +0300
++++ ../lua-nginx-module-0.9.15/src/ngx_http_lua_socket_udp.c	2015-04-21 21:18:47.449758000 +0300
 @@ -1400,17 +1400,6 @@
  
      c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
diff --git a/www/nginx/files/extra-patch-ngx_http_notice_module.c b/www/nginx/files/extra-patch-ngx_http_notice_module.c
index feb39a964b23..d62135ed6f9c 100644
--- a/www/nginx/files/extra-patch-ngx_http_notice_module.c
+++ b/www/nginx/files/extra-patch-ngx_http_notice_module.c
@@ -1,5 +1,5 @@
---- ../kr-nginx-notice-3c95966/ngx_http_notice_module.c.orig	2009-07-16 18:37:57.000000000 +0200
-+++ ../kr-nginx-notice-3c95966/ngx_http_notice_module.c	2009-07-16 08:09:38.000000000 +0200
+--- ../nginx-notice-3c95966/ngx_http_notice_module.c.orig	2009-07-16 18:37:57.000000000 +0200
++++ ../nginx-notice-3c95966/ngx_http_notice_module.c	2009-07-16 08:09:38.000000000 +0200
 @@ -153,7 +153,7 @@
          return NGX_HTTP_NOT_ALLOWED;
      }
diff --git a/www/nginx/files/extra-patch-ngx_postgres-config b/www/nginx/files/extra-patch-ngx_postgres-config
index 623edc114c3f..e7440eb360f7 100644
--- a/www/nginx/files/extra-patch-ngx_postgres-config
+++ b/www/nginx/files/extra-patch-ngx_postgres-config
@@ -1,5 +1,5 @@
---- ../FRiCKLE-ngx_postgres-49855a0/config.orig	2015-05-26 20:52:25.649166000 +0300
-+++ ../FRiCKLE-ngx_postgres-49855a0/config	2015-05-26 20:53:10.331122000 +0300
+--- ../ngx_postgres-1.0rc5-1-g49855a0/config.orig	2015-05-26 20:52:25.649166000 +0300
++++ ../ngx_postgres-1.0rc5-1-g49855a0/config	2015-05-26 20:53:10.331122000 +0300
 @@ -48,12 +48,12 @@
  
      if [ $ngx_found = no ]; then
diff --git a/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config b/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config
index 3b623da517fd..263f0cd45df8 100644
--- a/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config
+++ b/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config
@@ -1,5 +1,5 @@
---- ../openresty-drizzle-nginx-module-fba80cf/config.orig	2011-12-30 10:26:53.000000000 +0400
-+++ ../openresty-drizzle-nginx-module-fba80cf/config	2011-12-30 10:28:20.000000000 +0400
+--- ../drizzle-nginx-module-0.1.8/config.orig	2011-12-30 10:26:53.000000000 +0400
++++ ../drizzle-nginx-module-0.1.8/config	2011-12-30 10:28:20.000000000 +0400
 @@ -22,12 +22,12 @@
  
      if [ $ngx_found = no ]; then
diff --git a/www/nginx/files/extra-patch-openresty-set-misc-nginx-module-config b/www/nginx/files/extra-patch-openresty-set-misc-nginx-module-config
index 9d956fdf2fd9..aa206342d3ca 100644
--- a/www/nginx/files/extra-patch-openresty-set-misc-nginx-module-config
+++ b/www/nginx/files/extra-patch-openresty-set-misc-nginx-module-config
@@ -1,5 +1,5 @@
---- ../openresty-set-misc-nginx-module-f72abf1/config.orig       2011-12-09 10:27:53.861265188 +0300
-+++ ../openresty-set-misc-nginx-module-f72abf1/config    2011-12-09 10:28:07.107259301 +0300
+--- ../set-misc-nginx-module-0.28/config.orig       2011-12-09 10:27:53.861265188 +0300
++++ ../set-misc-nginx-module-0.28/config    2011-12-09 10:28:07.107259301 +0300
 @@ -1,10 +1,3 @@
 -if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then
 -    echo "found ngx_devel_kit for ngx_set_misc; looks good."
diff --git a/www/tengine/Makefile b/www/tengine/Makefile
index d1ed2c6f796e..f43f3c59240e 100644
--- a/www/tengine/Makefile
+++ b/www/tengine/Makefile
@@ -265,9 +265,10 @@ CONFIGURE_ARGS+=--dso-path=${ETCDIR}/modules \
 
 .if ${PORT_OPTIONS:MHTTP_ACCEPT_LANGUAGE}
 GIT_ACCEPT_LANGUAGE_VERSION=	2f69842
-MASTER_SITES+=	https://github.com/giom/nginx_accept_language_module/tarball/master/:accept_language
-DISTFILES+=	giom-nginx_accept_language_module-${GIT_ACCEPT_LANGUAGE_VERSION}.tar.gz:accept_language
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/giom-nginx_accept_language_module-${GIT_ACCEPT_LANGUAGE_VERSION}
+GH_ACCOUNT+=	giom:accept_language
+GH_PROJECT+=	nginx_accept_language_module:accept_language
+GH_TAGNAME+=	${GIT_ACCEPT_LANGUAGE_VERSION}:accept_language
+CONFIGURE_ARGS+=--add-module=${WRKSRC_accept_language}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
@@ -279,9 +280,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_DIGEST}
 GIT_AUTH_DIGEST_VERSION=	bd1c86a
-MASTER_SITES+=	https://github.com/samizdatco/nginx-http-auth-digest/tarball/master/:auth_digest
-DISTFILES+=	samizdatco-nginx-http-auth-digest-${GIT_AUTH_DIGEST_VERSION}.tar.gz:auth_digest
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/samizdatco-nginx-http-auth-digest-${GIT_AUTH_DIGEST_VERSION}
+GH_ACCOUNT+=	samizdatco:auth_digest
+GH_PROJECT+=	nginx-http-auth-digest:auth_digest
+GH_TAGNAME+=	${GIT_AUTH_DIGEST_VERSION}:auth_digest
+CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_digest}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_GZIP_STATIC}
@@ -324,18 +326,18 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_VERSI
 
 .if ${PORT_OPTIONS:MECHO}
 NGINX_ECHO_VERSION=	0.50
-GIT_ECHO_VERSION=	0-gf827a4f
-MASTER_SITES+=	https://github.com/openresty/echo-nginx-module/tarball/v${NGINX_ECHO_VERSION}/:echo
-DISTFILES+=	openresty-echo-nginx-module-v${NGINX_ECHO_VERSION}-${GIT_ECHO_VERSION}.tar.gz:echo
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-echo-nginx-module-${GIT_ECHO_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:echo
+GH_PROJECT+=	echo-nginx-module:echo
+GH_TAGNAME+=	v${NGINX_ECHO_VERSION}:echo
+CONFIGURE_ARGS+=--add-module=${WRKSRC_echo}
 .endif
 
 .if ${PORT_OPTIONS:MHEADERS_MORE}
 NGINX_HEADERS_MORE_VERSION=	0.24
-GIT_HEADERS_MORE_VERSION=	0-g7a6fd11
-MASTER_SITES+=	https://github.com/openresty/headers-more-nginx-module/tarball/v${NGINX_HEADERS_MORE_VERSION}/:headers_more
-DISTFILES+=	openresty-headers-more-nginx-module-v${NGINX_HEADERS_MORE_VERSION}-${GIT_HEADERS_MORE_VERSION}.tar.gz:headers_more
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-headers-more-nginx-module-${GIT_HEADERS_MORE_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:headers_more
+GH_PROJECT+=	headers-more-nginx-module:headers_more
+GH_TAGNAME+=	v${NGINX_HEADERS_MORE_VERSION}:headers_more
+CONFIGURE_ARGS+=--add-module=${WRKSRC_headers_more}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_DAV}
@@ -345,19 +347,19 @@ CONFIGURE_ARGS+=--with-http_dav_module
 .if ${PORT_OPTIONS:MHTTP_DAV_EXT}
 LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2
 NGINX_DAV_EXT_VERSION=	0.0.2
-GIT_DAV_EXT_VERSION=	0-g0e07a3e
-MASTER_SITES+=	https://github.com/arut/nginx-dav-ext-module/tarball/v${NGINX_DAV_EXT_VERSION}/:dav_ext
-DISTFILES+=	arut-nginx-dav-ext-module-v${NGINX_DAV_EXT_VERSION}-${GIT_DAV_EXT_VERSION}.tar.gz:dav_ext
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/arut-nginx-dav-ext-module-${GIT_DAV_EXT_VERSION:S/^0-g//} \
+GH_ACCOUNT+=	arut:dav_ext
+GH_PROJECT+=	nginx-dav-ext-module:dav_ext
+GH_TAGNAME+=	v${NGINX_DAV_EXT_VERSION}:dav_ext
+CONFIGURE_ARGS+=--add-module=${WRKSRC_dav_ext} \
 		--with-http_dav_module
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_EVAL}
 NGINX_EVAL_VERSION=	1.0.3
-GIT_EVAL_VERSION=	0-g125fa2e
-MASTER_SITES+=	https://github.com/vkholodkov/nginx-eval-module/tarball/${NGINX_EVAL_VERSION}/:eval
-DISTFILES+=	vkholodkov-nginx-eval-module-${NGINX_EVAL_VERSION}-${GIT_EVAL_VERSION}.tar.gz:eval
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/vkholodkov-nginx-eval-module-${GIT_EVAL_VERSION:S/^0-g//}
+GH_ACCOUNT+=	vkholodkov:eval
+GH_PROJECT+=	nginx-eval-module:eval
+GH_TAGNAME+=	${NGINX_EVAL_VERSION}:eval
+CONFIGURE_ARGS+=--add-module=${WRKSRC_eval}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_FANCYINDEX}
@@ -379,10 +381,11 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_mogilefs_module-${NGINX_MOGILEFS_VE
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_NOTICE}
-GIT_NOTICE_VERSION=	0-g3c95966
-MASTER_SITES+=	https://github.com/kr/nginx-notice/tarball/master/:notice
-DISTFILES+=	kr-nginx-notice-${GIT_NOTICE_VERSION}.tar.gz:notice
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/kr-nginx-notice-${GIT_NOTICE_VERSION:S/^0-g//}
+GIT_NOTICE_VERSION=	3c95966
+GH_ACCOUNT+=	kr:notice
+GH_PROJECT+=	nginx-notice:notice
+GH_TAGNAME+=	${GIT_NOTICE_VERSION}:notice
+CONFIGURE_ARGS+=--add-module=${WRKSRC_notice}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_notice_module.c
 .endif
 
@@ -401,10 +404,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_http_push_module-${NGINX_PUSH_VERSI
 
 .if ${PORT_OPTIONS:MHTTP_PUSH_STREAM}
 NGINX_PUSH_STREAM_VERSION=	0.3.5
-GIT_PUSH_STREAM_VERSION=	0-gb6a8c46
-MASTER_SITES+=	https://github.com/wandenberg/nginx-push-stream-module/tarball/${NGINX_PUSH_STREAM_VERSION}/:pushstream
-DISTFILES+=	wandenberg-nginx-push-stream-module-${NGINX_PUSH_STREAM_VERSION}-${GIT_PUSH_STREAM_VERSION}.tar.gz:pushstream
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/wandenberg-nginx-push-stream-module-${GIT_PUSH_STREAM_VERSION:S/^0-g//}
+GH_ACCOUNT+=	wandenberg:pushstream
+GH_PROJECT+=	nginx-push-stream-module:pushstream
+GH_TAGNAME+=	${NGINX_PUSH_STREAM_VERSION}:pushstream
+CONFIGURE_ARGS+=--add-module=${WRKSRC_pushstream}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_REALIP}
@@ -438,10 +441,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upload_module-${NGINX_UPLOAD_VERSIO
 
 .if ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS}
 NGINX_UPLOADPROGRESS_VERSION=	0.9.0
-GIT_UPLOADPROGRESS_VERSION=	0-ga788dea
-MASTER_SITES+=	https://github.com/masterzen/nginx-upload-progress-module/tarball/v${NGINX_UPLOADPROGRESS_VERSION}/:uploadprogress
-DISTFILES+=	masterzen-nginx-upload-progress-module-v${NGINX_UPLOADPROGRESS_VERSION}-${GIT_UPLOADPROGRESS_VERSION}.tar.gz:uploadprogress
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${GIT_UPLOADPROGRESS_VERSION:S/^0-g//}
+GH_ACCOUNT+=	masterzen:uploadprogress
+GH_PROJECT+=	nginx-upload-progress-module:uploadprogress
+GH_TAGNAME+=	v${NGINX_UPLOADPROGRESS_VERSION}:uploadprogress
+CONFIGURE_ARGS+=--add-module=${WRKSRC_uploadprogress}
 .endif
 
 .if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) || !empty(PORT_OPTIONS:MSUPERVISORD)
@@ -459,10 +462,10 @@ LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 			libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
 			libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 NGINX_VIDEO_THUMBEXTRACTOR_VERSION=	0.2.0
-GIT_VIDEO_THUMBEXTRACTOR_VERSION=	0-g9406457
-MASTER_SITES+=	https://github.com/wandenberg/nginx-video-thumbextractor-module/tarball/${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}/:videothumbextractor
-DISTFILES+=	wandenberg-nginx-video-thumbextractor-module-${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}-${GIT_VIDEO_THUMBEXTRACTOR_VERSION}.tar.gz:videothumbextractor
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/wandenberg-nginx-video-thumbextractor-module-${GIT_VIDEO_THUMBEXTRACTOR_VERSION:S/^0-g//} \
+GH_ACCOUNT+=	wandenberg:videothumbextractor
+GH_PROJECT+=	nginx-video-thumbextractor-module:videothumbextractor
+GH_TAGNAME+=	${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}:videothumbextractor
+CONFIGURE_ARGS+=--add-module=${WRKSRC_videothumbextractor} \
 			--with-cc-opt="-I ${LOCALBASE}/include -I ${LOCALBASE}/include/ImageMagick"
 .endif
 
@@ -476,56 +479,53 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}
 .if ${PORT_OPTIONS:MDRIZZLE}
 LIB_DEPENDS+=	libdrizzle.so:${PORTSDIR}/databases/libdrizzle
 NGINX_DRIZZLE_VERSION=	0.1.6
-GIT_DRIZZLE_VERSION=	0-ge6937ba
-MASTER_SITES+=	https://github.com/chaoslawful/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
-DISTFILES+=	chaoslawful-drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}
+GH_ACCOUNT+=	chaoslawful:drizzle
+GH_PROJECT+=	drizzle-nginx-module:drizzle
+GH_TAGNAME+=	v${NGINX_DRIZZLE_VERSION}:drizzle
+CONFIGURE_ARGS+=--add-module=${WRKSRC_drizzle}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module-config
 .endif
 
 .if ${PORT_OPTIONS:MARRAYVAR} || ${PORT_OPTIONS:MENCRYPTSESSION} || ${PORT_OPTIONS:MFORMINPUT} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MSET_MISC}
 WITH_HTTP_REWRITE=	yes
 NGINX_DEVEL_KIT_VERSION=	0.2.19
-GIT_DEVEL_KIT_VERSION=	0-g8dd0df5
-MASTER_SITES+=	https://github.com/simpl/ngx_devel_kit/tarball/v${NGINX_DEVEL_KIT_VERSION}/:devel_kit
-DISTFILES+=	simpl-ngx_devel_kit-v${NGINX_DEVEL_KIT_VERSION}-${GIT_DEVEL_KIT_VERSION}.tar.gz:devel_kit
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/simpl-ngx_devel_kit-${GIT_DEVEL_KIT_VERSION:S/^0-g//}
+GH_ACCOUNT+=	simpl:devel_kit
+GH_PROJECT+=	ngx_devel_kit:devel_kit
+GH_TAGNAME+=	v${NGINX_DEVEL_KIT_VERSION}:devel_kit
+CONFIGURE_ARGS+=--add-module=${WRKSRC_devel_kit}
 .endif
 
 .if ${PORT_OPTIONS:MENCRYPTSESSION}
 NGINX_ENCRYPTSESSION_VERSION=	0.03
-GIT_ENCRYPTSESSION_VERSION=	0-g49d741b
-MASTER_SITES+=	https://github.com/openresty/encrypted-session-nginx-module/tarball/v${NGINX_ENCRYPTSESSION_VERSION}/:encryptsession
-DISTFILES+=	openresty-encrypted-session-nginx-module-v${NGINX_ENCRYPTSESSION_VERSION}-${GIT_ENCRYPTSESSION_VERSION}.tar.gz:encryptsession
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-encrypted-session-nginx-module-${GIT_ENCRYPTSESSION_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:encryptsession
+GH_PROJECT+=	encrypted-session-nginx-module:encryptsession
+GH_TAGNAME+=	v${NGINX_ENCRYPTSESSION_VERSION}:encryptsession
+CONFIGURE_ARGS+=--add-module=${WRKSRC_encryptsession}
 .endif
 
 .if ${PORT_OPTIONS:MGRIDFS}
 NGINX_GRIDFS_VERSION=	0.8
-GIT_GRIDFS_VERSION=	0-gb5f8113
 MONGO_C_DRIVER_VERSION=		0.3.1
-GIT_MONGO_C_DRIVER_VERSION=	0-g9b4b232
-MASTER_SITES+=	https://github.com/mdirolf/nginx-gridfs/tarball/v${NGINX_GRIDFS_VERSION}/:gridfs
-MASTER_SITES+=	https://github.com/mongodb/mongo-c-driver/tarball/v${MONGO_C_DRIVER_VERSION}/:mongo_c
-DISTFILES+=	mdirolf-nginx-gridfs-v${NGINX_GRIDFS_VERSION}-${GIT_GRIDFS_VERSION}.tar.gz:gridfs
-DISTFILES+=	mongodb-mongo-c-driver-v${MONGO_C_DRIVER_VERSION}-${GIT_MONGO_C_DRIVER_VERSION}.tar.gz:mongo_c
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}
+GH_ACCOUNT+=	mdirolf:gridfs mongodb:mongo_c
+GH_PROJECT+=	nginx-gridfs:gridfs mongo-c-driver:mongo_c
+GH_TAGNAME+=	v${NGINX_GRIDFS_VERSION}:gridfs v${MONGO_C_DRIVER_VERSION}:mongo_c
+CONFIGURE_ARGS+=--add-module=${WRKSRC_gridfs}
 .endif
 
 .if ${PORT_OPTIONS:MLET}
 NGINX_LET_VERSION=	0.0.4
-GIT_LET_VERSION=	0-ga5e1dc5
-MASTER_SITES+=	https://github.com/arut/nginx-let-module/tarball/v${NGINX_LET_VERSION}/:let
-DISTFILES+=	arut-nginx-let-module-v${NGINX_LET_VERSION}-${GIT_LET_VERSION}.tar.gz:let
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/arut-nginx-let-module-${GIT_LET_VERSION:S/^0-g//}
+GH_ACCOUNT+=	arut:let
+GH_PROJECT+=	nginx-let-module:let
+GH_TAGNAME+=	v${NGINX_LET_VERSION}:let
+CONFIGURE_ARGS+=--add-module=${WRKSRC_let}
 .endif
 
 .if ${PORT_OPTIONS:MMEMC}
 NGINX_MEMC_VERSION=	0.14
-GIT_MEMC_VERSION=	0-gde4cf86
-MASTER_SITES+=	https://github.com/openresty/memc-nginx-module/tarball/v${NGINX_MEMC_VERSION}/:memc
-DISTFILES+=	openresty-memc-nginx-module-v${NGINX_MEMC_VERSION}-${GIT_MEMC_VERSION}.tar.gz:memc
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-memc-nginx-module-${GIT_MEMC_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:memc
+GH_PROJECT+=	memc-nginx-module:memc
+GH_TAGNAME+=	v${NGINX_MEMC_VERSION}:memc
+CONFIGURE_ARGS+=--add-module=${WRKSRC_memc}
 .endif
 
 .if ${PORT_OPTIONS:MMODSECURITY}
@@ -556,41 +556,42 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres-config
 
 .if ${PORT_OPTIONS:MRDS_CSV}
 NGINX_RDS_CSV_VERSION=	0.05
-GIT_RDS_CSV_VERSION=	0-g607e26b
-MASTER_SITES+=	https://github.com/openresty/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_VERSION}/:rdscsv
-DISTFILES+=	openresty-rds-csv-nginx-module-v${NGINX_RDS_CSV_VERSION}-${GIT_RDS_CSV_VERSION}.tar.gz:rdscsv
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-csv-nginx-module-${GIT_RDS_CSV_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:rdscsv
+GH_PROJECT+=	rds-csv-nginx-module:rdscsv
+GH_TAGNAME+=	v${NGINX_RDS_CSV_VERSION}:rdscsv
+CONFIGURE_ARGS+=--add-module=${WRKSRC_rdscsv}
 .endif
 
 .if ${PORT_OPTIONS:MRDS_JSON}
 NGINX_RDS_JSON_VERSION=	0.13
-GIT_RDS_JSON_VERSION=	0-g8292070
-MASTER_SITES+=	https://github.com/openresty/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_VERSION}/:rdsjson
-DISTFILES+=	openresty-rds-json-nginx-module-v${NGINX_RDS_JSON_VERSION}-${GIT_RDS_JSON_VERSION}.tar.gz:rdsjson
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-json-nginx-module-${GIT_RDS_JSON_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:rdsjson
+GH_PROJECT+=	rds-json-nginx-module:rdsjson
+GH_TAGNAME+=	v${NGINX_RDS_JSON_VERSION}:rdsjson
+CONFIGURE_ARGS+=--add-module=${WRKSRC_rdsjson}
 .endif
 
 .if ${PORT_OPTIONS:MREDIS2}
 NGINX_REDIS2_VERSION=	0.10
-GIT_REDIS2_VERSION=	0-g78a7622
-MASTER_SITES+=	https://github.com/openresty/redis2-nginx-module/tarball/v${NGINX_REDIS2_VERSION}/:redis2
-DISTFILES+=	openresty-redis2-nginx-module-v${NGINX_REDIS2_VERSION}-${GIT_REDIS2_VERSION}.tar.gz:redis2
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-redis2-nginx-module-${GIT_REDIS2_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:redis2
+GH_PROJECT+=	redis2-nginx-module:redis2
+GH_TAGNAME+=	v${NGINX_REDIS2_VERSION}:redis2
+CONFIGURE_ARGS+=--add-module=${WRKSRC_redis2}
 .endif
 
 .if ${PORT_OPTIONS:MRTMP}
 NGINX_RTMP_VERSION=	1.0.8
-MASTER_SITES+=	https://github.com/arut/nginx-rtmp-module/archive/v${NGINX_RTMP_VERSION}/:rtmp
-DISTFILES+=	rtmp-nginx-module-v${NGINX_RTMP_VERSION}.tar.gz:rtmp
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-rtmp-module-${NGINX_RTMP_VERSION}
+GH_ACCOUNT+=	arut:rtmp
+GH_PROJECT+=	nginx-rtmp-module:rtmp
+GH_TAGNAME+=	v${NGINX_RTMP_VERSION}:rtmp
+CONFIGURE_ARGS+=--add-module=${WRKSRC_rtmp}
 .endif
 
 .if ${PORT_OPTIONS:MSET_MISC}
 NGINX_SET_MISC_VERSION=	0.23
-GIT_SET_MISC_VERSION=	0-g6ce586e
-MASTER_SITES+=	https://github.com/openresty/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc
-DISTFILES+=	openresty-set-misc-nginx-module-v${NGINX_SET_MISC_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:setmisc
+GH_PROJECT+=	set-misc-nginx-module:setmisc
+GH_TAGNAME+=	v${NGINX_SET_MISC_VERSION}:setmisc
+CONFIGURE_ARGS+=--add-module=${WRKSRC_setmisc}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-openresty-set-misc-nginx-module-config
 .endif
 
@@ -612,10 +613,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VER
 
 .if ${PORT_OPTIONS:MSRCACHE}
 NGINX_SRCACHE_VERSION=	0.24
-GIT_SRCACHE_VERSION=	0-g33f0f29
-MASTER_SITES+=	https://github.com/openresty/srcache-nginx-module/tarball/v${NGINX_SRCACHE_VERSION}/:srcache
-DISTFILES+=	openresty-srcache-nginx-module-v${NGINX_SRCACHE_VERSION}-${GIT_SRCACHE_VERSION}.tar.gz:srcache
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-srcache-nginx-module-${GIT_SRCACHE_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:srcache
+GH_PROJECT+=	srcache-nginx-module:srcache
+GH_TAGNAME+=	v${NGINX_SRCACHE_VERSION}:srcache
+CONFIGURE_ARGS+=--add-module=${WRKSRC_srcache}
 .endif
 
 .if ${PORT_OPTIONS:MSUPERVISORD}
@@ -627,25 +628,26 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_VERSI
 
 .if ${PORT_OPTIONS:MTCP_PROXY}
 NGINX_TCP_PROXY_VERSION=	0.26
-GIT_TCP_PROXY_VERSION=	0-gb83e5a6
-MASTER_SITES+=	https://github.com/yaoweibin/nginx_tcp_proxy_module/tarball/v${NGINX_TCP_PROXY_VERSION}/:tcp_proxy
-DISTFILES+=	yaoweibin-nginx_tcp_proxy_module-v${NGINX_TCP_PROXY_VERSION}-${GIT_TCP_PROXY_VERSION}.tar.gz:tcp_proxy
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/yaoweibin-nginx_tcp_proxy_module-${GIT_TCP_PROXY_VERSION:S/^0-g//}
+GH_ACCOUNT+=	yaoweibin:tcp_proxy
+GH_PROJECT+=	nginx_tcp_proxy_module:tcp_proxy
+GH_TAGNAME+=	v${NGINX_TCP_PROXY_VERSION}:tcp_proxy
+CONFIGURE_ARGS+=--add-module=${WRKSRC_tcp_proxy}
 .endif
 
 .if ${PORT_OPTIONS:MXRID_HEADER}
 GIT_XRID_VERSION=	0daa3cc
-MASTER_SITES+=	https://github.com/gabor/nginx-x-rid-header/tarball/master/:xrid
-DISTFILES+=	gabor-nginx-x-rid-header-${GIT_XRID_VERSION}.tar.gz:xrid
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/gabor-nginx-x-rid-header-${GIT_XRID_VERSION}
+GH_ACCOUNT+=	gabor:xrid
+GH_PROJECT+=	nginx-x-rid-header:xrid
+GH_TAGNAME+=	master:xrid
+CONFIGURE_ARGS+=--add-module=${WRKSRC_xrid}
 .endif
 
 .if ${PORT_OPTIONS:MXSS}
 NGINX_XSS_VERSION=	0.04
-GIT_XSS_VERSION=	0-g7e37038
-MASTER_SITES+=	https://github.com/openresty/xss-nginx-module/tarball/v${NGINX_XSS_VERSION}/:xss
-DISTFILES+=	openresty-xss-nginx-module-v${NGINX_XSS_VERSION}-${GIT_XSS_VERSION}.tar.gz:xss
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-xss-nginx-module-${GIT_XSS_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:xss
+GH_PROJECT+=	xss-nginx-module:xss
+GH_TAGNAME+=	v${NGINX_XSS_VERSION}:xss
+CONFIGURE_ARGS+=--add-module=${WRKSRC_xss}
 .endif
 
 .if ${PORT_OPTIONS:MSPDY}
@@ -692,27 +694,27 @@ CONFIGURE_ARGS+=--with-mail_ssl_module
 
 .if ${PORT_OPTIONS:MARRAYVAR}
 NGINX_ARRAYVAR_VERSION=	0.03
-GIT_ARRAYVAR_VERSION=	0-g4676747
-MASTER_SITES+=	https://github.com/openresty/array-var-nginx-module/tarball/v${NGINX_ARRAYVAR_VERSION}/:arrayvar
-DISTFILES+=	openresty-array-var-nginx-module-v${NGINX_ARRAYVAR_VERSION}-${GIT_ARRAYVAR_VERSION}.tar.gz:arrayvar
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-array-var-nginx-module-${GIT_ARRAYVAR_VERSION:S/^0-g//}
+GH_ACCOUNT+=	openresty:arrayvar
+GH_PROJECT+=	array-var-nginx-module:arrayvar
+GH_TAGNAME+=	v${NGINX_ARRAYVAR_VERSION}:arrayvar
+CONFIGURE_ARGS+=--add-module=${WRKSRC_arrayvar}
 .endif
 
 .if ${PORT_OPTIONS:MFORMINPUT}
 NGINX_FORMINPUT_VERSION=	0.07
-GIT_FORMINPUT_VERSION=		0-g78de845
-MASTER_SITES+=	https://github.com/calio/form-input-nginx-module/tarball/v${NGINX_FORMINPUT_VERSION}/:forminput
-DISTFILES+=	calio-form-input-nginx-module-v${NGINX_FORMINPUT_VERSION}-${GIT_FORMINPUT_VERSION}.tar.gz:forminput
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/calio-form-input-nginx-module-${GIT_FORMINPUT_VERSION:S/^0-g//}
+GH_ACCOUNT+=	calio:forminput
+GH_PROJECT+=	form-input-nginx-module:forminput
+GH_TAGNAME+=	v${NGINX_FORMINPUT_VERSION}:forminput
+CONFIGURE_ARGS+=--add-module=${WRKSRC_forminput}
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
 USES+=		iconv
 NGINX_ICONV_VERSION=	0.10
-GIT_ICONV_VERSION=	0-gb37efb5
-MASTER_SITES+=	https://github.com/calio/iconv-nginx-module/tarball/v${NGINX_ICONV_VERSION}/:iconv
-DISTFILES+=	calio-iconv-nginx-module-v${NGINX_ICONV_VERSION}-${GIT_ICONV_VERSION}.tar.gz:iconv
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/calio-iconv-nginx-module-${GIT_ICONV_VERSION:S/^0-g//}
+GH_ACCOUNT+=	calio:iconv
+GH_PROJECT+=	iconv-nginx-module:iconv
+GH_TAGNAME+=	v${NGINX_ICONV_VERSION}:iconv
+CONFIGURE_ARGS+=--add-module=${WRKSRC_iconv}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
 .endif
 
@@ -755,10 +757,8 @@ pre-everything::
 
 post-extract:
 .if ${PORT_OPTIONS:MGRIDFS}
-	@${RMDIR} ${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}/mongo-c-driver/
-	@${MV} \
-	${WRKDIR}/mongodb-mongo-c-driver-${GIT_MONGO_C_DRIVER_VERSION:S/^0-g//}/ \
-	${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}/mongo-c-driver/
+	@${RMDIR} ${WRKSRC_gridfs}/mongo-c-driver/
+	@${MV} ${WRKSRC_mongo_c} ${WRKSRC_gridfs}/mongo-c-driver/
 .endif
 
 post-patch:
@@ -779,13 +779,13 @@ post-patch:
 .if ${PORT_OPTIONS:MDRIZZLE}
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
-		${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/config
+		${WRKSRC_drizzle}/config
 .endif
 # Respect CFLAGS by remove needless --std=c99 flag
 .if ${PORT_OPTIONS:MGRIDFS}
 	@${REINPLACE_CMD} \
 		's!--std=c99!-DMONGO_HAVE_STDINT!' \
-		${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}/config
+		${WRKSRC_gridfs}/config
 .endif
 .if ${PORT_OPTIONS:MPOSTGRES}
 	@${REINPLACE_CMD} \
@@ -800,7 +800,7 @@ post-patch:
 .if ${PORT_OPTIONS:MSPDY}
 .if ${PORT_OPTIONS:MDRIZZLE}
 	@${REINPLACE_CMD} '584d' \
-		${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/src/ngx_http_drizzle_util.c
+		${WRKSRC_drizzle}/src/ngx_http_drizzle_util.c
 .endif
 .endif
 .if ${PORT_OPTIONS:MSUPERVISORD}
@@ -814,12 +814,12 @@ post-patch:
 .if ${PORT_OPTIONS:MTCP_PROXY}
 	( cd ${WRKSRC} && \
 		${PATCH} -p1 < \
-			${WRKDIR}/yaoweibin-nginx_tcp_proxy_module-${GIT_TCP_PROXY_VERSION:S/^0-g//}/tcp.patch )
+			${WRKSRC_tcp_proxy}/tcp.patch )
 .endif
 .if ${PORT_OPTIONS:MICONV}
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
-		${WRKDIR}/calio-iconv-nginx-module-${GIT_ICONV_VERSION:S/^0-g//}/config
+		${WRKSRC_iconv}/config
 .endif
 .if ${PORT_OPTIONS:MMODSECURITY}
 	@${REINPLACE_CMD} \
diff --git a/www/tengine/distinfo b/www/tengine/distinfo
index 67d2f0f0cf11..290f19acca3b 100644
--- a/www/tengine/distinfo
+++ b/www/tengine/distinfo
@@ -1,11 +1,7 @@
 SHA256 (alibaba-tengine-tengine-2.0.3_GH0.tar.gz) = c33b2769f2ff3a755606587e26c73598d982cbf86c89838131b0c053a140b0d0
 SIZE (alibaba-tengine-tengine-2.0.3_GH0.tar.gz) = 1534005
-SHA256 (giom-nginx_accept_language_module-2f69842.tar.gz) = fbcdf792160a1eff7b9549aeb5209d6e76716ff8e86b05e42c90b2d2f858e011
-SIZE (giom-nginx_accept_language_module-2f69842.tar.gz) = 3399
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
 SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632
-SHA256 (samizdatco-nginx-http-auth-digest-bd1c86a.tar.gz) = e223f55fd97e56425e232d8698e024707d1b2ed3714eff7d91a4d1ca76b4cbee
-SIZE (samizdatco-nginx-http-auth-digest-bd1c86a.tar.gz) = 14454
 SHA256 (http_auth_ldap-c4dc7c9153.tar.gz) = ac082a36afdbcfd883303bc2b1aaea5f2b4d2a772ad8eec9ecf3328e81300e1a
 SIZE (http_auth_ldap-c4dc7c9153.tar.gz) = 5323
 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9
@@ -14,83 +10,89 @@ SHA256 (ngx_http_auth_request_module-0.2.tar.gz) = eea5d0ec02bba93d0b204a034230c
 SIZE (ngx_http_auth_request_module-0.2.tar.gz) = 6736
 SHA256 (ngx_cache_purge-2.1.tar.gz) = 424005af0c04e59ffa65a65e446081d4f95ee76a801a7555e001c67810bcb3b9
 SIZE (ngx_cache_purge-2.1.tar.gz) = 10535
-SHA256 (openresty-echo-nginx-module-v0.50-0-gf827a4f.tar.gz) = 3bce25d45b81a9d0c44b918b8566b4b43b77ef877f5f6cde3175df82fd1bf097
-SIZE (openresty-echo-nginx-module-v0.50-0-gf827a4f.tar.gz) = 62916
-SHA256 (openresty-headers-more-nginx-module-v0.24-0-g7a6fd11.tar.gz) = e8575a05ffcb9887a6c0124d7db2dad53d475e733b9ce9f4507e40e5428f86ce
-SIZE (openresty-headers-more-nginx-module-v0.24-0-g7a6fd11.tar.gz) = 27673
-SHA256 (arut-nginx-dav-ext-module-v0.0.2-0-g0e07a3e.tar.gz) = a0d6fa256e354ce48c06e1f689d26ebb2f7b75f71ce682e34ae6c29331a7fbff
-SIZE (arut-nginx-dav-ext-module-v0.0.2-0-g0e07a3e.tar.gz) = 6065
-SHA256 (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 945046c42d973be9293e03ab41e3a0e04677524b2cd813cfc5146cf1d2f0ab8f
-SIZE (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 5727
 SHA256 (ngx-fancyindex-0.3.1.tar.gz) = 877e383c6bc06be92abb88f5ac251a165b63feb5f4828d52a554efc19a3f7c7d
 SIZE (ngx-fancyindex-0.3.1.tar.gz) = 13071
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
 SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
-SHA256 (kr-nginx-notice-0-g3c95966.tar.gz) = bb0b8c603b2df206aeb13100fb60c1328aa6a69d0ac7f411e5dabe8fdb2affce
-SIZE (kr-nginx-notice-0-g3c95966.tar.gz) = 3348
 SHA256 (nginx_http_push_module-0.692.tar.gz) = 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
 SIZE (nginx_http_push_module-0.692.tar.gz) = 29119
-SHA256 (wandenberg-nginx-push-stream-module-0.3.5-0-gb6a8c46.tar.gz) = f2c5b2cc3430f023442381b734a1e547dd2ba75a05cd34f2cdcf2431acc4f77e
-SIZE (wandenberg-nginx-push-stream-module-0.3.5-0-gb6a8c46.tar.gz) = 153187
-SHA256 (wandenberg-nginx-video-thumbextractor-module-0.2.0-0-g9406457.tar.gz) = 8c39593b7a16003cad5d071df96dcf451fe41d64ba5dbf658e26e7b4684528ff
-SIZE (wandenberg-nginx-video-thumbextractor-module-0.2.0-0-g9406457.tar.gz) = 8812
 SHA256 (ngx_http_redis-0.3.7.tar.gz) = 9dfc14db81f431fdf3d69f3661a37daf110aef5f9479aa7c88cf362bb5d62604
 SIZE (ngx_http_redis-0.3.7.tar.gz) = 12165
 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
 SIZE (ngx_http_response-0.3.tar.gz) = 2244
 SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805
 SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796
-SHA256 (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2
-SIZE (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 17020
 SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b
 SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024
 SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
-SHA256 (chaoslawful-drizzle-nginx-module-v0.1.6-0-ge6937ba.tar.gz) = ec04631c6a1fe75329a831511c5693520bb2bfdedfb3ccc9de4b6a390bc2ba9c
-SIZE (chaoslawful-drizzle-nginx-module-v0.1.6-0-ge6937ba.tar.gz) = 61351
-SHA256 (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 9a8c372f8e750d33018d9587d288c17f755e8da38592bca8ef9bf9ea4bab59a7
-SIZE (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 65033
-SHA256 (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 0c8b74f2fbe6114f6d59fecbf3539f5d13944f40895d1c379fdb5dfb0838c1e3
-SIZE (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 8954
-SHA256 (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = f55617873c9b123d610d59e4da52703c07be0bae5c719ef0cc3d45a53480d29c
-SIZE (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = 18882
-SHA256 (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = bfcdd60c6b53bd499e2bf22fefc96848de37e7d57dfaf7303bb00376dcb812f0
-SIZE (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = 53033
-SHA256 (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 9253581f11966329f64b4b4a49a2a60798665812f9007222592586e64bcd66da
-SIZE (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 20543
-SHA256 (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = b60fed5921a0c19c6ffe71e5c764193283dbe635bb3bad6febd6655f94a633e9
-SIZE (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 37756
 SHA256 (modsecurity-apache_2.7.5.tar.gz) = 9e907536278d8da80d3dbb29aeffe9c4ec37ce9b641035b2da64e993135647a2
 SIZE (modsecurity-apache_2.7.5.tar.gz) = 1045387
 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
 SIZE (ngx_postgres-0.9.tar.gz) = 41022
-SHA256 (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = d5f14e45c6dc0d039ad52ae889775b5af1ff80a1c8edb69361c1581aca5d0b8f
-SIZE (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18416
-SHA256 (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = e0813f2d1e0d499c4f44f7957253c7804ccc0d3a7d4446ac0c6eec834e9c21f4
-SIZE (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 32961
-SHA256 (openresty-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 76606bf3b548b072f8a6426033c115d013c52068f174f61d21c671435087e97d
-SIZE (openresty-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 29850
-SHA256 (rtmp-nginx-module-v1.0.8.tar.gz) = e905e40d1a1b81c720f1e799bee6a3525efaa6f2519212130d39eed3b8877c74
-SIZE (rtmp-nginx-module-v1.0.8.tar.gz) = 513086
-SHA256 (openresty-set-misc-nginx-module-v0.23-0-g6ce586e.tar.gz) = 23fadb942f64775bfa7b568d52f8adab01260c8ad95bbeb44af8e7ea5b87e349
-SIZE (openresty-set-misc-nginx-module-v0.23-0-g6ce586e.tar.gz) = 40336
 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76
 SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
-SHA256 (openresty-srcache-nginx-module-v0.24-0-g33f0f29.tar.gz) = dbf003980f39ff8f21b304a5463691746b9adc9d2e745d0de809c5b1713246cd
-SIZE (openresty-srcache-nginx-module-v0.24-0-g33f0f29.tar.gz) = 67245
 SHA256 (ngx_supervisord-1.4.tar.gz) = 0954a4efb1b955692acf523e169221146d6aa93ad1643c9f2482f75a1fbf9e3b
 SIZE (ngx_supervisord-1.4.tar.gz) = 19351
-SHA256 (yaoweibin-nginx_tcp_proxy_module-v0.26-0-gb83e5a6.tar.gz) = 4d843b8d0511b269382938ba5546f902ec24dbfa76c12f6bd6961d7aaaf3866a
-SIZE (yaoweibin-nginx_tcp_proxy_module-v0.26-0-gb83e5a6.tar.gz) = 127346
-SHA256 (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 136239b8f9ab2fbefb2aabc6897d3f12cc8063ce817901f9b8a624e12fbc6035
-SIZE (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 2714
-SHA256 (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 0199bc3b53269f49073365fe08dc2c02decbaea614dc33db4666c7ab2cdb8bfa
-SIZE (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 10542
-SHA256 (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = bc33d26af3f01882a187b312c27fb547f802eb36eedfa7d2caedf3ed9c424442
-SIZE (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9518
-SHA256 (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = d5b2c42a3b9fd2970107eb74c2226cbbfbad48c89807303db903932d21ff76aa
-SIZE (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = 10580
-SHA256 (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = e90a406a14d5f419bd500e19082da81390e8ba6040926857926f1a899a53379d
-SIZE (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = 12510
+SHA256 (alibaba-tengine-tengine-2.0.3_GH0.tar.gz) = c33b2769f2ff3a755606587e26c73598d982cbf86c89838131b0c053a140b0d0
+SIZE (alibaba-tengine-tengine-2.0.3_GH0.tar.gz) = 1534005
+SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0
+SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393
+SHA256 (samizdatco-nginx-http-auth-digest-bd1c86a_GH0.tar.gz) = d3071ca4b70cfd7f437add772a2aa6ab585dafb5d5a2e3f5cc70af74da72acf2
+SIZE (samizdatco-nginx-http-auth-digest-bd1c86a_GH0.tar.gz) = 14458
+SHA256 (openresty-echo-nginx-module-v0.50_GH0.tar.gz) = cd770495bd59ae1e7c7d3a385a827a72d553cc4c0c3535204db333421ca8780d
+SIZE (openresty-echo-nginx-module-v0.50_GH0.tar.gz) = 62910
+SHA256 (openresty-headers-more-nginx-module-v0.24_GH0.tar.gz) = 49437af68e0b7aacec563c4b1ced2875993095ae84e9a5b83f02eb144aa18adc
+SIZE (openresty-headers-more-nginx-module-v0.24_GH0.tar.gz) = 27687
+SHA256 (arut-nginx-dav-ext-module-v0.0.2_GH0.tar.gz) = 603d961c15ba2633ee5ae1f13b80a5455dceee61071d1dab7d2ea91a0981585c
+SIZE (arut-nginx-dav-ext-module-v0.0.2_GH0.tar.gz) = 6056
+SHA256 (vkholodkov-nginx-eval-module-1.0.3_GH0.tar.gz) = 849381433a9020ee1162fa6211b047369fde38dc1a8b5de79f03f8fff2407fe2
+SIZE (vkholodkov-nginx-eval-module-1.0.3_GH0.tar.gz) = 5724
+SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885
+SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343
+SHA256 (wandenberg-nginx-push-stream-module-0.3.5_GH0.tar.gz) = 8a9e27a79020bf088dd120e528db77398c29db8aa75c962e7e45c8a20451d4f7
+SIZE (wandenberg-nginx-push-stream-module-0.3.5_GH0.tar.gz) = 153122
+SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1
+SIZE (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 16990
+SHA256 (wandenberg-nginx-video-thumbextractor-module-0.2.0_GH0.tar.gz) = cc70c712cd75508c8c31fd30a2e9f1893c089ac71d83aca2c6c2802986a13b4b
+SIZE (wandenberg-nginx-video-thumbextractor-module-0.2.0_GH0.tar.gz) = 8803
+SHA256 (chaoslawful-drizzle-nginx-module-v0.1.6_GH0.tar.gz) = 681dbceb0cc7b07b1569cc71a7e9cc10d251521b82a013412feb25dd67ec5156
+SIZE (chaoslawful-drizzle-nginx-module-v0.1.6_GH0.tar.gz) = 61383
+SHA256 (simpl-ngx_devel_kit-v0.2.19_GH0.tar.gz) = 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679
+SIZE (simpl-ngx_devel_kit-v0.2.19_GH0.tar.gz) = 65029
+SHA256 (openresty-encrypted-session-nginx-module-v0.03_GH0.tar.gz) = 4d0da617b3122b145dd46ec8618c6248db79c992704b23ed78e01bddf14173d3
+SIZE (openresty-encrypted-session-nginx-module-v0.03_GH0.tar.gz) = 8949
+SHA256 (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = ef843824e0aac1dd60b392802861cc06426a4bc5f87d472c7ee00b1296693f2a
+SIZE (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = 18883
+SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c114433ee783b4b06c0105921a830c9486172
+SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024
+SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270
+SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534
+SHA256 (openresty-memc-nginx-module-v0.14_GH0.tar.gz) = c3efc6ee831429e5fd6f34766ac33bae644c1d6f515b3f57c9959233228922b5
+SIZE (openresty-memc-nginx-module-v0.14_GH0.tar.gz) = 37752
+SHA256 (openresty-rds-csv-nginx-module-v0.05_GH0.tar.gz) = b1332b8925b366db1832949b9c12b869ac9cdf2dd63e9003b281f827f64807c1
+SIZE (openresty-rds-csv-nginx-module-v0.05_GH0.tar.gz) = 18417
+SHA256 (openresty-rds-json-nginx-module-v0.13_GH0.tar.gz) = fc7d425c727e22420d103e638f531c9ab8adf5f494841d50e9387c51dd3770d0
+SIZE (openresty-rds-json-nginx-module-v0.13_GH0.tar.gz) = 32977
+SHA256 (openresty-redis2-nginx-module-v0.10_GH0.tar.gz) = 142976473a06046f806f420046d8e65f7edc48a32891a27a85653228254a7299
+SIZE (openresty-redis2-nginx-module-v0.10_GH0.tar.gz) = 29850
+SHA256 (arut-nginx-rtmp-module-v1.0.8_GH0.tar.gz) = e905e40d1a1b81c720f1e799bee6a3525efaa6f2519212130d39eed3b8877c74
+SIZE (arut-nginx-rtmp-module-v1.0.8_GH0.tar.gz) = 513086
+SHA256 (openresty-set-misc-nginx-module-v0.23_GH0.tar.gz) = e43b877e254a7d730f623d6d0889f16fffff8b8df0110dcc466aded94e73447e
+SIZE (openresty-set-misc-nginx-module-v0.23_GH0.tar.gz) = 40350
+SHA256 (openresty-srcache-nginx-module-v0.24_GH0.tar.gz) = 36f85556f93b300f16242e3970808be5b54a21d901a6e0475a798c5f97c796d1
+SIZE (openresty-srcache-nginx-module-v0.24_GH0.tar.gz) = 67233
+SHA256 (yaoweibin-nginx_tcp_proxy_module-v0.26_GH0.tar.gz) = 6d50955a7cf76d571e8a3af67d43a2f52e0b4e88bbe17bb0f520924cb6af1530
+SIZE (yaoweibin-nginx_tcp_proxy_module-v0.26_GH0.tar.gz) = 127319
+SHA256 (gabor-nginx-x-rid-header-master_GH0.tar.gz) = 9d18d3c2cfde7209d6a6301fc6a852b5a018afb2bd9acf7d549278355a7cb1a5
+SIZE (gabor-nginx-x-rid-header-master_GH0.tar.gz) = 2711
+SHA256 (openresty-xss-nginx-module-v0.04_GH0.tar.gz) = 4e5230a644779b8298063d5c0bd7dc19531496369456d69dc5281ae1cca4d6ec
+SIZE (openresty-xss-nginx-module-v0.04_GH0.tar.gz) = 10536
+SHA256 (openresty-array-var-nginx-module-v0.03_GH0.tar.gz) = f9892ec9a2e872d8aabeb2234d0d4c66cf85b8dbb2ca5c108a20c3d8c2111189
+SIZE (openresty-array-var-nginx-module-v0.03_GH0.tar.gz) = 9520
+SHA256 (calio-form-input-nginx-module-v0.07_GH0.tar.gz) = c0c56cc697a290e98b88d4888bac8828041ef6f3049247d3cd3c63f2808d1e20
+SIZE (calio-form-input-nginx-module-v0.07_GH0.tar.gz) = 10563
+SHA256 (calio-iconv-nginx-module-v0.10_GH0.tar.gz) = 88e326eba7fdf9fd2376b1ba033b48cb0eee45136528cf5430ac9340088ce324
+SIZE (calio-iconv-nginx-module-v0.10_GH0.tar.gz) = 12513
diff --git a/www/tengine/files/extra-patch-calio-iconv-nginx-module-config b/www/tengine/files/extra-patch-calio-iconv-nginx-module-config
index e564d207c3f1..376c5ba8d809 100644
--- a/www/tengine/files/extra-patch-calio-iconv-nginx-module-config
+++ b/www/tengine/files/extra-patch-calio-iconv-nginx-module-config
@@ -1,5 +1,5 @@
---- ../calio-iconv-nginx-module-b37efb5/config.orig	2013-04-16 17:57:17.000000000 -0700
-+++ ../calio-iconv-nginx-module-b37efb5/config	2013-05-01 17:16:28.134624745 -0700
+--- ../iconv-nginx-module-0.10/config.orig	2013-04-16 17:57:17.000000000 -0700
++++ ../iconv-nginx-module-0.10/config	2013-05-01 17:16:28.134624745 -0700
 @@ -39,12 +39,12 @@
      fi
  
diff --git a/www/tengine/files/extra-patch-chaoslawful-drizzle-nginx-module-config b/www/tengine/files/extra-patch-chaoslawful-drizzle-nginx-module-config
index 05f3699f2c00..2e29e2876be7 100644
--- a/www/tengine/files/extra-patch-chaoslawful-drizzle-nginx-module-config
+++ b/www/tengine/files/extra-patch-chaoslawful-drizzle-nginx-module-config
@@ -1,5 +1,5 @@
---- ../chaoslawful-drizzle-nginx-module-e6937ba/config.orig	2011-12-30 10:26:53.000000000 +0400
-+++ ../chaoslawful-drizzle-nginx-module-e6937ba/config	2011-12-30 10:28:20.000000000 +0400
+--- ../drizzle-nginx-module-0.1.6/config.orig	2011-12-30 10:26:53.000000000 +0400
++++ ../drizzle-nginx-module-0.1.6/config	2011-12-30 10:28:20.000000000 +0400
 @@ -22,12 +22,12 @@
  
      if [ $ngx_found = no ]; then
diff --git a/www/tengine/files/extra-patch-ngx_http_notice_module.c b/www/tengine/files/extra-patch-ngx_http_notice_module.c
index feb39a964b23..d62135ed6f9c 100644
--- a/www/tengine/files/extra-patch-ngx_http_notice_module.c
+++ b/www/tengine/files/extra-patch-ngx_http_notice_module.c
@@ -1,5 +1,5 @@
---- ../kr-nginx-notice-3c95966/ngx_http_notice_module.c.orig	2009-07-16 18:37:57.000000000 +0200
-+++ ../kr-nginx-notice-3c95966/ngx_http_notice_module.c	2009-07-16 08:09:38.000000000 +0200
+--- ../nginx-notice-3c95966/ngx_http_notice_module.c.orig	2009-07-16 18:37:57.000000000 +0200
++++ ../nginx-notice-3c95966/ngx_http_notice_module.c	2009-07-16 08:09:38.000000000 +0200
 @@ -153,7 +153,7 @@
          return NGX_HTTP_NOT_ALLOWED;
      }
diff --git a/www/tengine/files/extra-patch-openresty-set-misc-nginx-module-config b/www/tengine/files/extra-patch-openresty-set-misc-nginx-module-config
index 86ac5870b1a5..bd6d8402d102 100644
--- a/www/tengine/files/extra-patch-openresty-set-misc-nginx-module-config
+++ b/www/tengine/files/extra-patch-openresty-set-misc-nginx-module-config
@@ -1,5 +1,5 @@
---- ../openresty-set-misc-nginx-module-6ce586e/config.orig       2011-12-09 10:27:53.861265188 +0300
-+++ ../openresty-set-misc-nginx-module-6ce586e/config    2011-12-09 10:28:07.107259301 +0300
+--- ../set-misc-nginx-module-0.23/config.orig       2011-12-09 10:27:53.861265188 +0300
++++ ../set-misc-nginx-module-0.23/config    2011-12-09 10:28:07.107259301 +0300
 @@ -1,10 +1,3 @@
 -if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then
 -    echo "found ngx_devel_kit for ngx_set_misc; looks good."
author	Mathieu Arnold <mat@FreeBSD.org>	2015-05-29 14:01:14 +0000
committer	Mathieu Arnold <mat@FreeBSD.org>	2015-05-29 14:01:14 +0000
commit	081db6cdc1abf38a3e4e495608953d791c65c90b (patch)
tree	69e4475e163a25cf8e61e9a6b2302136b7a0badf /www
parent	lang/ocaml: Set BROKEN on 2 new ARCHES (diff)