Index: head/devel/erlang-bbmustache/Makefile
===================================================================
--- head/devel/erlang-bbmustache/Makefile	(revision 391397)
+++ head/devel/erlang-bbmustache/Makefile	(revision 391398)
@@ -1,42 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	bbmustache
 PORTVERSION=	1.0.3
 DISTVERSIONPREFIX=v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Mustache template engine for Erlang
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/erl:${PORTSDIR}/lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USE_GITHUB=	yes
 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
 
 post-build:
 	@${LN} -s ${WRKSRC}/_build/dev/lib/${PORTNAME}/ebin ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	@${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}/src
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 
 .include <bsd.port.mk>
Index: head/devel/erlang-bear/files/patch-src_bear.app.src
===================================================================
--- head/devel/erlang-bear/files/patch-src_bear.app.src	(revision 391397)
+++ head/devel/erlang-bear/files/patch-src_bear.app.src	(nonexistent)
@@ -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, []}

Property changes on: head/devel/erlang-bear/files/patch-src_bear.app.src
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-1
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/erlang-bear/Makefile
===================================================================
--- head/devel/erlang-bear/Makefile	(revision 391397)
+++ head/devel/erlang-bear/Makefile	(revision 391398)
@@ -1,38 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	bear
 PORTVERSION=	0.8.2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Set of statistics functions for Erlang
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USES=		gmake
 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
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	@${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}/src
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 
 .include <bsd.port.mk>
Index: head/devel/erlang-cuttlefish/Makefile
===================================================================
--- head/devel/erlang-cuttlefish/Makefile	(revision 391397)
+++ head/devel/erlang-cuttlefish/Makefile	(revision 391398)
@@ -1,40 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	cuttlefish
 PORTVERSION=	2.0.3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Configuration library for Erlang
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
 		erlang-lager>=2.1.1:${PORTSDIR}/devel/erlang-lager \
 		erlang-getopt>=0.8.2:${PORTSDIR}/devel/erlang-getopt \
 		erlang-neotoma>=1.7.2:${PORTSDIR}/devel/erlang-neotoma
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USES=		gmake
 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}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	@${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}/src
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 	${INSTALL_SCRIPT} ${WRKSRC}/cuttlefish ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/devel/erlang-cuttlefish/files/patch-src_cuttlefish.app.src
===================================================================
--- head/devel/erlang-cuttlefish/files/patch-src_cuttlefish.app.src	(revision 391397)
+++ head/devel/erlang-cuttlefish/files/patch-src_cuttlefish.app.src	(nonexistent)
@@ -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,

Property changes on: head/devel/erlang-cuttlefish/files/patch-src_cuttlefish.app.src
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-1
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/erlang-folsom/Makefile
===================================================================
--- head/devel/erlang-folsom/Makefile	(revision 391397)
+++ head/devel/erlang-folsom/Makefile	(revision 391398)
@@ -1,41 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	folsom
 PORTVERSION=	0.8.2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang based metrics system inspired by Coda Hale's metrics
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
 		erlang-bear>=0.8.2:${PORTSDIR}/devel/erlang-bear
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USES=		gmake
 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
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	@${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}/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
 
 .include <bsd.port.mk>
Index: head/devel/erlang-folsom/files/patch-src_folsom.app.src
===================================================================
--- head/devel/erlang-folsom/files/patch-src_folsom.app.src	(revision 391397)
+++ head/devel/erlang-folsom/files/patch-src_folsom.app.src	(nonexistent)
@@ -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,

Property changes on: head/devel/erlang-folsom/files/patch-src_folsom.app.src
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-1
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/erlang-gen_leader/files/patch-ebin_gen__leader.app
===================================================================
--- head/devel/erlang-gen_leader/files/patch-ebin_gen__leader.app	(revision 391397)
+++ head/devel/erlang-gen_leader/files/patch-ebin_gen__leader.app	(nonexistent)
@@ -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, [ ]},

