Simple tweak Makefile diff for leatherman except the py2 and py3 dance.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/leatherman/Makefile,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 Makefile
--- Makefile 28 Apr 2021 05:08:53 -0000 1.44
+++ Makefile 5 May 2021 06:23:10 -0000
@@ -5,18 +5,18 @@ COMMENT = collection of C++ and CMake u
GH_ACCOUNT = puppetlabs
GH_PROJECT = leatherman
GH_TAGNAME = 1.12.4
-REVISION = 0
+REVISION = 1
# N.B.: Upstream doesn't care about ABI, better just bump major on update
-SHARED_LIBS = leatherman_curl 1.1 # 0.12
-SHARED_LIBS += leatherman_dynamic_library 1.0 # 0.12
-SHARED_LIBS += leatherman_execution 2.0
-SHARED_LIBS += leatherman_file_util 1.1 # 0.12
-SHARED_LIBS += leatherman_json_container 1.1 # 0.12
-SHARED_LIBS += leatherman_locale 1.0 # 0.12
-SHARED_LIBS += leatherman_logging 1.0 # 0.12
-SHARED_LIBS += leatherman_ruby 1.0 # 0.12
-SHARED_LIBS += leatherman_util 1.1 # 0.12
+SHARED_LIBS = leatherman_curl 1.1 # 0.12
+SHARED_LIBS += leatherman_dynamic_library 1.0 # 0.12
+SHARED_LIBS += leatherman_execution 2.0
+SHARED_LIBS += leatherman_file_util 1.1 # 0.12
+SHARED_LIBS += leatherman_json_container 1.1 # 0.12
+SHARED_LIBS += leatherman_locale 1.0 # 0.12
+SHARED_LIBS += leatherman_logging 1.0 # 0.12
+SHARED_LIBS += leatherman_ruby 1.0 # 0.12
+SHARED_LIBS += leatherman_util 1.1 # 0.12
CATEGORIES = devel
@@ -25,19 +25,18 @@ MAINTAINER = Sebastian Reitenbach <seba
# Apachev2
PERMIT_PACKAGE = Yes
+WANTLIB += ${COMPILER_LIBCXX} boost_atomic-mt boost_chrono-mt
+WANTLIB += boost_date_time-mt boost_filesystem-mt boost_locale-mt
+WANTLIB += boost_log-mt boost_log_setup-mt boost_nowide-mt boost_regex-mt
+WANTLIB += boost_system-mt boost_thread-mt curl m
+
COMPILER = base-clang ports-gcc
MODULES = devel/cmake lang/python
-MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
-MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
-MODPY_BUILDDEP = No
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP = No
+MODPY_BUILDDEP = No
MODPY_ADJ_FILES = scripts/cpplint.py
-WANTLIB = ${COMPILER_LIBCXX} m
-WANTLIB += boost_atomic-mt boost_chrono-mt boost_date_time-mt
-WANTLIB += boost_filesystem-mt boost_locale-mt boost_log-mt boost_log_setup-mt
-WANTLIB += boost_nowide-mt boost_regex-mt boost_system-mt boost_thread-mt curl
-
LIB_DEPENDS = devel/boost>=1.73.0 \
net/curl
@@ -48,9 +47,7 @@ RUN_DEPENDS = devel/gettext,-runtime
CONFIGURE_ARGS += -DLEATHERMAN_SHARED=Yes
# cmake tests are botched
-CONFIGURE_ARGS += -DLEATHERMAN_ENABLE_TESTING:Bool=No
-
-CXXFLAGS += -pthread
+CONFIGURE_ARGS += -DLEATHERMAN_ENABLE_TESTING=No
NO_TEST = Yes
