Index: head/devel/rebar3/Makefile
===================================================================
--- head/devel/rebar3/Makefile	(revision 496069)
+++ head/devel/rebar3/Makefile	(revision 496070)
@@ -1,99 +1,98 @@
 # $FreeBSD$
 
 PORTNAME=	rebar3
 PORTVERSION=	3.9.1
 PORTEPOCH=	1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES+=	LOCAL/olgeni:deps \
 		http://olgeni.olgeni.com/~olgeni/distfiles/:deps \
 		https://repo.hex.pm/tarballs/:hex
-DISTFILES=	rebar3-cache-${CACHE_VERSION}${EXTRACT_SUFX}:deps
+DISTFILES=	rebar3-cache-${PORTVERSION}${EXTRACT_SUFX}:deps
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
-		rebar3-cache-${CACHE_VERSION}${EXTRACT_SUFX}
+		rebar3-cache-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Build tool for Erlang
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang \
 		${LOCALBASE}/bin/git:devel/git
 RUN_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang
 
 OPTIONS_DEFINE=	BASH ZSH EXAMPLES
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rebar
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTEXAMPLES=	rebar.config.sample
 
 BASH_PLIST_FILES=	share/bash-completion/completions/rebar3
 ZSH_PLIST_FILES=	share/zsh/site-functions/_rebar3
 
-CACHE_VERSION=	22
 # from rebar.config
 REBAR_DEPS=	bbmustache-1.6.0 \
 		certifi-2.3.1 \
 		cf-0.2.2 \
 		cth_readable-1.4.3 \
 		erlware_commons-1.3.1 \
 		eunit_formatters-0.5.0 \
 		getopt-1.0.1 \
 		parse_trans-3.3.0 \
 		providers-1.7.0 \
 		relx-3.29.0 \
 		ssl_verify_fun-1.1.3
 
 .for _dep in ${REBAR_DEPS} ${REBAR_PLUGINS}
 DISTFILES+=	${_dep}.tar:hex
 .endfor
 
-.include <bsd.port.options.mk>
-
 # convenience target to rebuild the rebar3 cache file
 build-cache:
-	cd ${WRKDIR} && ${TAR} -c -v -z -f rebar3-cache-${CACHE_VERSION}${EXTRACT_SUFX} .cache
+	cd ${WRKDIR} && ${TAR} -c -v -z -f rebar3-cache-${PORTVERSION}${EXTRACT_SUFX} .cache
 
 post-extract:
