diff --git a/databases/iowow/Makefile b/databases/iowow/Makefile index 4c278229e153..9118f2829c39 100644 --- a/databases/iowow/Makefile +++ b/databases/iowow/Makefile @@ -1,33 +1,29 @@ # Created by: Alexey Dokuchaev PORTNAME= iowow -PORTVERSION= 1.4.13 +PORTVERSION= 1.4.14 DISTVERSIONPREFIX= v CATEGORIES= databases MAINTAINER= danfe@FreeBSD.org COMMENT= Persistent key-value database engine LICENSE= MIT USES= cmake compiler:c11 USE_GITHUB= yes GH_ACCOUNT= Softmotions USE_LDCONFIG= yes PLIST_SUB+= VERSION=${PORTVERSION} PORTDOCS= Changelog README OPTIONS_DEFINE= DOCS TEST TEST_BUILD_DEPENDS= ${LOCALBASE}/include/CUnit/Basic.h:devel/cunit TEST_CMAKE_ON= -DBUILD_TESTS:BOOL=ON -post-patch: - @${REINPLACE_CMD} -e '/-D_XOPEN_SOURCE=600/d' \ - ${WRKSRC}/src/CMakeLists.txt - do-test-TEST-on: @cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS} .include diff --git a/databases/iowow/distinfo b/databases/iowow/distinfo index 41d583cc778e..d99c3ceb5388 100644 --- a/databases/iowow/distinfo +++ b/databases/iowow/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630659785 -SHA256 (Softmotions-iowow-v1.4.13_GH0.tar.gz) = 73535cd7a0bb6de2a8d1063da787b9b9d95810c2036e342400c12ad6f853fe60 -SIZE (Softmotions-iowow-v1.4.13_GH0.tar.gz) = 522886 +TIMESTAMP = 1644841477 +SHA256 (Softmotions-iowow-v1.4.14_GH0.tar.gz) = 62f0b780f3a48a182cc923fa2d77790cdeeed8081709c8d176e53414da350ad2 +SIZE (Softmotions-iowow-v1.4.14_GH0.tar.gz) = 532045 diff --git a/databases/iowow/files/patch-src_CMakeLists.txt b/databases/iowow/files/patch-src_CMakeLists.txt index 3f42057dd4b5..43b5202787b1 100644 --- a/databases/iowow/files/patch-src_CMakeLists.txt +++ b/databases/iowow/files/patch-src_CMakeLists.txt @@ -1,40 +1,19 @@ --- src/CMakeLists.txt.orig 2019-03-29 16:56:25 UTC +++ src/CMakeLists.txt -@@ -100,6 +100,11 @@ if (HAVE_CLOCK_MONOTONIC) - add_definitions(-DIW_HAVE_CLOCK_MONOTONIC) - endif() - -+check_symbol_exists(basename_r libgen.h HAVE_BASENAME_R) -+if (HAVE_BASENAME_R) -+ set_source_files_properties(log/iwlog.c PROPERTIES COMPILE_FLAGS -DIW_HAVE_BASENAME_R) -+endif() -+ - foreach(HF IN ITEMS stdlib stddef stdint stdbool stdatomic unistd dirent) - string(TOUPPER "${HF}" UHF) - check_include_file(${HF}.h "IW_HAVE_${UHF}") @@ -164,7 +169,7 @@ endif() set(CMAKE_C_FLAGS_DEBUG "-O0 -g -ggdb -Werror -DDEBUG -D_DEBUG -UNDEBUG \ -Wno-unused-variable ${CMAKE_C_ASAN}") -set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG ${CMAKE_C_ASAN}") +set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG ${CMAKE_C_ASAN}") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g") -@@ -187,7 +192,7 @@ file(GLOB PROJECT_GENERATED_HDRS ${PROJECT_GENERATED_D - list(APPEND ALL_HDRS ${PROJECT_GENERATED_HDRS}) - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tmpl/libiowow.pc.in ${PROJECT_GENERATED_DIR}/libiowow.pc @ONLY) --install(FILES ${PROJECT_GENERATED_DIR}/libiowow.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -+install(FILES ${PROJECT_GENERATED_DIR}/libiowow.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}data/pkgconfig) - - foreach(MODULE IN LISTS MODULES) - if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}/CMakeLists.txt) @@ -278,7 +283,6 @@ endif() install(FILES - ${CMAKE_SOURCE_DIR}/LICENSE ${CMAKE_SOURCE_DIR}/Changelog DESTINATION ${CMAKE_INSTALL_DOCDIR}) install(FILES diff --git a/databases/iowow/files/patch-src_platform_unix_unix.c b/databases/iowow/files/patch-src_platform_unix_unix.c deleted file mode 100644 index 7e58d255962b..000000000000 --- a/databases/iowow/files/patch-src_platform_unix_unix.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/platform/unix/unix.c.orig 2021-09-03 09:03:05 UTC -+++ src/platform/unix/unix.c -@@ -355,7 +355,7 @@ iwrc iwp_fdatasync(HANDLE fh) { - if (fcntl(fh, F_FULLFSYNC) == -1) { - return iwrc_set_errno(IW_ERROR_IO_ERRNO, errno); - } --#else -+#elif defined(__FreeBSD_version) - if (fdatasync(fh) == -1) { - return iwrc_set_errno(IW_ERROR_IO_ERRNO, errno); - } diff --git a/databases/iowow/pkg-plist b/databases/iowow/pkg-plist index 0aa3a9e4d6cc..5601d1355416 100644 --- a/databases/iowow/pkg-plist +++ b/databases/iowow/pkg-plist @@ -1,35 +1,36 @@ include/iowow/basedefs.h include/iowow/iowow.h include/iowow/iwarr.h include/iowow/iwbits.h include/iowow/iwconv.h include/iowow/iwdlsnr.h include/iowow/iwexfile.h include/iowow/iwfile.h include/iowow/iwfsmfile.h include/iowow/iwhmap.h include/iowow/iwkv.h include/iowow/iwlog.h include/iowow/iwp.h include/iowow/iwpool.h include/iowow/iwrb.h include/iowow/iwrdb.h +include/iowow/iwre.h include/iowow/iwsha2.h include/iowow/iwstree.h include/iowow/iwstw.h include/iowow/iwth.h include/iowow/iwtp.h include/iowow/iwutils.h include/iowow/iwuuid.h include/iowow/iwxstr.h include/iowow/murmur3.h lib/libiowow-1.a lib/libiowow.so lib/libiowow.so.1 lib/libiowow.so.%%VERSION%% libdata/pkgconfig/libiowow.pc man/man3/iowow.3.gz %%DATADIR%%/iowow-exports-%%CMAKE_BUILD_TYPE%%.cmake %%DATADIR%%/iowow-exports.cmake %%DATADIR%%/iowow-static-exports-%%CMAKE_BUILD_TYPE%%.cmake %%DATADIR%%/iowow-static-exports.cmake