Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Oct 2013 21:08:00 +0000 (UTC)
From:      Jimmy Olgeni <olgeni@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r332006 - head/www/webmachine
Message-ID:  <201310292108.r9TL80bQ036067@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olgeni
Date: Tue Oct 29 21:08:00 2013
New Revision: 332006
URL: http://svnweb.freebsd.org/changeset/ports/332006

Log:
  - Add staging support.
  - Do not mute install commands.
  - Cleanup pkg-plist.

Modified:
  head/www/webmachine/Makefile
  head/www/webmachine/pkg-plist

Modified: head/www/webmachine/Makefile
==============================================================================
--- head/www/webmachine/Makefile	Tue Oct 29 21:07:38 2013	(r332005)
+++ head/www/webmachine/Makefile	Tue Oct 29 21:08:00 2013	(r332006)
@@ -26,28 +26,21 @@ GH_TAGNAME=     ${PORTVERSION}
 
 PORTDOCS=	*
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@for FILE in README.org; do \
-		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${DOCSDIR}; \
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	for FILE in README.org; do \
+		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${STAGEDIR}${DOCSDIR}; \
 	done
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	@cd ${WRKSRC}/demo && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
-.endif
-	@${MKDIR} ${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}
-	@${MKDIR} ${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/ebin
-	@${MKDIR} ${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/include
-	@${MKDIR} ${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/priv
-	@${MKDIR} ${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/src
-	@${INSTALL_DATA} ${WRKSRC}/ebin/* ${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/ebin
-	@${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/include
-	@${INSTALL_DATA} ${WRKSRC}/src/* ${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/src
-	@cd ${WRKSRC}/priv && ${COPYTREE_SHARE} \* ${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/priv
+	@${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
 
 .include <bsd.port.mk>

Modified: head/www/webmachine/pkg-plist
==============================================================================
--- head/www/webmachine/pkg-plist	Tue Oct 29 21:07:38 2013	(r332005)
+++ head/www/webmachine/pkg-plist	Tue Oct 29 21:08:00 2013	(r332006)
@@ -1,65 +1,65 @@
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine.app
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_app.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_decision_core.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_deps.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_dispatcher.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_error_handler.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_log.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_log_handler.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_logger_watcher.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_logger_watcher_sup.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_mochiweb.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_multipart.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_perf_log_handler.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_request.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_resource.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_router.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_sup.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_util.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/wmtrace_resource.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin/wrq.beam
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/include/webmachine.hrl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/include/webmachine_logger.hrl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/include/wm_reqdata.hrl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/include/wm_reqstate.hrl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/include/wm_resource.hrl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates/Makefile
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates/README
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates/priv/dispatch.conf
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates/rebar.config
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates/src/wmskel.app.src
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates/src/wmskel.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates/src/wmskel_app.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates/src/wmskel_resource.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates/src/wmskel_sup.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates/start.sh
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates/wmskel.template
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/trace/http-headers-status-v3.png
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/trace/wmtrace.css
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/trace/wmtrace.js
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/www/index.html
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine.app.src
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_app.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_decision_core.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_deps.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_dispatcher.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_error_handler.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_log.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_log_handler.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_logger_watcher.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_logger_watcher_sup.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_mochiweb.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_multipart.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_perf_log_handler.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_request.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_resource.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_router.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_sup.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/webmachine_util.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/wmtrace_resource.erl
-%%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src/wrq.erl
+lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine.app
+lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine.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_handler.beam
+lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_log.beam
+lib/erlang/lib/webmachine-%%VERSION%%/ebin/webmachine_log_handler.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_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_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_handler.erl
+lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_log.erl
+lib/erlang/lib/webmachine-%%VERSION%%/src/webmachine_log_handler.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
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/priv/dispatch.conf
@@ -71,16 +71,16 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/webmachine_demo_resource.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/webmachine_demo_sup.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/start.sh
-@dirrm %%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/src
-@dirrm %%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/www
-@dirrm %%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/trace
-@dirrm %%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates/src
-@dirrm %%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates/priv
-@dirrm %%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv/templates
-@dirrm %%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/priv
-@dirrm %%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/include
-@dirrm %%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%/ebin
-@dirrm %%LIB32DIR%%/erlang/lib/webmachine-%%VERSION%%
+@dirrm lib/erlang/lib/webmachine-%%VERSION%%/src
+@dirrm lib/erlang/lib/webmachine-%%VERSION%%/priv/www
+@dirrm lib/erlang/lib/webmachine-%%VERSION%%/priv/trace
+@dirrm lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/src
+@dirrm lib/erlang/lib/webmachine-%%VERSION%%/priv/templates/priv
+@dirrm lib/erlang/lib/webmachine-%%VERSION%%/priv/templates
+@dirrm lib/erlang/lib/webmachine-%%VERSION%%/priv
+@dirrm lib/erlang/lib/webmachine-%%VERSION%%/include
+@dirrm lib/erlang/lib/webmachine-%%VERSION%%/ebin
+@dirrm lib/erlang/lib/webmachine-%%VERSION%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/src
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/priv
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310292108.r9TL80bQ036067>