Property changes on: head/devel/erlang-gen_leader/files/patch-ebin_gen__leader.app
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/erlang-gen_leader/Makefile
===================================================================
--- head/devel/erlang-gen_leader/Makefile	(revision 391397)
+++ head/devel/erlang-gen_leader/Makefile	(revision 391398)
@@ -1,43 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	gen_leader
 PORTVERSION=	2014.10.20
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Leader election behavior for Erlang
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/erl:${PORTSDIR}/lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	garret-smith
 GH_PROJECT=	gen_leader_revival
 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
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/skeleton.erl ${STAGEDIR}${EXAMPLESDIR}
 	@${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}/src
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/include
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 
 .include <bsd.port.mk>
Index: head/devel/erlang-gproc/files/patch-src_gproc.app.src
===================================================================
--- head/devel/erlang-gproc/files/patch-src_gproc.app.src	(revision 391397)
+++ head/devel/erlang-gproc/files/patch-src_gproc.app.src	(nonexistent)
@@ -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 ] },

Property changes on: head/devel/erlang-gproc/files/patch-src_gproc.app.src
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/erlang-gproc/Makefile
===================================================================
--- head/devel/erlang-gproc/Makefile	(revision 391397)
+++ head/devel/erlang-gproc/Makefile	(revision 391398)
@@ -1,44 +1,43 @@
 # $FreeBSD$
 
 PORTNAME=	gproc
 PORTVERSION=	0.5
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Process dictionary for Erlang
 
 LICENSE=	EPLICENCE
 LICENSE_NAME=	Erlang Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/erl:${PORTSDIR}/lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USE_GITHUB=	yes
 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
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 	@${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}/src
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/include
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 
 .include <bsd.port.mk>
Index: head/devel/erlang-jobs/Makefile
===================================================================
--- head/devel/erlang-jobs/Makefile	(revision 391397)
+++ head/devel/erlang-jobs/Makefile	(revision 391398)
@@ -1,42 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	jobs
 PORTVERSION=	0.3
 PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Job scheduler and load regulation for Erlang
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
 		rebar:${PORTSDIR}/devel/rebar \
 		erlang-parse_trans>=0:${PORTSDIR}/devel/erlang-parse_trans
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 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
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
 	@${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}/src
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 	${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/include
 
 .include <bsd.port.mk>
Index: head/devel/erlang-jobs/pkg-plist
===================================================================
--- head/devel/erlang-jobs/pkg-plist	(revision 391397)
+++ head/devel/erlang-jobs/pkg-plist	(revision 391398)
@@ -1,52 +1,51 @@
 lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs.app
 lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs.beam
 lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs_app.beam
 lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs_info.beam
 lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs_lib.beam
 lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs_prod_simple.beam
 lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs_queue.beam
 lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs_queue_list.beam
 lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs_sampler.beam
 lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs_sampler_cpu.beam
 lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs_sampler_history.beam
 lib/erlang/lib/jobs-%%VERSION%%/ebin/jobs_sampler_mnesia.beam
 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
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs_lib.erl
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs_prod_simple.erl
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs_queue.erl
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs_queue_list.erl
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs_sampler.erl
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs_sampler_cpu.erl
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs_sampler_history.erl
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs_sampler_mnesia.erl
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs_server.erl
 lib/erlang/lib/jobs-%%VERSION%%/src/jobs_stateful_simple.erl
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/edoc-info
 %%PORTDOCS%%%%DOCSDIR%%/erlang.png
 %%PORTDOCS%%%%DOCSDIR%%/erlang07g-wiger.pdf
 %%PORTDOCS%%%%DOCSDIR%%/jobs.md
 %%PORTDOCS%%%%DOCSDIR%%/jobs_app.md
 %%PORTDOCS%%%%DOCSDIR%%/jobs_info.md
 %%PORTDOCS%%%%DOCSDIR%%/jobs_lib.md
 %%PORTDOCS%%%%DOCSDIR%%/jobs_prod_simple.md
 %%PORTDOCS%%%%DOCSDIR%%/jobs_queue.md
 %%PORTDOCS%%%%DOCSDIR%%/jobs_queue_list.md
 %%PORTDOCS%%%%DOCSDIR%%/jobs_sampler.md
 %%PORTDOCS%%%%DOCSDIR%%/jobs_sampler_cpu.md
 %%PORTDOCS%%%%DOCSDIR%%/jobs_sampler_history.md
 %%PORTDOCS%%%%DOCSDIR%%/jobs_sampler_mnesia.md
 %%PORTDOCS%%%%DOCSDIR%%/jobs_server.md
 %%PORTDOCS%%%%DOCSDIR%%/jobs_stateful_simple.md
 %%PORTDOCS%%%%DOCSDIR%%/overview.edoc
 %%PORTDOCS%%%%DOCSDIR%%/stylesheet.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jobs_cpu.gnu
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/performance_logger.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/performer.erl
Index: head/devel/erlang-msgpack/Makefile
===================================================================
--- head/devel/erlang-msgpack/Makefile	(revision 391397)
+++ head/devel/erlang-msgpack/Makefile	(revision 391398)
@@ -1,44 +1,43 @@
 # $FreeBSD$
 
 PORTNAME=	msgpack
 PORTVERSION=	0.3.3
 PORTREVISION=	3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	MessagePack (de)serializer for Erlang
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	msgpack
 GH_PROJECT=	msgpack-erlang
 
 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}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 .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}/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
 
 .include <bsd.port.mk>
