svn commit: r391398 - in head: devel/erlang-bbmustache devel/erlang-bear devel/erlang-bear/files devel/erlang-cuttlefish devel/erlang-cuttlefish/files devel/erlang-folsom devel/erlang-folsom/files ...

Mon Jul 6 10:55:44 UTC 2015

Author: olgeni
Date: Mon Jul  6 10:55:35 2015
New Revision: 391398
URL: https://svnweb.freebsd.org/changeset/ports/391398

Log:
  Some patch files were meant to get rid of {vsn, git} in rebar.config;
  replace them with REINPLACE_CMD.

Deleted:
  head/devel/erlang-bear/files/
  head/devel/erlang-cuttlefish/files/patch-src_cuttlefish.app.src
  head/devel/erlang-folsom/files/patch-src_folsom.app.src
  head/devel/erlang-gen_leader/files/
  head/devel/erlang-gproc/files/
  head/devel/erlang-msgpack/files/patch-src_msgpack.app.src
  head/devel/erlang-neotoma/files/patch-src_neotoma.app.src
  head/devel/erlang-protobuffs/files/patch-src_protobuffs.app.src
Modified:
  head/devel/erlang-bbmustache/Makefile
  head/devel/erlang-bear/Makefile
  head/devel/erlang-cuttlefish/Makefile
  head/devel/erlang-folsom/Makefile
  head/devel/erlang-gen_leader/Makefile
  head/devel/erlang-gproc/Makefile
  head/devel/erlang-jobs/Makefile
  head/devel/erlang-jobs/pkg-plist
  head/devel/erlang-msgpack/Makefile
  head/devel/erlang-neotoma/Makefile
  head/devel/erlang-parse_trans/Makefile
  head/devel/erlang-parse_trans/pkg-plist
  head/devel/erlang-protobuffs/Makefile
  head/devel/erlang-recon/Makefile
  head/net/erlang-xmlrpc/Makefile
  head/textproc/erlang-edown/Makefile
  head/textproc/erlang-edown/pkg-plist
  head/www/erlang-webmachine/Makefile

Modified: head/devel/erlang-bbmustache/Makefile
==============================================================================

