OK.
On 5/5/2021 2:22 AM, Rafael Sadowski wrote:
Please find below a patch to fix a conflict with leatherman and boost 1.73.
Collision in boost-1.72.0->1.73.0: the following files already exist
/usr/local/include/boost/nowide/args.hpp (leatherman-1.12.4 and
boost-1.73.0)
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.109
diff -u -p -u -p -r1.109 Makefile
--- Makefile 28 Apr 2021 05:08:58 -0000 1.109
+++ Makefile 5 May 2021 06:15:14 -0000
@@ -13,6 +13,7 @@ CATEGORIES= devel
MASTER_SITES= https://dl.bintray.com/boostorg/release/${VERSION}/source/
EXTRACT_SUFX= .tar.bz2
FIX_EXTRACT_PERMISSIONS = Yes
+REVISION-main= 0
SO_VERSION= 14.0
BOOST_LIBS= boost_atomic-mt \
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/boost/pkg/PLIST-main,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 PLIST-main
--- pkg/PLIST-main 28 Apr 2021 05:08:58 -0000 1.13
+++ pkg/PLIST-main 5 May 2021 06:15:15 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.13 2021/04/28 05:08:58 rsadowski Exp $
@pkgpath devel/boost
+@conflict leatherman-<1.12.4p0
include/boost/
include/boost/accumulators/
include/boost/accumulators/accumulators.hpp