-	@${REINPLACE_CMD} -e 's/{vsn, "git"}/{vsn, "${GH_TAGNAME}"}/' ${WRKSRC}/src/rebar.app.src
+	@${REINPLACE_CMD} -e 's/{ *vsn,.*}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 .for _dep in ${REBAR_DEPS}
 	${MKDIR} ${WRKSRC}/_build/default/lib/${_dep:C/-.*//}
 	${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\
 		${TAR} xfz - -C ${WRKSRC}/_build/default/lib/${_dep:C/-.*//}
 .endfor
 .for _dep in ${REBAR_PLUGINS}
 	${MKDIR} ${WRKSRC}/_build/default/plugins/${_dep:C/-.*//}
 	${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\
 		${TAR} xfz - -C ${WRKSRC}/_build/default/plugins/${_dep:C/-.*//}
 .endfor
-
 	@${MKDIR} ${WRKSRC}/_build/bootstrap/lib
 	@${MKDIR} ${WRKSRC}/_build/bootstrap/plugins
 .for _dep in ${REBAR_DEPS}
 	${LN} -sf ${WRKSRC}/_build/default/lib/${_dep:C/-.*//} ${WRKSRC}/_build/bootstrap/lib/
 .endfor
 .for _dep in ${REBAR_PLUGINS}
 	${LN} -sf ${WRKSRC}/_build/default/plugins/${_dep:C/-.*//} ${WRKSRC}/_build/bootstrap/plugins/
 .endfor
 
 do-build:
 	@${RM} ${WRKSRC}/rebar.lock
 	@cd ${WRKSRC} && HOME=${WRKDIR} ./bootstrap
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-.if ${PORT_OPTIONS:MBASH}
+
+do-install-BASH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
 	${INSTALL_DATA} ${WRKSRC}/priv/shell-completion/bash/rebar3 \
 		${STAGEDIR}${PREFIX}/share/bash-completion/completions/rebar3
-.endif
-.if ${PORT_OPTIONS:MZSH}
+
+do-install-ZSH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	${INSTALL_DATA} ${WRKSRC}/priv/shell-completion/zsh/_rebar3 \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/
-.endif
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/rebar.config.sample ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/devel/rebar3/distinfo
===================================================================
--- head/devel/rebar3/distinfo	(revision 496069)
+++ head/devel/rebar3/distinfo	(revision 496070)
@@ -1,27 +1,27 @@
-TIMESTAMP = 1552732753
-SHA256 (rebar3-cache-22.tar.gz) = 86afa24c82e4b472a5443ebb62615508bf97160723218fa9fd0d44e3ee0bdc97
-SIZE (rebar3-cache-22.tar.gz) = 3483012
+TIMESTAMP = 1552738297
+SHA256 (rebar3-cache-3.9.1.tar.gz) = 13d50077d2105aecddcb4ee2ba2ec358dcf5154d898d3b003bb3429bb9d7dbda
+SIZE (rebar3-cache-3.9.1.tar.gz) = 8066
 SHA256 (bbmustache-1.6.0.tar) = 53e02d296512a57be03a98c91541b34d2ca64930268030b2d12364a0332015df
 SIZE (bbmustache-1.6.0.tar) = 15360
 SHA256 (certifi-2.3.1.tar) = e12d667d042c11d130594bae2b0097e63836fe8b1e6d6b2cc48f8bb7a2cf7d68
 SIZE (certifi-2.3.1.tar) = 154112
 SHA256 (cf-0.2.2.tar) = 48283b3019bc7fad56e7b23028a5da4d3e6cd598a553ab2a99a2153bf5f19b21
 SIZE (cf-0.2.2.tar) = 10240
 SHA256 (cth_readable-1.4.3.tar) = cd21b41410f139f41a8d07ce17bbd7073669fd69394b24ccd0e4a869d4822073
 SIZE (cth_readable-1.4.3.tar) = 18432
 SHA256 (erlware_commons-1.3.1.tar) = 7aada93f368d0a0430122e39931b7fb4ac9e94dbf043cdc980ad4330fd9cd166
 SIZE (erlware_commons-1.3.1.tar) = 53248
 SHA256 (eunit_formatters-0.5.0.tar) = d6c8ba213424944e6e05bbc097c32001cdd0abe3925d02454f229b20d68763c9
 SIZE (eunit_formatters-0.5.0.tar) = 14848
 SHA256 (getopt-1.0.1.tar) = 53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c
 SIZE (getopt-1.0.1.tar) = 19456
 SHA256 (parse_trans-3.3.0.tar) = 17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960
 SIZE (parse_trans-3.3.0.tar) = 35840
 SHA256 (providers-1.7.0.tar) = 8be66129ca85c2fa74efd8737cdaedd31c1c1af51dd2fd601495a6def4cae4a6
 SIZE (providers-1.7.0.tar) = 13312
 SHA256 (relx-3.29.0.tar) = 4c6d8f282b5b7937aa76a43fcdfdfb2dd8bc082f560ba58f0641e0aa06879b01
 SIZE (relx-3.29.0.tar) = 85504
 SHA256 (ssl_verify_fun-1.1.3.tar) = 2e120e6505d6e9ededb2836611dfe2f7028432dc280957998e154307b5ea92fe
 SIZE (ssl_verify_fun-1.1.3.tar) = 14848
 SHA256 (rebar-rebar3-3.9.1_GH0.tar.gz) = b7330a67a8cb5d6fb3b53a3246208b7c2b248546bcf62ef71a9a27b1d541c2d8
 SIZE (rebar-rebar3-3.9.1_GH0.tar.gz) = 374591
Index: head/devel/relx/Makefile
===================================================================
--- head/devel/relx/Makefile	(revision 496069)
+++ head/devel/relx/Makefile	(revision 496070)
@@ -1,91 +1,89 @@
 # $FreeBSD$
 
 PORTNAME=	relx
 PORTVERSION=	3.29.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES+=	LOCAL/olgeni:deps \
 		http://olgeni.olgeni.com/~olgeni/distfiles/:deps \
 		https://repo.hex.pm/tarballs/:hex
-DISTFILES=	relx-cache-${CACHE_VERSION}${EXTRACT_SUFX}:deps
+DISTFILES=	relx-cache-${PORTVERSION}${EXTRACT_SUFX}:deps
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
-		relx-cache-${CACHE_VERSION}${EXTRACT_SUFX}
+		relx-cache-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Sane, simple release creation for Erlang
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang \
 		rebar3>=0:devel/rebar3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 # Use either erlware or tsloughter, depending on who actually
 # published the package on hex.pm
 USE_GITHUB=	yes
 GH_ACCOUNT=	erlware
 
-CACHE_VERSION=	22
 # from rebar.config
 REBAR_DEPS=	bbmustache-1.6.1 \
 		cf-0.3.1 \
 		erlware_commons-1.3.0 \
 		getopt-1.0.1 \
 		providers-1.7.0
 
 .for _dep in ${REBAR_DEPS}
 DISTFILES+=	${_dep}.tar:hex
 .endfor
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
 # convenience target to rebuild the relx cache file
 build-cache:
-	cd ${WRKDIR} && ${TAR} -c -v -z -f relx-cache-${CACHE_VERSION}${EXTRACT_SUFX} .cache
+	cd ${WRKDIR} && ${TAR} -c -v -z -f relx-cache-${PORTVERSION}${EXTRACT_SUFX} .cache
 
 # rebar3 insists on downloading dependencies, and some kind of package
 # index into the user's HOME. We need to trick it into behaving by
 # providing both before building.
 
 post-extract:
+	@${REINPLACE_CMD} -e 's/{ *vsn,.*}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 .for _dep in ${REBAR_DEPS}
-	@${MKDIR} ${WRKSRC}/_build/default/lib/${_dep:C/-.*//}
-	@${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\
+	${MKDIR} ${WRKSRC}/_build/default/lib/${_dep:C/-.*//}
+	${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\
 		${TAR} xfz - -C ${WRKSRC}/_build/default/lib/${_dep:C/-.*//}
 .endfor
 
-post-patch:
-	@${REINPLACE_CMD} -i '' -e 's/{ *vsn,.*}/{vsn, "${PORTVERSION}"}/' \
-		${WRKSRC}/src/${PORTNAME}.app.src
-
 do-build:
 	@${RM} ${WRKSRC}/rebar.lock
 	@cd ${WRKSRC} && HOME=${WRKDIR} rebar3 compile
 	@${RM} ${WRKSRC}/rebar.lock
 	@cd ${WRKSRC} && HOME=${WRKDIR} rebar3 escriptize
 
 post-build:
 	@${LN} -s ${WRKSRC}/_build/dev/lib/${PORTNAME}/ebin ${WRKSRC}
 
 do-install:
 	@${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}/include/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/include
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 	${INSTALL_DATA} ${WRKSRC}/_build/default/lib/relx/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	cd ${WRKSRC}/priv && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/priv
 	${INSTALL_SCRIPT} ${WRKSRC}/_build/default/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/devel/relx/distinfo
===================================================================
--- head/devel/relx/distinfo	(revision 496069)
+++ head/devel/relx/distinfo	(revision 496070)
@@ -1,15 +1,15 @@
-TIMESTAMP = 1552732427
-SHA256 (relx-cache-22.tar.gz) = 862d2ac871955552d75e2a9a3528dc9676204e503d8a539e1701d918003c8c98
-SIZE (relx-cache-22.tar.gz) = 3214611
+TIMESTAMP = 1552739223
+SHA256 (relx-cache-3.29.0.tar.gz) = 65b7c3051faf570b2090b8f1dcc8d6e704df732d8e37b5bc527dd2c38b92de56
+SIZE (relx-cache-3.29.0.tar.gz) = 2961
 SHA256 (bbmustache-1.6.1.tar) = 238ba8df312869782abde3e9474e94b5704fb6bbb990c03f1afefdc8a4ad3a49
 SIZE (bbmustache-1.6.1.tar) = 15360
 SHA256 (cf-0.3.1.tar) = 315e8d447d3a4b02bcdbfa397ad03bbb988a6e0aa6f44d3add0f4e3c3bf97672
 SIZE (cf-0.3.1.tar) = 10240
 SHA256 (erlware_commons-1.3.0.tar) = 3fab3b23042dec38dbc74b97de7bdd355212641d7c78cab1168a68d7369e7106
 SIZE (erlware_commons-1.3.0.tar) = 53248
 SHA256 (getopt-1.0.1.tar) = 53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c
 SIZE (getopt-1.0.1.tar) = 19456
 SHA256 (providers-1.7.0.tar) = 8be66129ca85c2fa74efd8737cdaedd31c1c1af51dd2fd601495a6def4cae4a6
 SIZE (providers-1.7.0.tar) = 13312
 SHA256 (erlware-relx-v3.29.0_GH0.tar.gz) = d64eca52e17ba3c6ffde695900054eb5ad8e679fd1f941981d85711664b0305f
 SIZE (erlware-relx-v3.29.0_GH0.tar.gz) = 120443