--- head/devel/erlang-bbmustache/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-bbmustache/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -22,7 +22,7 @@ GH_ACCOUNT=	soranoba
 ALL_TARGET=	compile
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/{vsn, git}/{vsn,"${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
+	@${REINPLACE_CMD} -i '' -e 's/{ *vsn, git *}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 
 pre-build:
 	@${RM} ${WRKSRC}/rebar.lock

Modified: head/devel/erlang-bear/Makefile
==============================================================================
--- head/devel/erlang-bear/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-bear/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -20,8 +20,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	boundary
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/%%PORTVERSION%%/${PORTVERSION}/" ${WRKSRC}/src/bear.app.src
-	@${RM} ${WRKSRC}/src/*.bak ${WRKSRC}/src/*.orig
+	@${REINPLACE_CMD} -i '' -e 's/{ *vsn, git *}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 
 do-build:
 	@cd ${WRKSRC} && ./rebar compile

Modified: head/devel/erlang-cuttlefish/Makefile
==============================================================================
--- head/devel/erlang-cuttlefish/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-cuttlefish/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -23,9 +23,9 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	basho
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/%%PORTVERSION%%/${PORTVERSION}/" ${WRKSRC}/src/cuttlefish.app.src
+	@${REINPLACE_CMD} -i '' -e 's/{ *vsn, git *}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 	@${REINPLACE_CMD} -e "s@%%LOCALBASE%%@${LOCALBASE}@" ${WRKSRC}/src/cuttlefish_escript.erl
-	@${RM} ${WRKSRC}/src/*.bak ${WRKSRC}/src/*.orig
+	@${RM} ${WRKSRC}/src/*.orig
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/devel/erlang-folsom/Makefile
==============================================================================
--- head/devel/erlang-folsom/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-folsom/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -21,8 +21,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	boundary
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/%%PORTVERSION%%/${PORTVERSION}/" ${WRKSRC}/src/folsom.app.src
-	@${RM} ${WRKSRC}/src/*.bak ${WRKSRC}/src/*.orig
+	@${REINPLACE_CMD} -i '' -e 's/{ *vsn, git *}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 
 do-build:
 	@cd ${WRKSRC} && ./rebar compile

Modified: head/devel/erlang-gen_leader/Makefile
==============================================================================
--- head/devel/erlang-gen_leader/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-gen_leader/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -21,8 +21,7 @@ GH_TAGNAME=	a12a4e3
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/%%PORTVERSION%%/${PORTVERSION}/" ${WRKSRC}/ebin/gen_leader.app
-	@${RM} ${WRKSRC}/ebin/*.bak ${WRKSRC}/ebin/*.orig
+	@${REINPLACE_CMD} -i '' -e 's/{ *vsn, git *}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 
 do-build:
 	@cd ${WRKSRC} && ./rebar compile

Modified: head/devel/erlang-gproc/Makefile
==============================================================================
--- head/devel/erlang-gproc/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-gproc/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -24,8 +24,7 @@ GH_ACCOUNT=	uwiger
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/%%PORTVERSION%%/${PORTVERSION}/" ${WRKSRC}/src/gproc.app.src
-	@${RM} ${WRKSRC}/src/*.bak ${WRKSRC}/src/*.orig
+	@${REINPLACE_CMD} -i '' -e 's/{ *vsn, git *}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 
 do-build:
 	@cd ${WRKSRC} && ./rebar compile

Modified: head/devel/erlang-jobs/Makefile
==============================================================================
--- head/devel/erlang-jobs/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-jobs/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -20,7 +20,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	uwiger
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/{vsn, git}/{vsn,"${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
+	@${REINPLACE_CMD} -i '' -e 's/{ *vsn, git *}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 
 do-build:
 	@cd ${WRKSRC} && rebar compile

Modified: head/devel/erlang-jobs/pkg-plist
==============================================================================
--- head/devel/erlang-jobs/pkg-plist	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-jobs/pkg-plist	Mon Jul  6 10:55:35 2015	(r391398)
@@ -14,7 +14,6 @@ lib/erlang/lib/jobs-%%VERSION%%/ebin/job
 lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs_stateful_simple.beam
 lib/erlang/lib/jobs-%%VERSION%%/include/jobs.hrl
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs.app.src
-lib/erlang/lib/jobs-%%VERSION%%/src/jobs.app.src.bak
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs.erl
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs_app.erl
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs_info.erl

Modified: head/devel/erlang-msgpack/Makefile
==============================================================================
--- head/devel/erlang-msgpack/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-msgpack/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -25,8 +25,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/%%PORTVERSION%%/${PORTVERSION}/" ${WRKSRC}/src/msgpack.app.src
-	@${RM} ${WRKSRC}/src/*.bak ${WRKSRC}/src/*.orig
+	@${REINPLACE_CMD} -i '' -e 's/{ *vsn, git *}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 
 do-install:
 .if ${PORT_OPTIONS:MDOCS}

Modified: head/devel/erlang-neotoma/Makefile
==============================================================================
--- head/devel/erlang-neotoma/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-neotoma/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -24,8 +24,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	seancribbs
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/%%PORTVERSION%%/${PORTVERSION}/" ${WRKSRC}/src/neotoma.app.src
-	@${RM} ${WRKSRC}/src/*.bak ${WRKSRC}/src/*.orig
+	@${REINPLACE_CMD} -i '' -e 's/{ *vsn, git *}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/devel/erlang-parse_trans/Makefile
==============================================================================
--- head/devel/erlang-parse_trans/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-parse_trans/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -17,7 +17,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	uwiger
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/{vsn, git}/{vsn,"${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
+	@${RM} ${WRKSRC}/src/*.orig
+	@${REINPLACE_CMD} -i '' -e 's/{ *vsn, git *}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 
 do-build:
 	@cd ${WRKSRC} && ./rebar compile

Modified: head/devel/erlang-parse_trans/pkg-plist
==============================================================================
--- head/devel/erlang-parse_trans/pkg-plist	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-parse_trans/pkg-plist	Mon Jul  6 10:55:35 2015	(r391398)
@@ -10,7 +10,6 @@ lib/erlang/lib/parse_trans-%%VERSION%%/i
 lib/erlang/lib/parse_trans-%%VERSION%%/src/ct_expand.erl
 lib/erlang/lib/parse_trans-%%VERSION%%/src/exprecs.erl
 lib/erlang/lib/parse_trans-%%VERSION%%/src/parse_trans.app.src
-lib/erlang/lib/parse_trans-%%VERSION%%/src/parse_trans.app.src.bak
 lib/erlang/lib/parse_trans-%%VERSION%%/src/parse_trans.erl
 lib/erlang/lib/parse_trans-%%VERSION%%/src/parse_trans_codegen.erl
 lib/erlang/lib/parse_trans-%%VERSION%%/src/parse_trans_mod.erl

Modified: head/devel/erlang-protobuffs/Makefile
==============================================================================
--- head/devel/erlang-protobuffs/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-protobuffs/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -23,8 +23,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/%%PORTVERSION%%/${PORTVERSION}/" ${WRKSRC}/src/protobuffs.app.src
-	@${RM} ${WRKSRC}/src/*.bak ${WRKSRC}/src/*.orig
+	@${REINPLACE_CMD} -i '' -e 's/{ *vsn, git *}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 
 do-install:
 .if ${PORT_OPTIONS:MDOCS}

Modified: head/devel/erlang-recon/Makefile
==============================================================================
--- head/devel/erlang-recon/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/devel/erlang-recon/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -21,8 +21,7 @@ GH_ACCOUNT=	ferd
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e "s@%%LOCALBASE%%@${LOCALBASE}@" ${WRKSRC}/script/app_deps.erl
-	@${RM} ${WRKSRC}/script/*.bak ${WRKSRC}/script/*.orig
+	@${REINPLACE_CMD} -i '' -e "s@%%LOCALBASE%%@${LOCALBASE}@" ${WRKSRC}/script/app_deps.erl
 
 do-build:
 	@cd ${WRKSRC} && ./rebar compile doc

Modified: head/net/erlang-xmlrpc/Makefile
==============================================================================
--- head/net/erlang-xmlrpc/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/net/erlang-xmlrpc/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -22,8 +22,7 @@ WRKSRC=		${WRKDIR}/xmlrpc-${PORTVERSION}
 PORTDOCS=	*
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|XMERL_PATH=.*|XMERL_PATH=${LOCALBASE}/lib/erlang/lib/xmerl|g' ${WRKSRC}/src/Makefile
-	@${RM} ${WRKSRC}/src/Makefile.bak ${WRKSRC}/src/*.orig
+	@${REINPLACE_CMD} -i '' -e 's|XMERL_PATH=.*|XMERL_PATH=${LOCALBASE}/lib/erlang/lib/xmerl|g' ${WRKSRC}/src/Makefile
 
 do-build:
 	@cd ${WRKSRC}/src && ${MAKE_CMD}

Modified: head/textproc/erlang-edown/Makefile
==============================================================================
--- head/textproc/erlang-edown/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/textproc/erlang-edown/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -17,7 +17,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	uwiger
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/{vsn, git}/{vsn,"${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
+	@${RM} ${WRKSRC}/src/*.orig
+	@${REINPLACE_CMD} -i '' -e 's/{ *vsn, git *}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 
 do-build:
 	@cd ${WRKSRC} && ./rebar compile

Modified: head/textproc/erlang-edown/pkg-plist
==============================================================================
--- head/textproc/erlang-edown/pkg-plist	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/textproc/erlang-edown/pkg-plist	Mon Jul  6 10:55:35 2015	(r391398)
@@ -8,7 +8,6 @@ lib/erlang/lib/edown-%%VERSION%%/priv/sc
 lib/erlang/lib/edown-%%VERSION%%/priv/scripts/rebar.config.script
 lib/erlang/lib/edown-%%VERSION%%/priv/scripts/remove_deps.script
 lib/erlang/lib/edown-%%VERSION%%/src/edown.app.src
-lib/erlang/lib/edown-%%VERSION%%/src/edown.app.src.bak
 lib/erlang/lib/edown-%%VERSION%%/src/edown_doclet.erl
 lib/erlang/lib/edown-%%VERSION%%/src/edown_layout.erl
 lib/erlang/lib/edown-%%VERSION%%/src/edown_lib.erl

Modified: head/www/erlang-webmachine/Makefile
==============================================================================
--- head/www/erlang-webmachine/Makefile	Mon Jul  6 10:52:46 2015	(r391397)
+++ head/www/erlang-webmachine/Makefile	Mon Jul  6 10:55:35 2015	(r391398)
@@ -21,8 +21,7 @@ USE_GITHUB=     yes
 GH_ACCOUNT=     basho
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/{vsn, git}/{vsn,\"${PORTVERSION}\"}/" ${WRKSRC}/src/webmachine.app.src
-	@${RM} ${WRKSRC}/src/*.bak
+	@${REINPLACE_CMD} -i '' -e 's/{ *vsn, git *}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 	@${RM} ${WRKSRC}/demo/priv/www/uploads/.gitignore
 
 do-install:
