diff options
Diffstat (limited to 'devel/leatherman')
| -rw-r--r-- | devel/leatherman/Makefile | 39 | ||||
| -rw-r--r-- | devel/leatherman/distinfo | 3 | ||||
| -rw-r--r-- | devel/leatherman/files/patch-cmake_leatherman.cmake.in | 14 | ||||
| -rw-r--r-- | devel/leatherman/files/patch-json__container_tests_json__container__test.cc | 16 | ||||
| -rw-r--r-- | devel/leatherman/files/patch-locale_src_locale.cc | 12 | ||||
| -rw-r--r-- | devel/leatherman/files/patch-shared_nowide | 108 | ||||
| -rw-r--r-- | devel/leatherman/pkg-descr | 1 | ||||
| -rw-r--r-- | devel/leatherman/pkg-plist | 98 |
8 files changed, 0 insertions, 291 deletions
diff --git a/devel/leatherman/Makefile b/devel/leatherman/Makefile deleted file mode 100644 index f2d8a3b99d2c..000000000000 --- a/devel/leatherman/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -PORTNAME= leatherman -PORTVERSION= 1.12.9 -PORTREVISION= 6 -CATEGORIES= devel - -MAINTAINER= puppet@FreeBSD.org -COMMENT= Leatherman C++ Tool library -WWW= https://github.com/puppetlabs/leatherman - -LICENSE= APACHE20 - -DEPRECATED= Project got archived -EXPIRATION_DATE=2025-05-09 - -LIB_DEPENDS= libboost_system.so:devel/boost-libs \ - libcurl.so:ftp/curl - -USES= compiler:c++11-lang cmake gettext ruby -USE_GITHUB= yes -GH_ACCOUNT= puppetlabs -USE_LDCONFIG= yes - -CMAKE_ON= LEATHERMAN_SHARED -CMAKE_OFF= ENABLE_CXX_WERROR - -TEST_TARGET= test - -PLIST_SUB= PORTVERSION=${PORTVERSION} - -.include <bsd.port.pre.mk> - -post-configure: - # This file is vendored in vendor/Catch-1.10.0.zip and extracted at configure step - ${SED} -i '' -e '1s|\(.*\)|#include <sys/signal.h>\n\1|' ${CONFIGURE_WRKSRC}/src/Catch-1.10.0/single_include/catch.hpp -.if ${OPSYS} == FreeBSD - ${REINPLACE_CMD} -e 's|ptrdiff_t|size_t|' ${CONFIGURE_WRKSRC}/src/Catch-1.10.0/single_include/catch.hpp -.endif - -.include <bsd.port.post.mk> diff --git a/devel/leatherman/distinfo b/devel/leatherman/distinfo deleted file mode 100644 index fa1c5ca5d015..000000000000 --- a/devel/leatherman/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1677533770 -SHA256 (puppetlabs-leatherman-1.12.9_GH0.tar.gz) = 62c1b86b6bfe8e2f06f84e605b1bad8a0fa3224d2bf2dc33e69b2e46b902c2cb -SIZE (puppetlabs-leatherman-1.12.9_GH0.tar.gz) = 816107 diff --git a/devel/leatherman/files/patch-cmake_leatherman.cmake.in b/devel/leatherman/files/patch-cmake_leatherman.cmake.in deleted file mode 100644 index 959e5efc64d5..000000000000 --- a/devel/leatherman/files/patch-cmake_leatherman.cmake.in +++ /dev/null @@ -1,14 +0,0 @@ ---- cmake/leatherman.cmake.in.orig 2017-08-25 18:32:21 UTC -+++ cmake/leatherman.cmake.in -@@ -83,11 +83,6 @@ macro(leatherman_install) - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX}) -- foreach(ARG ${ARGV}) -- if (TARGET ${ARG}) -- set_target_properties(${ARG} PROPERTIES PREFIX "" IMPORT_PREFIX "") -- endif() -- endforeach() - endmacro() - - # Usage: add_cppcheck_dirs(dir1 dir2) diff --git a/devel/leatherman/files/patch-json__container_tests_json__container__test.cc b/devel/leatherman/files/patch-json__container_tests_json__container__test.cc deleted file mode 100644 index 7c2410c01fbd..000000000000 --- a/devel/leatherman/files/patch-json__container_tests_json__container__test.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- json_container/tests/json_container_test.cc.orig 2018-09-29 16:21:31 UTC -+++ json_container/tests/json_container_test.cc -@@ -22,11 +22,13 @@ TEST_CASE("JsonContainer::JsonContainer - std::string json_value {}; - - SECTION("it should instantiate by passing any JSON value") { -+ json_value = "{}"; - SECTION("object") { - json_value = JSON; - } - - SECTION("array") { -+ json_value = "[]"; - SECTION("of numbers") { - json_value = "[1, 2, 3]"; - } diff --git a/devel/leatherman/files/patch-locale_src_locale.cc b/devel/leatherman/files/patch-locale_src_locale.cc deleted file mode 100644 index 8695942ee878..000000000000 --- a/devel/leatherman/files/patch-locale_src_locale.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- locale/src/locale.cc.orig 2018-09-29 16:21:31 UTC -+++ locale/src/locale.cc -@@ -44,6 +44,9 @@ namespace leatherman { namespace locale - gen.add_messages_domain(domain); - } - -+ if (id.empty()) -+ return g_locales.insert(make_pair(domain, std::locale())).first->second; -+ - // Ensure creating and adding a new locale is thread-safe. - try { - return g_locales.insert(make_pair(domain, gen(id))).first->second; diff --git a/devel/leatherman/files/patch-shared_nowide b/devel/leatherman/files/patch-shared_nowide deleted file mode 100644 index 5bb169147065..000000000000 --- a/devel/leatherman/files/patch-shared_nowide +++ /dev/null @@ -1,108 +0,0 @@ -diff --git ./nowide/CMakeLists.txt ./nowide/CMakeLists.txt -index ff9dba6..5d1b9ce 100644 ---- ./nowide/CMakeLists.txt -+++ ./nowide/CMakeLists.txt -@@ -1,7 +1,5 @@ - find_package(Boost 1.54 REQUIRED) - --add_leatherman_includes(${Boost_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../vendor/nowide/include") --add_leatherman_headers(../vendor/nowide/include/boost) - if(WIN32) - add_leatherman_library(../vendor/nowide/src/iostream.cpp) - endif() ---- ./execution/CMakeLists.txt~ 2020-06-03 10:30:05.027479897 +0100 -+++ ./execution/CMakeLists.txt 2020-06-03 10:30:18.871483297 +0100 -@@ -1,4 +1,4 @@ --find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system) -+find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide) - - add_leatherman_deps("${Boost_LIBRARIES}") - if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS") -@@ -10,7 +10,6 @@ - add_leatherman_includes("${Boost_INCLUDE_DIRS}") - - leatherman_dependency(util) --leatherman_dependency(nowide) - leatherman_dependency(locale) - leatherman_dependency(logging) - leatherman_dependency(file_util) ---- ./file_util/CMakeLists.txt~ 2020-06-03 10:30:05.031479898 +0100 -+++ ./file_util/CMakeLists.txt 2020-06-03 10:31:04.550494516 +0100 -@@ -1,9 +1,8 @@ --find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system) -+find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide) - - add_leatherman_deps("${Boost_LIBRARIES}") - add_leatherman_includes("${Boost_INCLUDE_DIRS}") - --leatherman_dependency(nowide) - leatherman_dependency(locale) - leatherman_dependency(logging) - leatherman_dependency(util) ---- ./logging/CMakeLists.txt~ 2020-06-03 10:30:05.035479898 +0100 -+++ ./logging/CMakeLists.txt 2020-06-03 10:30:19.092483352 +0100 -@@ -4,7 +4,6 @@ - add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) - add_leatherman_includes("${Boost_INCLUDE_DIRS}") - --leatherman_dependency(nowide) - leatherman_dependency(locale) - - if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS") ---- ./tests/CMakeLists.txt~ 2020-06-02 23:24:17.146002133 +0100 -+++ ./tests/CMakeLists.txt 2020-06-02 23:26:17.780054923 +0100 -@@ -1,8 +1,8 @@ --set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex) -+set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex nowide) - if (LEATHERMAN_USE_LOCALES) - set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale) - endif() --find_package(Boost "1.54" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) -+find_package(Boost "1.73" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) - - include_directories(BEFORE ${LEATHERMAN_CATCH_INCLUDE} ${LEATHERMAN_INCLUDE_DIRS}) - add_executable(leatherman_test main.cc ${LEATHERMAN_TEST_SRCS}) ---- ./util/CMakeLists.txt~ 2020-06-03 10:05:44.277172451 +0100 -+++ ./util/CMakeLists.txt 2020-06-03 10:06:52.969185017 +0100 -@@ -1,10 +1,8 @@ --find_package(Boost 1.54 REQUIRED date_time chrono system) -+find_package(Boost 1.73 REQUIRED date_time chrono system nowide) - - add_leatherman_deps(${Boost_LIBRARIES}) - add_leatherman_includes("${Boost_INCLUDE_DIRS}") - --leatherman_dependency(nowide) -- - if(WIN32) - set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc") - set(PLATFORM_TESTS "tests/windows/environment.cc") ---- ./file_util/src/file.cc~ 2019-12-14 20:46:29.000000000 +0000 -+++ ./file_util/src/file.cc 2020-06-02 22:42:45.100963441 +0100 -@@ -1,6 +1,6 @@ - #include <leatherman/file_util/file.hpp> - #include <boost/nowide/fstream.hpp> --#include <boost/nowide/cenv.hpp> -+#include <boost/nowide/cstdlib.hpp> - #include <boost/filesystem.hpp> - #include <sstream> - #include <leatherman/logging/logging.hpp> ---- ./util/src/environment.cc~ 2019-12-14 20:46:29.000000000 +0000 -+++ ./util/src/environment.cc 2020-06-02 22:42:45.101963441 +0100 -@@ -1,5 +1,6 @@ - #include <leatherman/util/environment.hpp> --#include <boost/nowide/cenv.hpp> -+#include <boost/nowide/cstdlib.hpp> -+#include <boost/system/error_code.hpp> - #include <stdexcept> - - using namespace std; ---- ./util/tests/environment.cc~ 2019-12-14 20:46:29.000000000 +0000 -+++ ./util/tests/environment.cc 2020-06-02 22:42:45.103963442 +0100 -@@ -1,6 +1,6 @@ - #include <catch.hpp> - #include <leatherman/util/environment.hpp> --#include <boost/nowide/cenv.hpp> -+#include <boost/nowide/cstdlib.hpp> - - using namespace std; - using namespace leatherman::util; diff --git a/devel/leatherman/pkg-descr b/devel/leatherman/pkg-descr deleted file mode 100644 index 48a4ae1c0a45..000000000000 --- a/devel/leatherman/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -A collection of C++ and CMake utility libraries. diff --git a/devel/leatherman/pkg-plist b/devel/leatherman/pkg-plist deleted file mode 100644 index c2df2ba0ee6b..000000000000 --- a/devel/leatherman/pkg-plist +++ /dev/null @@ -1,98 +0,0 @@ -include/leatherman/curl/client.hpp -include/leatherman/curl/export.h -include/leatherman/curl/request.hpp -include/leatherman/curl/response.hpp -include/leatherman/dynamic_library/dynamic_library.hpp -include/leatherman/execution/execution.hpp -include/leatherman/file_util/directory.hpp -include/leatherman/file_util/file.hpp -include/leatherman/json_container/json_container.hpp -include/leatherman/locale/locale.hpp -include/leatherman/logging/logging.hpp -include/leatherman/ruby/api.hpp -include/leatherman/util/environment.hpp -include/leatherman/util/option_set.hpp -include/leatherman/util/posix/scoped_descriptor.hpp -include/leatherman/util/regex.hpp -include/leatherman/util/scope_exit.hpp -include/leatherman/util/scoped_env.hpp -include/leatherman/util/scoped_resource.hpp -include/leatherman/util/strings.hpp -include/leatherman/util/time.hpp -include/leatherman/util/timer.hpp -include/leatherman/util/uri.hpp -include/leatherman/util/windows/scoped_handle.hpp -include/leatherman/vendor/catch.hpp -include/leatherman/vendor/rapidjson/allocators.h -include/leatherman/vendor/rapidjson/document.h -include/leatherman/vendor/rapidjson/encodedstream.h -include/leatherman/vendor/rapidjson/encodings.h -include/leatherman/vendor/rapidjson/error/en.h -include/leatherman/vendor/rapidjson/error/error.h -include/leatherman/vendor/rapidjson/filereadstream.h -include/leatherman/vendor/rapidjson/filewritestream.h -include/leatherman/vendor/rapidjson/internal/biginteger.h -include/leatherman/vendor/rapidjson/internal/diyfp.h -include/leatherman/vendor/rapidjson/internal/dtoa.h -include/leatherman/vendor/rapidjson/internal/ieee754.h -include/leatherman/vendor/rapidjson/internal/itoa.h -include/leatherman/vendor/rapidjson/internal/meta.h -include/leatherman/vendor/rapidjson/internal/pow10.h -include/leatherman/vendor/rapidjson/internal/stack.h -include/leatherman/vendor/rapidjson/internal/strfunc.h -include/leatherman/vendor/rapidjson/internal/strtod.h -include/leatherman/vendor/rapidjson/memorybuffer.h -include/leatherman/vendor/rapidjson/memorystream.h -include/leatherman/vendor/rapidjson/msinttypes/inttypes.h -include/leatherman/vendor/rapidjson/msinttypes/stdint.h -include/leatherman/vendor/rapidjson/prettywriter.h -include/leatherman/vendor/rapidjson/rapidjson.h -include/leatherman/vendor/rapidjson/reader.h -include/leatherman/vendor/rapidjson/stringbuffer.h -include/leatherman/vendor/rapidjson/writer.h -lib/cmake/leatherman/LeathermanConfig.cmake -lib/cmake/leatherman/LeathermanConfigVersion.cmake -lib/cmake/leatherman/LeathermanLibraries-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/leatherman/LeathermanLibraries.cmake -lib/cmake/leatherman/catch.cmake -lib/cmake/leatherman/cmake/GetGitRevisionDescription.cmake -lib/cmake/leatherman/cmake/GetGitRevisionDescription.cmake.in -lib/cmake/leatherman/cmake/cflags.cmake -lib/cmake/leatherman/cmake/generate_translations.cmake -lib/cmake/leatherman/cmake/leatherman.cmake -lib/cmake/leatherman/cmake/leatherman_config.cmake -lib/cmake/leatherman/cmake/normalize_pot.cmake -lib/cmake/leatherman/cmake/options.cmake -lib/cmake/leatherman/cmake/pod2man.cmake -lib/cmake/leatherman/curl.cmake -lib/cmake/leatherman/dynamic_library.cmake -lib/cmake/leatherman/execution.cmake -lib/cmake/leatherman/file_util.cmake -lib/cmake/leatherman/json_container.cmake -lib/cmake/leatherman/locale.cmake -lib/cmake/leatherman/logging.cmake -lib/cmake/leatherman/nowide.cmake -lib/cmake/leatherman/rapidjson.cmake -lib/cmake/leatherman/ruby.cmake -lib/cmake/leatherman/scripts/cpplint.py -lib/cmake/leatherman/util.cmake -lib/libleatherman_curl.so -lib/libleatherman_curl.so.%%PORTVERSION%% -lib/libleatherman_dynamic_library.so -lib/libleatherman_dynamic_library.so.%%PORTVERSION%% -lib/libleatherman_execution.so -lib/libleatherman_execution.so.%%PORTVERSION%% -lib/libleatherman_file_util.so -lib/libleatherman_file_util.so.%%PORTVERSION%% -lib/libleatherman_json_container.so -lib/libleatherman_json_container.so.%%PORTVERSION%% -lib/libleatherman_locale.so -lib/libleatherman_locale.so.%%PORTVERSION%% -lib/libleatherman_logging.so -lib/libleatherman_logging.so.%%PORTVERSION%% -lib/libleatherman_ruby.so -lib/libleatherman_ruby.so.%%PORTVERSION%% -lib/libleatherman_util.so -lib/libleatherman_util.so.%%PORTVERSION%% -share/locale/fr/LC_MESSAGES/leatherman_locale.mo -share/locale/fr/LC_MESSAGES/leatherman_logging.mo |