Some patch files were meant to get rid of {vsn, git} in rebar.config;

replace them with REINPLACE_CMD.

26 files changed, 18 insertions, 115 deletions

diff --git a/devel/erlang-bbmustache/Makefile b/devel/erlang-bbmustache/Makefile
index 6cc609d..7297288 100644
--- a/devel/erlang-bbmustache/Makefile
+++ b/devel/erlang-bbmustache/Makefile
@@ -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
diff --git a/devel/erlang-bear/Makefile b/devel/erlang-bear/Makefile
index 2d091b7..dd0dd52 100644
--- a/devel/erlang-bear/Makefile
+++ b/devel/erlang-bear/Makefile
@@ -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
diff --git a/devel/erlang-bear/files/patch-src_bear.app.src b/devel/erlang-bear/files/patch-src_bear.app.src
deleted file mode 100644
index a61bf80..0000000
--- a/devel/erlang-bear/files/patch-src_bear.app.src
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bear.app.src.orig	2015-05-20 12:29:56 UTC
-+++ src/bear.app.src
-@@ -1,7 +1,7 @@
- {application, bear,
-  [
-   {description, ""},
--  {vsn, git},
-+  {vsn, "%%PORTVERSION%%"},
-   {registered, []},
-   {applications, []},
-   {env, []}
diff --git a/devel/erlang-cuttlefish/Makefile b/devel/erlang-cuttlefish/Makefile
index 50c0a07..6d65a83 100644
--- a/devel/erlang-cuttlefish/Makefile
+++ b/devel/erlang-cuttlefish/Makefile
@@ -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}
diff --git a/devel/erlang-cuttlefish/files/patch-src_cuttlefish.app.src b/devel/erlang-cuttlefish/files/patch-src_cuttlefish.app.src
deleted file mode 100644
index 26452a0..0000000
--- a/devel/erlang-cuttlefish/files/patch-src_cuttlefish.app.src
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cuttlefish.app.src.orig	2015-05-20 09:05:30 UTC
-+++ src/cuttlefish.app.src
-@@ -1,7 +1,7 @@
- {application, cuttlefish,
-  [
-   {description, "cuttlefish configuration abstraction"},
--  {vsn, git},
-+  {vsn, "%%PORTVERSION%%"},
-   {registered, []},
-   {applications, [
-                   kernel,
diff --git a/devel/erlang-folsom/Makefile b/devel/erlang-folsom/Makefile
index 6cdafa1..5916d94 100644
--- a/devel/erlang-folsom/Makefile
+++ b/devel/erlang-folsom/Makefile
@@ -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
diff --git a/devel/erlang-folsom/files/patch-src_folsom.app.src b/devel/erlang-folsom/files/patch-src_folsom.app.src
deleted file mode 100644
index dddcc2c..0000000
--- a/devel/erlang-folsom/files/patch-src_folsom.app.src
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/folsom.app.src.orig	2015-05-20 12:38:29 UTC
-+++ src/folsom.app.src
-@@ -2,7 +2,7 @@
- {application, folsom,
-  [
-   {description, "Erlang based metrics system"},
--  {vsn, git},
-+  {vsn, "%%PORTVERSION%%"},
-   {modules, []},
-   {registered, [folsom_meter_timer_server,
-                 folsom_metrics_histogram_ets,
diff --git a/devel/erlang-gen_leader/Makefile b/devel/erlang-gen_leader/Makefile
index b269cd0..42390ef 100644
--- a/devel/erlang-gen_leader/Makefile
+++ b/devel/erlang-gen_leader/Makefile
@@ -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
diff --git a/devel/erlang-gen_leader/files/patch-ebin_gen__leader.app b/devel/erlang-gen_leader/files/patch-ebin_gen__leader.app
deleted file mode 100644
index cdb60f4..0000000
--- a/devel/erlang-gen_leader/files/patch-ebin_gen__leader.app
+++ /dev/null
@@ -1,11 +0,0 @@
---- ebin/gen_leader.app.orig	2015-06-02 14:02:02 UTC
-+++ ebin/gen_leader.app
-@@ -3,7 +3,7 @@
- {application, gen_leader,
-  [
-   {description, "The gen_leader behaviour"},
--  {vsn, "1.0"},
-+  {vsn, "%%PORTVERSION%%"},
-   {id, "gen_leader"},
-   {modules, [gen_leader]},
-   {registered, [ ]},
diff --git a/devel/erlang-gproc/Makefile b/devel/erlang-gproc/Makefile
index 522a49f..46cf5de 100644
--- a/devel/erlang-gproc/Makefile
+++ b/devel/erlang-gproc/Makefile
@@ -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
diff --git a/devel/erlang-gproc/files/patch-src_gproc.app.src b/devel/erlang-gproc/files/patch-src_gproc.app.src
deleted file mode 100644
index ef6f404..0000000
--- a/devel/erlang-gproc/files/patch-src_gproc.app.src
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gproc.app.src.orig	2015-06-02 13:48:54 UTC
-+++ src/gproc.app.src
-@@ -5,7 +5,7 @@
- {application, gproc,
-  [
-   {description, "GPROC"},
--  {vsn, git},
-+  {vsn, "%%PORTVERSION%%"},
-   {id, "GPROC"},
-   {registered, [ ] },
-   {applications, [ kernel, stdlib ] },
diff --git a/devel/erlang-jobs/Makefile b/devel/erlang-jobs/Makefile
index c788643..4a631fe 100644
--- a/devel/erlang-jobs/Makefile
+++ b/devel/erlang-jobs/Makefile
@@ -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
diff --git a/devel/erlang-jobs/pkg-plist b/devel/erlang-jobs/pkg-plist
index da072cc..4baebd4 100644
--- a/devel/erlang-jobs/pkg-plist
+++ b/devel/erlang-jobs/pkg-plist
@@ -14,7 +14,6 @@ lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs_server.beam
 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
diff --git a/devel/erlang-msgpack/Makefile b/devel/erlang-msgpack/Makefile
index 44719a2..d34601d 100644
--- a/devel/erlang-msgpack/Makefile
+++ b/devel/erlang-msgpack/Makefile
@@ -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}
diff --git a/devel/erlang-msgpack/files/patch-src_msgpack.app.src b/devel/erlang-msgpack/files/patch-src_msgpack.app.src
deleted file mode 100644
index 874c7c6..0000000
--- a/devel/erlang-msgpack/files/patch-src_msgpack.app.src
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/msgpack.app.src.orig
-+++ src/msgpack.app.src
-@@ -1,6 +1,6 @@
- {application, msgpack,
-  [{description, "MessagePack serializer/deserializer"},
--  {vsn, git},
-+  {vsn, "%%PORTVERSION%%"},
-   {modules, 
-    [msgpack]
-   },
diff --git a/devel/erlang-neotoma/Makefile b/devel/erlang-neotoma/Makefile
index c318486..44fd9da 100644
--- a/devel/erlang-neotoma/Makefile
+++ b/devel/erlang-neotoma/Makefile
@@ -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}
diff --git a/devel/erlang-neotoma/files/patch-src_neotoma.app.src b/devel/erlang-neotoma/files/patch-src_neotoma.app.src
deleted file mode 100644
index ea30402..0000000
--- a/devel/erlang-neotoma/files/patch-src_neotoma.app.src
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/neotoma.app.src.orig	2015-05-14 15:21:25 UTC
-+++ src/neotoma.app.src
-@@ -1,7 +1,7 @@
- {application, neotoma,
-  [
-   {description, "PEG/Packrat toolkit and parser-generator."},
--  {vsn, git},
-+  {vsn, "%%PORTVERSION%%"},
-   {applications, [kernel, stdlib]}
-  ]
- }.
diff --git a/devel/erlang-parse_trans/Makefile b/devel/erlang-parse_trans/Makefile
index d8bc00e..e3bea72 100644
--- a/devel/erlang-parse_trans/Makefile
+++ b/devel/erlang-parse_trans/Makefile
@@ -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
diff --git a/devel/erlang-parse_trans/pkg-plist b/devel/erlang-parse_trans/pkg-plist
index d87a63e..cdfa47f 100644
--- a/devel/erlang-parse_trans/pkg-plist
+++ b/devel/erlang-parse_trans/pkg-plist
@@ -10,7 +10,6 @@ lib/erlang/lib/parse_trans-%%VERSION%%/include/exprecs.hrl
 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
diff --git a/devel/erlang-protobuffs/Makefile b/devel/erlang-protobuffs/Makefile
index 21cb9fe..575eb80 100644
--- a/devel/erlang-protobuffs/Makefile
+++ b/devel/erlang-protobuffs/Makefile
@@ -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}
diff --git a/devel/erlang-protobuffs/files/patch-src_protobuffs.app.src b/devel/erlang-protobuffs/files/patch-src_protobuffs.app.src
deleted file mode 100644
index 7893a19..0000000
--- a/devel/erlang-protobuffs/files/patch-src_protobuffs.app.src
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/protobuffs.app.src.orig
-+++ src/protobuffs.app.src
-@@ -1,6 +1,6 @@
- { application, protobuffs,
-   [ { description, "Google protobuffs implementation for Erlang." },
--    { vsn, git },
-+    { vsn, "%%PORTVERSION%%" },
-     { registered, [] },
-     { applications, [kernel,stdlib] },
-     { env, [] }
diff --git a/devel/erlang-recon/Makefile b/devel/erlang-recon/Makefile
index f0ae0c1..96e9fef 100644
--- a/devel/erlang-recon/Makefile
+++ b/devel/erlang-recon/Makefile
@@ -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
diff --git a/net/erlang-xmlrpc/Makefile b/net/erlang-xmlrpc/Makefile
index 50a164f..2aa4580 100644
--- a/net/erlang-xmlrpc/Makefile
+++ b/net/erlang-xmlrpc/Makefile
@@ -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}
diff --git a/textproc/erlang-edown/Makefile b/textproc/erlang-edown/Makefile
index e1b6c03..1fa354b 100644
--- a/textproc/erlang-edown/Makefile
+++ b/textproc/erlang-edown/Makefile
@@ -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
diff --git a/textproc/erlang-edown/pkg-plist b/textproc/erlang-edown/pkg-plist
index c770ca3669..f6314497 100644
--- a/textproc/erlang-edown/pkg-plist
+++ b/textproc/erlang-edown/pkg-plist
@@ -8,7 +8,6 @@ lib/erlang/lib/edown-%%VERSION%%/priv/scripts/check_edown.script
 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
diff --git a/www/erlang-webmachine/Makefile b/www/erlang-webmachine/Makefile
index 5b80628..e424fab 100644
--- a/www/erlang-webmachine/Makefile
+++ b/www/erlang-webmachine/Makefile
@@ -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: