5 files changed, 25 insertions, 14 deletions

diff --git a/devel/erlang-gpb/Makefile b/devel/erlang-gpb/Makefile
index 8cab620db372..63af61abb9f8 100644
--- a/devel/erlang-gpb/Makefile
+++ b/devel/erlang-gpb/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gpb
-PORTVERSION=	4.1.2
+PORTVERSION=	4.1.3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
diff --git a/devel/erlang-gpb/distinfo b/devel/erlang-gpb/distinfo
index 0ba84abe2931..21188ff033df 100644
--- a/devel/erlang-gpb/distinfo
+++ b/devel/erlang-gpb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516967367
-SHA256 (tomas-abrahamsson-gpb-4.1.2_GH0.tar.gz) = 130168d36dda5c88234bbe258fb1f6c608bd020088e7d1c611efec79758346de
-SIZE (tomas-abrahamsson-gpb-4.1.2_GH0.tar.gz) = 395750
+TIMESTAMP = 1518168006
+SHA256 (tomas-abrahamsson-gpb-4.1.3_GH0.tar.gz) = 8fb2e31ed678628a72940091b74437303b16cc5fd66b8a833e64249a36cdb151
+SIZE (tomas-abrahamsson-gpb-4.1.3_GH0.tar.gz) = 398082
diff --git a/devel/erlang-gpb/files/patch-Makefile b/devel/erlang-gpb/files/patch-Makefile
new file mode 100644
index 000000000000..1b0ed8e0791a
--- /dev/null
+++ b/devel/erlang-gpb/files/patch-Makefile
@@ -0,0 +1,10 @@
+--- Makefile.orig	2018-02-09 09:35:52 UTC
++++ Makefile
+@@ -397,6 +397,6 @@ $(ebin)/gpb.app: $(src)/gpb.app.src | $(
+ 
+ $(incdir)/gpb_version.hrl: $(incdir)/gpb_version.hrl.in
+ 	@echo Generating $@...
+-	$(silencer)$(build)/mk_version_hrl \
++	$(silencer)cat \
+ 	    < include/gpb_version.hrl.in \
+ 	    > include/gpb_version.hrl
diff --git a/devel/erlang-gpb/files/patch-build_mk__version__hrl b/devel/erlang-gpb/files/patch-build_mk__version__hrl
deleted file mode 100644
index 89f4ac388350..000000000000
--- a/devel/erlang-gpb/files/patch-build_mk__version__hrl
+++ /dev/null
@@ -1,10 +0,0 @@
---- build/mk_version_hrl.orig	2015-07-14 10:15:12 UTC
-+++ build/mk_version_hrl
-@@ -1,7 +1,6 @@
- #! /bin/sh
- 
- sed \
--    -e "s/@vsn@/`git describe --always --tags --match '[0-9]*.[0-9]*'`/g" \
-     -e "s/is expected to be/was/g" \
-     -e '/^%% The version below/ i \
- %% DO NOT EDIT -- generated from gpb_version.hrl.in' \
diff --git a/devel/erlang-gpb/files/patch-rebar.config.script b/devel/erlang-gpb/files/patch-rebar.config.script
new file mode 100644
index 000000000000..88c98eb8abb2
--- /dev/null
+++ b/devel/erlang-gpb/files/patch-rebar.config.script
@@ -0,0 +1,11 @@
+--- rebar.config.script.orig	2018-02-09 10:01:31 UTC
++++ rebar.config.script
+@@ -31,7 +31,7 @@ ConfigOpts = NoHaveMapsOpts ++ NoHaveRan
+   [{compile,
+     %% invoking shell script as an argument to sh appears to  be
+     %% needed with rebar for windows/cygwin
+-    "bash build/mk_version_hrl"
++    "cat"
+     "    < include/gpb_version.hrl.in"
+     "    > include/gpb_version.hrl "}
+   ]},