Index: head/devel/erlang-msgpack/files/patch-src_msgpack.app.src
===================================================================
--- head/devel/erlang-msgpack/files/patch-src_msgpack.app.src	(revision 391397)
+++ head/devel/erlang-msgpack/files/patch-src_msgpack.app.src	(nonexistent)
@@ -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]
-   },

Property changes on: head/devel/erlang-msgpack/files/patch-src_msgpack.app.src
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/erlang-neotoma/Makefile
===================================================================
--- head/devel/erlang-neotoma/Makefile	(revision 391397)
+++ head/devel/erlang-neotoma/Makefile	(revision 391398)
@@ -1,43 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	neotoma
 PORTVERSION=	1.7.2
 PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang library and packrat parser-generator
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SUB_FILES+=	neotoma
 SUB_LIST+=	PORTNAME=${PORTNAME} \
 		PORTVERSION=${PORTVERSION}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 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}
 	${INSTALL_DATA} ${WRKSRC}/README.textile ${STAGEDIR}${DOCSDIR}
 	@${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}/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}/priv/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/priv
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 	${INSTALL_SCRIPT} ${WRKSRC}/neotoma ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
 	${INSTALL_SCRIPT} ${WRKDIR}/neotoma ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/devel/erlang-neotoma/files/patch-src_neotoma.app.src
===================================================================
--- head/devel/erlang-neotoma/files/patch-src_neotoma.app.src	(revision 391397)
+++ head/devel/erlang-neotoma/files/patch-src_neotoma.app.src	(nonexistent)
@@ -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]}
-  ]
- }.

