Index: head/www/mochiweb/Makefile
===================================================================
--- head/www/mochiweb/Makefile	(revision 385890)
+++ head/www/mochiweb/Makefile	(revision 385891)
@@ -1,40 +1,44 @@
 # $FreeBSD$
 
 PORTNAME=	mochiweb
-PORTVERSION=	2.10.0
+PORTVERSION=	2.12.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang library for building lightweight HTTP servers
 
 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-basho-[0-9]*
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mochi
 
-PORTDOCS=	*
+.include <bsd.port.options.mk>
 
 do-install:
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for FILE in CHANGES.md README; 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>
Index: head/www/mochiweb/distinfo
===================================================================
--- head/www/mochiweb/distinfo	(revision 385890)
+++ head/www/mochiweb/distinfo	(revision 385891)
@@ -1,2 +1,2 @@
-SHA256 (mochi-mochiweb-v2.10.0_GH0.tar.gz) = e830a767a8e4b575d9da46ffc8bdfe1b5f4493353082280c4a1a692588499307
-SIZE (mochi-mochiweb-v2.10.0_GH0.tar.gz) = 278224
+SHA256 (mochi-mochiweb-v2.12.2_GH0.tar.gz) = 73369f5a2e0d5477632a3d1fa44c674f2dfc98908f86bfd6bd77b266bdb88684
+SIZE (mochi-mochiweb-v2.12.2_GH0.tar.gz) = 284186
Index: head/www/mochiweb/pkg-plist
===================================================================
--- head/www/mochiweb/pkg-plist	(revision 385890)
+++ head/www/mochiweb/pkg-plist	(revision 385891)
@@ -1,79 +1,81 @@
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochifmt.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochifmt_records.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochifmt_std.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiglobal.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochihex.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochijson.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochijson2.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochilists.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochilogfile2.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochinum.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochitemp.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiutf8.beam
 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_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
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_echo.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_headers.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_html.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_http.beam
 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_response.beam
 lib/erlang/lib/mochiweb-%%VERSION%%/ebin/mochiweb_session.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_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/mochifmt.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochifmt_records.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochifmt_std.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiglobal.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochihex.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochijson.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochijson2.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochilists.erl
 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.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_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
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_echo.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_headers.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_html.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_http.erl
 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_response.erl
 lib/erlang/lib/mochiweb-%%VERSION%%/src/mochiweb_session.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_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
 %%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