3 files changed, 38 insertions, 16 deletions

diff --git a/www/mochiweb-basho/Makefile b/www/mochiweb-basho/Makefile
index b7e0e31822c4..8a482182ec67 100644
--- a/www/mochiweb-basho/Makefile
+++ b/www/mochiweb-basho/Makefile
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	mochiweb
-PORTVERSION=	1.5.1p7
+PORTVERSION=	2.9.0p1
+DISTVERSIONPREFIX=v
 CATEGORIES=	www devel
 PKGNAMESUFFIX=	-basho
 
@@ -10,8 +11,8 @@ COMMENT=	Erlang library for building lightweight HTTP servers (Basho fork)
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	mochiweb-[0-9]*
 
@@ -19,22 +20,29 @@ PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	basho
+GH_TAGNAME=	ade2a9b	# required
 
-PORTDOCS=	*
+WRKSRC=		${WRKDIR}/basho-${PORTNAME}-${GH_TAGNAME}
+
+.include <bsd.port.options.mk>
 
 do-install:
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	for FILE in README; do \
+	for FILE in CHANGES.md README.md; do \
 		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${STAGEDIR}${DOCSDIR}; \
 	done
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/mochiweb-${PORTVERSION}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/mochiweb-${PORTVERSION}/ebin
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/mochiweb-${PORTVERSION}/include
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/mochiweb-${PORTVERSION}/src
-	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/mochiweb-${PORTVERSION}/ebin
-	${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/mochiweb-${PORTVERSION}/include
-	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/mochiweb-${PORTVERSION}/src
+.endif
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/include
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
+	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
+	${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/include
+	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 
 .include <bsd.port.mk>
diff --git a/www/mochiweb-basho/distinfo b/www/mochiweb-basho/distinfo
index 80e09829447c..e52cd7f70835 100644
--- a/www/mochiweb-basho/distinfo
+++ b/www/mochiweb-basho/distinfo
@@ -1,2 +1,2 @@
-SHA256 (basho-mochiweb-1.5.1p7_GH0.tar.gz) = 1843bc27a032531e227c778c310958ec8354d90062a8d180194f684f841f740a
-SIZE (basho-mochiweb-1.5.1p7_GH0.tar.gz) = 177641
+SHA256 (basho-mochiweb-v2.9.0p1-ade2a9b_GH0.tar.gz) = d23b11bb165be4f1c906392fbad36803f5bbbb00a04743ca081e7540e8b5ee4e
+SIZE (basho-mochiweb-v2.9.0p1-ade2a9b_GH0.tar.gz) = 283512
diff --git a/www/mochiweb-basho/pkg-plist b/www/mochiweb-basho/pkg-plist
index 889b3d2718ca..3a7eb6b8f5ac 100644
--- a/www/mochiweb-basho/pkg-plist
+++ b/www/mochiweb-basho/pkg-plist
@@ -14,6 +14,7 @@ lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb.app
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_acceptor.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_app.beam
+lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_base64url.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_charref.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_cookies.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_cover.beam
@@ -25,15 +26,17 @@ lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_io.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_mime.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_multipart.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_request.beam
-lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_request_tests.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_response.beam
+lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_session.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_skel.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_socket.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_socket_server.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_sup.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_util.beam
+lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_websocket.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/reloader.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/include/internal.hrl
+lib/erlang/lib/mochiweb-%%VERSION%%/src/Makefile
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochifmt.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochifmt_records.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochifmt_std.erl
@@ -46,10 +49,12 @@ lib/erlang/lib/mochiweb-%%VERSION%%/src/mochilogfile2.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochinum.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochitemp.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiutf8.erl
+lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb.app
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb.app.src
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_acceptor.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_app.erl
+lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_base64url.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_charref.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_cookies.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_cover.erl
@@ -61,15 +66,24 @@ lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_io.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_mime.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_multipart.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_request.erl
-lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_request_tests.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_response.erl
+lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_session.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_skel.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_socket.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_socket_server.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_sup.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_util.erl
+lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_websocket.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/reloader.erl
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.md
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hmac_api/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hmac_api/hmac_api.hrl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hmac_api/hmac_api_client.erl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hmac_api/hmac_api_lib.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/https/https_store.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/https/server_cert.pem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/https/server_key.pem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keepalive/keepalive.erl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket/index.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket/websocket.erl