git: 5cb0bc22402c - main - graphics/opencollada: Convert REINPLACE_CMD to patch file

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5cb0bc22402c3a5ed5ee5305e9fac9b4b19f057b

commit 5cb0bc22402c3a5ed5ee5305e9fac9b4b19f057b
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-03-21 18:39:58 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-03-21 19:20:06 +0000

    graphics/opencollada: Convert REINPLACE_CMD to patch file
---
 graphics/opencollada/Makefile            |  8 -----
 graphics/opencollada/files/patch-clang15 | 54 ++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/graphics/opencollada/Makefile b/graphics/opencollada/Makefile
index c40358eef8aa..ab566e5787a7 100644
--- a/graphics/opencollada/Makefile
+++ b/graphics/opencollada/Makefile
@@ -25,12 +25,4 @@ CFLAGS+=	-Wno-narrowing
 CMAKE_ON=	USE_LIBXML USE_SHARED USE_STATIC
 USE_LDCONFIG=	${PREFIX}/lib/opencollada
 
-# Fix the build against Clang 15
-post-patch:
-		@${REINPLACE_CMD} -e 's,move(other,std::&,' -e 's,move(result,std::&,' \
-		${WRKSRC}/DAEValidator/library/src/Dae.cpp \
-		${WRKSRC}/DAEValidator/library/src/XmlDoc.cpp \
-		${WRKSRC}/DAEValidator/library/src/XmlNode.cpp \
-		${WRKSRC}/DAEValidator/library/src/XmlNodeSet.cpp
-
 .include <bsd.port.mk>
diff --git a/graphics/opencollada/files/patch-clang15 b/graphics/opencollada/files/patch-clang15
new file mode 100644
index 000000000000..4ca404cabe51
--- /dev/null
+++ b/graphics/opencollada/files/patch-clang15
@@ -0,0 +1,54 @@
+--- DAEValidator/library/src/Dae.cpp.orig	2018-11-26 22:43:10 UTC
++++ DAEValidator/library/src/Dae.cpp
+@@ -24,14 +24,14 @@ namespace opencollada
+ 
+ 	Dae::Dae(Dae && other)
+ 	{
+-		*this = move(other);
++		*this = std::move(other);
+ 	}
+ 
+ 	const Dae & Dae::operator = (Dae && other)
+ 	{
+-		this->XmlDoc::operator=(move(other));
+-		mUri = move(other.mUri);
+-		mExternalDAEs = move(other.mExternalDAEs);
++		this->XmlDoc::operator=(std::move(other));
++		mUri = std::move(other.mUri);
++		mExternalDAEs = std::move(other.mExternalDAEs);
+ 		return *this;
+ 	}
+ 
+--- DAEValidator/library/src/XmlDoc.cpp.orig	2018-11-26 22:43:10 UTC
++++ DAEValidator/library/src/XmlDoc.cpp
+@@ -20,7 +20,7 @@ namespace opencollada
+ {
+ 	XmlDoc::XmlDoc(XmlDoc && other)
+ 	{
+-		*this = move(other);
++		*this = std::move(other);
+ 	}
+ 
+ 	XmlDoc::~XmlDoc()
+--- DAEValidator/library/src/XmlNode.cpp.orig	2018-11-26 22:43:10 UTC
++++ DAEValidator/library/src/XmlNode.cpp
+@@ -105,7 +105,7 @@ namespace opencollada
+ 
+ 		XmlNodeSet result(xmlXPathEvalExpression(BAD_CAST xpath.c_str(), context));
+ 		xmlXPathFreeContext(context);
+-		auto p = xpathCache.insert(pair<XPathCacheKey, XmlNodeSet>(XPathCacheKey(mNode, xpath), move(result)));
++		auto p = xpathCache.insert(pair<XPathCacheKey, XmlNodeSet>(XPathCacheKey(mNode, xpath), std::move(result)));
+ 		return p.first->second;
+ 	}
+ 
+--- DAEValidator/library/src/XmlNodeSet.cpp.orig	2018-11-26 22:43:10 UTC
++++ DAEValidator/library/src/XmlNodeSet.cpp
+@@ -9,7 +9,7 @@ namespace opencollada
+ 
+ 	XmlNodeSet::XmlNodeSet(XmlNodeSet&& other)
+ 	{
+-		*this = move(other);
++		*this = std::move(other);
+ 	}
+ 
+ 	XmlNodeSet::~XmlNodeSet()