Index: head/www/webmachine/Makefile
===================================================================
--- head/www/webmachine/Makefile	(revision 385908)
+++ head/www/webmachine/Makefile	(revision 385909)
@@ -1,46 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	webmachine
-PORTVERSION=	1.10.6
+PORTVERSION=	1.10.8
 CATEGORIES=	www devel
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	HTTP semantic awareness on top mochiweb
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang \
-		mochiweb-basho>=0:${PORTSDIR}/www/mochiweb-basho
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		mochiweb-basho>=0:${PORTSDIR}/www/mochiweb-basho
+BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
+		mochiweb-basho>=2.9.0p1:${PORTSDIR}/www/mochiweb-basho
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=      VERSION="${PORTVERSION}"
 
 USES=		gmake
 USE_GITHUB=     yes
 GH_ACCOUNT=     basho
 
-PORTDOCS=	*
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/{vsn, git}/{vsn,\"${PORTVERSION}\"}/" ${WRKSRC}/src/webmachine.app.src
 	@${RM} ${WRKSRC}/src/*.bak
+	@${RM} ${WRKSRC}/demo/priv/www/uploads/.gitignore
 
 do-install:
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for FILE in README.org; do \
 		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${STAGEDIR}${DOCSDIR}; \
 	done
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/demo && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/ebin
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/include
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/priv
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/src
-	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/ebin
-	${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/include
-	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/src
-	cd ${WRKSRC}/priv && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/priv
+.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}/priv
+	@${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
+	cd ${WRKSRC}/priv && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/priv
 
 .include <bsd.port.mk>
Index: head/www/webmachine/distinfo
===================================================================
--- head/www/webmachine/distinfo	(revision 385908)
+++ head/www/webmachine/distinfo	(revision 385909)
@@ -1,2 +1,2 @@
-SHA256 (basho-webmachine-1.10.6_GH0.tar.gz) = e8e46d188c7f4b549e9a33b3b50499896f355f08e6abf36e2869dc7a70690dab
-SIZE (basho-webmachine-1.10.6_GH0.tar.gz) = 1625544
+SHA256 (basho-webmachine-1.10.8_GH0.tar.gz) = d93c2dacc1786db5c56a2b6536f6254038452d9096483becbaceb6643ecc8dcc
+SIZE (basho-webmachine-1.10.8_GH0.tar.gz) = 1642596
Index: head/www/webmachine/files/patch-Makefile
===================================================================
--- head/www/webmachine/files/patch-Makefile	(nonexistent)
+++ head/www/webmachine/files/patch-Makefile	(revision 385909)
@@ -0,0 +1,11 @@
+--- Makefile.orig	2015-05-07 14:58:47 UTC
++++ Makefile
+@@ -11,7 +11,7 @@ all: deps compile
+ compile: deps
+ 	./rebar compile
+ 
+-deps: DEV_MODE
++deps:
+ 	@(./rebar get-deps)
+ 
+ clean:

Property changes on: head/www/webmachine/files/patch-Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+1
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/webmachine/files/patch-rebar.config
===================================================================
--- head/www/webmachine/files/patch-rebar.config	(revision 385908)
+++ head/www/webmachine/files/patch-rebar.config	(revision 385909)
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- rebar.config.orig
+--- rebar.config.orig	2015-02-11 18:40:46 UTC
 +++ rebar.config
-@@ -6,7 +6,4 @@
+@@ -6,7 +6,7 @@
  {xref_checks, [undefined_function_calls]}.
  
  {deps,
-- [{mochiweb, "1.5.1*", {git, "git://github.com/basho/mochiweb.git", {tag, "1.5.1p7"}}},
--  {meck, "0.8.2", {git, "git://github.com/basho/meck.git", {tag, "0.8.2"}}},
--  {ibrowse, "4.0.1", {git, "git://github.com/cmullaparthi/ibrowse.git", {tag, "v4.0.1"}}}
-- ]}.
-+ [{mochiweb, "1.5.1*"}]}.
+- [{mochiweb, "2.9.0", {git, "git://github.com/basho/mochiweb.git", {tag, "v2.9.0p1"}}}
++ [
+  ]}.
+ 
+ {dev_only_deps,

Property changes on: head/www/webmachine/files/patch-rebar.config
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+1
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/www/webmachine/pkg-plist
===================================================================
--- head/www/webmachine/pkg-plist	(revision 385908)
+++ head/www/webmachine/pkg-plist	(revision 385909)
@@ -1,77 +1,81 @@
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine.app
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_access_log_handler.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_app.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_decision_core.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_deps.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_dispatcher.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_error.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_error_handler.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_error_log_handler.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_log.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_logger_watcher.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_logger_watcher_sup.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_mochiweb.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_multipart.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_perf_log_handler.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_request.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_resource.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_router.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_sup.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_util.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/wmtrace_resource.beam
 lib/erlang/lib/webmachine-%%VERSION%%/ebin/wrq.beam
 lib/erlang/lib/webmachine-%%VERSION%%/include/webmachine.hrl
 lib/erlang/lib/webmachine-%%VERSION%%/include/webmachine_logger.hrl
 lib/erlang/lib/webmachine-%%VERSION%%/include/wm_reqdata.hrl
 lib/erlang/lib/webmachine-%%VERSION%%/include/wm_reqstate.hrl
 lib/erlang/lib/webmachine-%%VERSION%%/include/wm_resource.hrl
 lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/Makefile
 lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/README
-lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/priv/dispatch.conf
 lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/rebar.config
 lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/src/wmskel.app.src
 lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/src/wmskel.erl
 lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/src/wmskel_app.erl
+lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/src/wmskel_config.erl
 lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/src/wmskel_resource.erl
 lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/src/wmskel_sup.erl
 lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/start.sh
 lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/wmskel.template
 lib/erlang/lib/webmachine-%%VERSION%%/priv/trace/http-headers-status-v3.png
 lib/erlang/lib/webmachine-%%VERSION%%/priv/trace/wmtrace.css
 lib/erlang/lib/webmachine-%%VERSION%%/priv/trace/wmtrace.js
 lib/erlang/lib/webmachine-%%VERSION%%/priv/www/index.html
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine.app.src
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_access_log_handler.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_app.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_decision_core.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_deps.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_dispatcher.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_error.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_error_handler.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_error_log_handler.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_log.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_logger_watcher.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_logger_watcher_sup.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_mochiweb.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_multipart.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_perf_log_handler.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_request.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_resource.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_router.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_sup.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_util.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/wmtrace_resource.erl
 lib/erlang/lib/webmachine-%%VERSION%%/src/wrq.erl
+%%PORTDOCS%%%%DOCSDIR%%/README.org
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/priv/dispatch.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rebar.config
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/webmachine_demo.app.src
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/webmachine_demo.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/webmachine_demo_app.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/webmachine_demo_fs_resource.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/webmachine_demo_resource.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/webmachine_demo_sup.erl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/webmachine_demo_upload_resource.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/start.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/templates/form.dtl
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/priv/www/uploads