Property changes on: head/devel/erlang-neotoma/files/patch-src_neotoma.app.src
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-1
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/erlang-parse_trans/Makefile
===================================================================
--- head/devel/erlang-parse_trans/Makefile	(revision 391397)
+++ head/devel/erlang-parse_trans/Makefile	(revision 391398)
@@ -1,39 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	parse_trans
 PORTVERSION=	2.9.2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Parse transform utilities for Erlang
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 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
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
 	@${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}/src
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 	${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/include
 
 .include <bsd.port.mk>
Index: head/devel/erlang-parse_trans/pkg-plist
===================================================================
--- head/devel/erlang-parse_trans/pkg-plist	(revision 391397)
+++ head/devel/erlang-parse_trans/pkg-plist	(revision 391398)
@@ -1,44 +1,43 @@
 lib/erlang/lib/parse_trans-%%VERSION%%/ebin/ct_expand.beam
 lib/erlang/lib/parse_trans-%%VERSION%%/ebin/exprecs.beam
 lib/erlang/lib/parse_trans-%%VERSION%%/ebin/parse_trans.app
 lib/erlang/lib/parse_trans-%%VERSION%%/ebin/parse_trans.beam
 lib/erlang/lib/parse_trans-%%VERSION%%/ebin/parse_trans_codegen.beam
 lib/erlang/lib/parse_trans-%%VERSION%%/ebin/parse_trans_mod.beam
 lib/erlang/lib/parse_trans-%%VERSION%%/ebin/parse_trans_pp.beam
 lib/erlang/lib/parse_trans-%%VERSION%%/include/codegen.hrl
 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
 lib/erlang/lib/parse_trans-%%VERSION%%/src/parse_trans_pp.erl
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/ct_expand.md
 %%PORTDOCS%%%%DOCSDIR%%/edoc-info
 %%PORTDOCS%%%%DOCSDIR%%/erlang.png
 %%PORTDOCS%%%%DOCSDIR%%/exprecs.md
 %%PORTDOCS%%%%DOCSDIR%%/parse_trans.md
 %%PORTDOCS%%%%DOCSDIR%%/parse_trans_codegen.md
 %%PORTDOCS%%%%DOCSDIR%%/parse_trans_mod.md
 %%PORTDOCS%%%%DOCSDIR%%/parse_trans_pp.md
 %%PORTDOCS%%%%DOCSDIR%%/stylesheet.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ct_expand_test.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex1.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex_codegen.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex_gen_module.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex_gproc_send_xform.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex_pmod.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exprecs_eunit.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lc.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pmod.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/t.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/t_ex.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_exprecs.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_exprecs_vsns.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_pt.erl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_transform_mod.erl
Index: head/devel/erlang-protobuffs/Makefile
===================================================================
--- head/devel/erlang-protobuffs/Makefile	(revision 391397)
+++ head/devel/erlang-protobuffs/Makefile	(revision 391398)
@@ -1,40 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=	protobuffs
 PORTVERSION=	0.8.1p5
 PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Protocol Buffers interface for Erlang
 
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	basho
 GH_PROJECT=	erlang_protobuffs
 
 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}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR}
 .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}/src
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 
 .include <bsd.port.mk>
Index: head/devel/erlang-protobuffs/files/patch-src_protobuffs.app.src
===================================================================
--- head/devel/erlang-protobuffs/files/patch-src_protobuffs.app.src	(revision 391397)
+++ head/devel/erlang-protobuffs/files/patch-src_protobuffs.app.src	(nonexistent)
@@ -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, [] }

Property changes on: head/devel/erlang-protobuffs/files/patch-src_protobuffs.app.src
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/erlang-recon/Makefile
===================================================================
--- head/devel/erlang-recon/Makefile	(revision 391397)
+++ head/devel/erlang-recon/Makefile	(revision 391398)
@@ -1,43 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	recon
 PORTVERSION=	2.2.1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Collection of functions and scripts to debug Erlang in production
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/erl:${PORTSDIR}/lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USE_GITHUB=	yes
 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
 	@${RM} ${WRKSRC}/doc/packages-frame.html
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 	@${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}/script
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 	${INSTALL_DATA} ${WRKSRC}/script/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/script
 
 .include <bsd.port.mk>
