diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index c196f788b94e..d7aa5d7869fb 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -17,9 +17,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 TEST_DEPENDS=	bash:shells/bash
 
-USES=		cmake compiler:c++11-lang cpe gettext iconv pathfix \
+USES=		cmake compiler:c++11-lang cpe dos2unix gettext iconv pathfix \
 		python:3.5+,test localbase:ldflags
 USE_LDCONFIG=	yes
+DOS2UNIX_FILES=	cmake/compilerFlags.cmake
 
 TEST_TARGET=	tests
 
diff --git a/graphics/exiv2/files/patch-cmake_compilerFlags.cmake b/graphics/exiv2/files/patch-cmake_compilerFlags.cmake
new file mode 100644
index 000000000000..f7822207c73e
--- /dev/null
+++ b/graphics/exiv2/files/patch-cmake_compilerFlags.cmake
@@ -0,0 +1,15 @@
+--- cmake/compilerFlags.cmake.orig	2020-07-09 11:24:28 UTC
++++ cmake/compilerFlags.cmake
+@@ -26,7 +26,11 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CY
+         # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0
+         if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) )
+             if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
+-                add_compile_options(-fstack-clash-protection -fcf-protection)
++		if (NOT (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "powerpc"))
++			add_compile_options(-fstack-clash-protection -fcf-protection)
++		else()
++			add_compile_options(-fstack-clash-protection)
++		endif()
+             endif()
+ 
+             if( (COMPILER_IS_GCC   AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8