svn commit: r385909 - in head/www/webmachine: . files
Jimmy Olgeni
olgeni at FreeBSD.org
Sat May 9 20:41:27 UTC 2015
Author: olgeni
Date: Sat May 9 20:41:25 2015
New Revision: 385909
URL: https://svnweb.freebsd.org/changeset/ports/385909
Log:
Upgrade to version 1.10.8.
- Simplify RUN_DEPENDS.
- Add support for DOCS and EXAMPLES.
- Use pkg-plist for the docs (remove PORTDOCS).
- Use PORTNAME in install code.
- Update dependency on www/mochiweb-basho 2.9.0p1 (r385908).
Added:
head/www/webmachine/files/patch-Makefile (contents, props changed)
Modified:
head/www/webmachine/Makefile
head/www/webmachine/distinfo
head/www/webmachine/files/patch-rebar.config (contents, props changed)
head/www/webmachine/pkg-plist
Modified: head/www/webmachine/Makefile
==============================================================================
--- head/www/webmachine/Makefile Sat May 9 20:31:53 2015 (r385908)
+++ head/www/webmachine/Makefile Sat May 9 20:41:25 2015 (r385909)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= webmachine
-PORTVERSION= 1.10.6
+PORTVERSION= 1.10.8
CATEGORIES= www devel
MAINTAINER= olgeni at FreeBSD.org
@@ -9,10 +9,9 @@ COMMENT= HTTP semantic awareness on top
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}"
@@ -20,27 +19,32 @@ 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>
Modified: head/www/webmachine/distinfo
==============================================================================
--- head/www/webmachine/distinfo Sat May 9 20:31:53 2015 (r385908)
+++ head/www/webmachine/distinfo Sat May 9 20:41:25 2015 (r385909)
@@ -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
Added: head/www/webmachine/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/webmachine/files/patch-Makefile Sat May 9 20:41:25 2015 (r385909)
@@ -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:
Modified: head/www/webmachine/files/patch-rebar.config
==============================================================================
--- head/www/webmachine/files/patch-rebar.config Sat May 9 20:31:53 2015 (r385908)
+++ head/www/webmachine/files/patch-rebar.config Sat May 9 20:41:25 2015 (r385909)
@@ -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,
Modified: head/www/webmachine/pkg-plist
==============================================================================
--- head/www/webmachine/pkg-plist Sat May 9 20:31:53 2015 (r385908)
+++ head/www/webmachine/pkg-plist Sat May 9 20:41:25 2015 (r385909)
@@ -28,11 +28,11 @@ lib/erlang/lib/webmachine-%%VERSION%%/in
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
@@ -64,6 +64,7 @@ lib/erlang/lib/webmachine-%%VERSION%%/sr
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
@@ -74,4 +75,7 @@ lib/erlang/lib/webmachine-%%VERSION%%/sr
%%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
More information about the svn-ports-all
mailing list