Index: head/net/erlang-xmlrpc/Makefile
===================================================================
--- head/net/erlang-xmlrpc/Makefile	(revision 391397)
+++ head/net/erlang-xmlrpc/Makefile	(revision 391398)
@@ -1,45 +1,44 @@
 # $FreeBSD$
 
 PORTNAME=	xmlrpc
 PORTVERSION=	1.13
 PORTREVISION=	12
 CATEGORIES=	net
 MASTER_SITES=	http://www.erlang.org/contrib/
 PKGNAMEPREFIX=	erlang-
 DIST_SUBDIR=	erlang
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Library for XMLRPC support in Erlang
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=      VERSION="${PORTVERSION}"
 
 USES=		gmake tar:tgz
 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}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for FILE in xmlrpc.pdf xmlrpc.ps xmlrpc.txt; do \
 		${INSTALL_DATA} ${WRKSRC}/doc/$${FILE} ${STAGEDIR}${DOCSDIR}; \
 	done
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/xmlrpc-${PORTVERSION}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/xmlrpc-${PORTVERSION}/ebin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/xmlrpc-${PORTVERSION}/src
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/xmlrpc-${PORTVERSION}/ebin
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/xmlrpc-${PORTVERSION}/src
 	${INSTALL_MAN} ${WRKSRC}/doc/xmlrpc.3 ${STAGEDIR}${MANPREFIX}/man/man3/erlang_xmlrpc.3
 
 .include <bsd.port.mk>
Index: head/textproc/erlang-edown/Makefile
===================================================================
--- head/textproc/erlang-edown/Makefile	(revision 391397)
+++ head/textproc/erlang-edown/Makefile	(revision 391398)
@@ -1,37 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	edown
 PORTVERSION=	0.7
 CATEGORIES=	textproc
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	EDoc extension for generating Github-flavored Markdown
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 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
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
 	@${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}/src
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/priv
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	${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/textproc/erlang-edown/pkg-plist
===================================================================
--- head/textproc/erlang-edown/pkg-plist	(revision 391397)
+++ head/textproc/erlang-edown/pkg-plist	(revision 391398)
@@ -1,24 +1,23 @@
 lib/erlang/lib/edown-%%VERSION%%/ebin/edown.app
 lib/erlang/lib/edown-%%VERSION%%/ebin/edown_doclet.beam
 lib/erlang/lib/edown-%%VERSION%%/ebin/edown_layout.beam
 lib/erlang/lib/edown-%%VERSION%%/ebin/edown_lib.beam
 lib/erlang/lib/edown-%%VERSION%%/ebin/edown_make.beam
 lib/erlang/lib/edown-%%VERSION%%/ebin/edown_xmerl.beam
 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
 lib/erlang/lib/edown-%%VERSION%%/src/edown_make.erl
 lib/erlang/lib/edown-%%VERSION%%/src/edown_xmerl.erl
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/edoc-info
 %%PORTDOCS%%%%DOCSDIR%%/edown_doclet.md
 %%PORTDOCS%%%%DOCSDIR%%/edown_layout.md
 %%PORTDOCS%%%%DOCSDIR%%/edown_lib.md
 %%PORTDOCS%%%%DOCSDIR%%/edown_make.md
 %%PORTDOCS%%%%DOCSDIR%%/edown_xmerl.md
 %%PORTDOCS%%%%DOCSDIR%%/overview.edoc
Index: head/www/erlang-webmachine/Makefile
===================================================================
--- head/www/erlang-webmachine/Makefile	(revision 391397)
+++ head/www/erlang-webmachine/Makefile	(revision 391398)
@@ -1,45 +1,44 @@
 # $FreeBSD$
 
 PORTNAME=	webmachine
 PORTVERSION=	1.10.8
 CATEGORIES=	www devel
 PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	HTTP semantic awareness on top mochiweb
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
 		erlang-mochiweb-basho>=2.9.0p1:${PORTSDIR}/www/erlang-mochiweb-basho
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=      VERSION="${PORTVERSION}"
 
 USES=		gmake
 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:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for FILE in README.org; do \
 		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${STAGEDIR}${DOCSDIR}; \
 	done
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/demo && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
 	@${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>