Index: branches/2020Q3/graphics/exiv2/Makefile
===================================================================
--- branches/2020Q3/graphics/exiv2/Makefile	(revision 541745)
+++ branches/2020Q3/graphics/exiv2/Makefile	(revision 541746)
@@ -1,51 +1,52 @@
 # Created by: Michael Johnson <ahze@ahze.net>
 # $FreeBSD$
 
 PORTNAME=	exiv2
 DISTVERSION=	0.27.3
 DISTVERSIONSUFFIX=	-Source
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://www.exiv2.org/builds/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Exif, IPTC, and XMP metadata manipulation library and tools
 
 LICENSE=	GPLv2+
 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
 
 LDFLAGS+=	-lintl
 
 CMAKE_ON=	EXIV2_ENABLE_VIDEO \
 		EXIV2_ENABLE_NLS
 CMAKE_OFF=	EXIV2_ENABLE_LIBXMP
 
 OPTIONS_DEFINE=	SAMPLE TEST
 OPTIONS_SUB=	yes
 TEST_IMPLIES=	SAMPLE
 
 SAMPLE_DESC=	Include sample applications
 SAMPLE_CMAKE_BOOL=	EXIV2_BUILD_SAMPLES
 
 TEST_CMAKE_BOOL=	EXIV2_BUILD_UNIT_TESTS
 
 PATHFIX_CMAKELISTSTXT=	CMakeChecks.txt
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-Source
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' \
 		${WRKSRC}/test/Makefile
 	@${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' \
 		${WRKSRC}/test/functions.source
 
 .include <bsd.port.mk>
Index: branches/2020Q3/graphics/exiv2/files/patch-cmake_compilerFlags.cmake
===================================================================
--- branches/2020Q3/graphics/exiv2/files/patch-cmake_compilerFlags.cmake	(nonexistent)
+++ branches/2020Q3/graphics/exiv2/files/patch-cmake_compilerFlags.cmake	(revision 541746)
@@ -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

Property changes on: branches/2020Q3/graphics/exiv2/files/patch-cmake_compilerFlags.cmake
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 541745)
+++ branches/2020Q3	(revision 541746)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r541745