Index: head/devel/easyloggingpp/Makefile =================================================================== --- head/devel/easyloggingpp/Makefile (revision 559343) +++ head/devel/easyloggingpp/Makefile (revision 559344) @@ -1,26 +1,32 @@ # $FreeBSD$ PORTNAME= easyloggingpp DISTVERSIONPREFIX= v -DISTVERSION= 9.96.7 -PORTREVISION= 2 +DISTVERSION= 9.97.0 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= C++ logging library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake compiler:c++11-lang -USE_GITHUB= yes -GH_ACCOUNT= muflihun USE_LDCONFIG= yes CMAKE_ON= build_shared_lib # patched in, requested such option in https://github.com/muflihun/easyloggingpp/issues/603 +USE_GITHUB= yes +GH_ACCOUNT= amrayn + PLIST_FILES= include/easylogging++.h \ include/easylogging++.cc \ lib/libeasyloggingpp.so \ libdata/pkgconfig/easyloggingpp.pc + +do-test: + @cd ${BUILD_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -Dtest:BOOL=ON ${CMAKE_SOURCE_PATH} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include Index: head/devel/easyloggingpp/distinfo =================================================================== --- head/devel/easyloggingpp/distinfo (revision 559343) +++ head/devel/easyloggingpp/distinfo (revision 559344) @@ -1,3 +1,3 @@ -TIMESTAMP = 1543053240 -SHA256 (muflihun-easyloggingpp-v9.96.7_GH0.tar.gz) = 237c80072b9b480a9f2942b903b4b0179f65e146e5dcc64864dc91792dedd722 -SIZE (muflihun-easyloggingpp-v9.96.7_GH0.tar.gz) = 750349 +TIMESTAMP = 1609052128 +SHA256 (amrayn-easyloggingpp-v9.97.0_GH0.tar.gz) = 9110638e21ef02428254af8688bf9e766483db8cc2624144aa3c59006907ce22 +SIZE (amrayn-easyloggingpp-v9.97.0_GH0.tar.gz) = 750851 Index: head/devel/easyloggingpp/files/patch-CMakeLists.txt =================================================================== --- head/devel/easyloggingpp/files/patch-CMakeLists.txt (revision 559343) +++ head/devel/easyloggingpp/files/patch-CMakeLists.txt (revision 559344) @@ -1,42 +1,53 @@ ---- CMakeLists.txt.orig 2018-11-23 20:35:32 UTC +--- CMakeLists.txt.orig 2020-12-25 09:02:08 UTC +++ CMakeLists.txt @@ -22,7 +22,7 @@ macro(require_cpp11) endmacro() option(test "Build all tests" OFF) -option(build_static_lib "Build easyloggingpp as a static library" OFF) +option(build_shared_lib "Build easyloggingpp as a shared library" OFF) option(lib_utc_datetime "Build library with UTC date/time logging" OFF) set(ELPP_MAJOR_VERSION "9") @@ -31,7 +31,7 @@ set(ELPP_PATCH_VERSION "7") set(ELPP_VERSION_STRING "${ELPP_MAJOR_VERSION}.${ELPP_MINOR_VERSION}.${ELPP_PATCH_VERSION}") set(ELPP_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in") -set(ELPP_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") +set(ELPP_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) -@@ -46,18 +46,18 @@ configure_file( ${CMAKE_CURRENT_SOURCE_D +@@ -52,18 +52,18 @@ if (HAVE_EXECINFO) + add_definitions(-DHAVE_EXECINFO) + endif() - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/easyloggingpp.pc DESTINATION "${ELPP_PKGCONFIG_INSTALL_DIR}") - -if (build_static_lib) +if (build_shared_lib) if (lib_utc_datetime) add_definitions(-DELPP_UTC_DATETIME) endif() require_cpp11() - add_library(easyloggingpp STATIC src/easylogging++.cc) + add_library(easyloggingpp SHARED src/easylogging++.cc) set_property(TARGET easyloggingpp PROPERTY POSITION_INDEPENDENT_CODE ON) install(TARGETS easyloggingpp - ARCHIVE DESTINATION lib) + DESTINATION lib) endif() export(PACKAGE ${PROJECT_NAME}) +@@ -98,7 +98,9 @@ if (test) + ) + + # Standard linking to gtest stuff. +- target_link_libraries(easyloggingpp-unit-tests gtest gtest_main) ++ target_include_directories(easyloggingpp-unit-tests PRIVATE ${CMAKE_INSTALL_PREFIX}/include) ++ target_link_directories(easyloggingpp-unit-tests PRIVATE ${CMAKE_INSTALL_PREFIX}/lib) ++ target_link_libraries(easyloggingpp-unit-tests gtest gtest_main execinfo) + + add_test(NAME easyloggingppUnitTests COMMAND easyloggingpp-unit-tests -v) + endif() Index: head/devel/easyloggingpp/pkg-descr =================================================================== --- head/devel/easyloggingpp/pkg-descr (revision 559343) +++ head/devel/easyloggingpp/pkg-descr (revision 559344) @@ -1,7 +1,7 @@ Single header C++ logging library. It is extremely powerful, extendable, light-weight, fast performing, thread and type safe and consists of many built-in features. It provides ability to write logs in your own customized format. It also provide support for logging your classes, third-party libraries, STL and third-party containers etc. -WWW: https://muflihun.github.io/easyloggingpp/ +WWW: https://github.com/amrayn/easyloggingpp