diff --git a/math/givaro/Makefile b/math/givaro/Makefile
index f730e055fc81..194b4758e936 100644
--- a/math/givaro/Makefile
+++ b/math/givaro/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	givaro
 PORTVERSION=	4.1.1
 DISTVERSIONPREFIX=v
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	pi@FreeBSD.org
diff --git a/math/givaro/files/patch-configure.ac b/math/givaro/files/patch-configure.ac
index 9c5a795b32d5..8e403236e6e0 100644
--- a/math/givaro/files/patch-configure.ac
+++ b/math/givaro/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2017-11-23 13:32:58 UTC
+--- configure.ac.orig	2019-06-07 13:23:45 UTC
 +++ configure.ac
-@@ -52,11 +52,7 @@ AC_COMPILER_NAME
+@@ -49,11 +49,7 @@ AC_COMPILER_NAME
  
  # We need a C++11 compiler now - AB 2014-12-12
  # clang-3.8 does not support __float128 without explicitly passing it -std=c++11
diff --git a/math/givaro/files/patch-src_kernel_gmp++_gmp++__int.h b/math/givaro/files/patch-src_kernel_gmp++_gmp++__int.h
new file mode 100644
index 000000000000..b7c1c925e0c1
--- /dev/null
+++ b/math/givaro/files/patch-src_kernel_gmp++_gmp++__int.h
@@ -0,0 +1,10 @@
+--- src/kernel/gmp++/gmp++_int.h.orig	2019-06-07 13:23:45 UTC
++++ src/kernel/gmp++/gmp++_int.h
+@@ -234,6 +234,7 @@ namespace Givaro {
+          */
+         ///@{
+         giv_all_inlined Integer& operator = (const Integer& n);
++        giv_all_inlined Integer& operator = (const Integer& n) const;
+         giv_all_inlined Integer& logcpy(const Integer& n);
+         giv_all_inlined Integer& copy(const Integer& n);
+         ///@}
diff --git a/math/givaro/files/patch-src_kernel_gmp++_gmp++__int__cstor.C b/math/givaro/files/patch-src_kernel_gmp++_gmp++__int__cstor.C
new file mode 100644
index 000000000000..a1fffcec7e93
--- /dev/null
+++ b/math/givaro/files/patch-src_kernel_gmp++_gmp++__int__cstor.C
@@ -0,0 +1,14 @@
+--- src/kernel/gmp++/gmp++_int_cstor.C.orig	2019-06-07 13:23:45 UTC
++++ src/kernel/gmp++/gmp++_int_cstor.C
+@@ -105,6 +105,11 @@ namespace Givaro {
+         return logcpy(n) ;
+     }
+ 
++    Integer& Integer::operator = (const Integer &n) const
++    {
++        return const_cast<Integer*>(this)->logcpy(n) ;
++    }
++
+ 
+     Integer& Integer::copy(const Integer &n)
+     {