diff --git a/databases/ejdb/Makefile b/databases/ejdb/Makefile index 140a786ebf6d..a9d103cac571 100644 --- a/databases/ejdb/Makefile +++ b/databases/ejdb/Makefile @@ -1,30 +1,30 @@ PORTNAME= ejdb -PORTVERSION= 2.72 +PORTVERSION= 2.73 DISTVERSIONPREFIX= v CATEGORIES= databases MAINTAINER= danfe@FreeBSD.org COMMENT= Embeddable JSON database engine library WWW= https://ejdb.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libiowow.so:databases/iowow \ libiwnet.so:net/iwnet USES= cmake compiler:c11 USE_GITHUB= yes GH_ACCOUNT= Softmotions USE_LDCONFIG= yes CMAKE_ARGS= -DCMAKE_LOCALBASE:PATH="${LOCALBASE}" \ -DBUILD_EXAMPLES:BOOL=OFF OPTIONS_DEFINE= DOCS post-patch: @${GREP} -Rl --null '#include diff --git a/databases/ejdb/distinfo b/databases/ejdb/distinfo index 8976800f6267..a2255b5bcdbb 100644 --- a/databases/ejdb/distinfo +++ b/databases/ejdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1645610423 -SHA256 (Softmotions-ejdb-v2.72_GH0.tar.gz) = 295ed40c67cfcbf7cae369cbea87a2d636d73c005dd3a3352159650e9b2423c6 -SIZE (Softmotions-ejdb-v2.72_GH0.tar.gz) = 905396 +TIMESTAMP = 1668444172 +SHA256 (Softmotions-ejdb-v2.73_GH0.tar.gz) = 1381af7790ce67f8005c380de2c90a1811619250d9d62e7cdb64547f27878484 +SIZE (Softmotions-ejdb-v2.73_GH0.tar.gz) = 812748 diff --git a/databases/ejdb/files/patch-src_CMakeLists.txt b/databases/ejdb/files/patch-src_CMakeLists.txt index eca6d095e812..0df91193799e 100644 --- a/databases/ejdb/files/patch-src_CMakeLists.txt +++ b/databases/ejdb/files/patch-src_CMakeLists.txt @@ -1,56 +1,42 @@ --- src/CMakeLists.txt.orig 2022-02-23 10:00:23 UTC +++ src/CMakeLists.txt @@ -15,6 +15,7 @@ set(PROJECT_GENERATED_DIR ${CMAKE_CURRENT_BINARY_DIR}/ list(APPEND PROJECT_INCLUDE_DIRS "${PROJECT_GENERATED_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/include") +list(APPEND PROJECT_INCLUDE_DIRS "${CMAKE_LOCALBASE}/include") if(APPLE) option(BUILD_FRAMEWORK "Build an OS X framework" OFF) @@ -34,13 +35,10 @@ include(CheckIncludeFiles) include(CheckLibraryExists) include(TestBigEndian) -include(AddIOWOW) - if(ENABLE_HTTP) if(WIN32) message(FATAL_ERROR "ENABLE_HTTP option cannot be used in Windows build") endif() - include(AddIWNET) add_definitions(-DJB_HTTP) list(APPEND MODULES jbr) endif() @@ -160,7 +158,7 @@ endif() set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_ASAN} -O0 -g -ggdb -Werror -DDEBUG -D_DEBUG -UNDEBUG -Wno-unused-variable" ) -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_ASAN} -O3 -DNDEBUG") +set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_ASAN} -DNDEBUG") # set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-Wl,-s") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g") set(CMAKE_C_FLAGS_RELEASEWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") @@ -174,7 +172,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tmpl/ejdb2c file(GLOB PROJECT_GENERATED_HDRS ${PROJECT_GENERATED_DIR}/*.h) list(APPEND ALL_HDRS ${PROJECT_GENERATED_HDRS}) -set(PCLIBS "-liowow -lm") +set(PCLIBS "-liwnet -liowow -lm") if(DEFINED IWNET_INCLUDE_DIR) set(PCLIBS "-liwnet ${PCLIBS}") endif() -@@ -349,13 +347,6 @@ if(DO_INSTALL_CORE) - FILES_MATCHING - PATTERN "*.h") - endif() -- -- install( -- DIRECTORY ${IOWOW_INCLUDE_DIR}/iowow -- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} -- COMPONENT headers -- FILES_MATCHING -- PATTERN "*.h") - - install(FILES ${CMAKE_SOURCE_DIR}/LICENSE ${CMAKE_SOURCE_DIR}/Changelog - DESTINATION ${CMAKE_INSTALL_DOCDIR}) diff --git a/databases/ejdb/files/patch-src_util_sort__r.h b/databases/ejdb/files/patch-src_util_sort__r.h index 099d67ade3bb..405b3283a342 100644 --- a/databases/ejdb/files/patch-src_util_sort__r.h +++ b/databases/ejdb/files/patch-src_util_sort__r.h @@ -1,34 +1,34 @@ ---- src/util/sort_r.h.orig 2022-02-23 10:00:23 UTC -+++ src/util/sort_r.h +--- src/jbi/sort_r.h.orig 2022-02-23 10:00:23 UTC ++++ src/jbi/sort_r.h @@ -25,10 +25,11 @@ #define _SORT_R_INLINE inline #if ( defined __APPLE__ || defined __MACH__ || defined __DARWIN__ \ - || defined __FreeBSD__ || defined __DragonFly__) && defined JB_HAVE_QSORT_R + || (defined __FreeBSD__ && !defined(qsort_r)) || defined __DragonFly__) && defined JB_HAVE_QSORT_R # define _SORT_R_BSD #elif ( defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ \ - || defined __linux__ || defined __MINGW32__ || defined __GLIBC__) && defined JB_HAVE_QSORT_R + || defined __linux__ || defined __MINGW32__ || defined __GLIBC__ \ + || (defined (__FreeBSD__) && defined(qsort_r))) && defined JB_HAVE_QSORT_R # define _SORT_R_LINUX #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__) # define _SORT_R_WINDOWS @@ -255,7 +256,7 @@ static _SORT_R_INLINE void sort_r( #if defined _SORT_R_BSD /* Ensure qsort_r is defined */ -extern void qsort_r( +extern void (qsort_r)( void *base, size_t nel, size_t width, void *thunk, int (*compar)(void *_thunk, const void *_a, const void *_b)); @@ -283,7 +284,7 @@ typedef int (*__compar_d_fn_t)(const void*, const void #if defined _SORT_R_LINUX typedef int (*__compar_d_fn_t)(const void*, const void*, void*); -extern void qsort_r( +extern void (qsort_r)( void *base, size_t nel, size_t width, __compar_d_fn_t __compar, void *arg) __attribute__((nonnull(1, 4))); diff --git a/databases/ejdb/pkg-plist b/databases/ejdb/pkg-plist index df912e8a856c..6d5d6f603140 100644 --- a/databases/ejdb/pkg-plist +++ b/databases/ejdb/pkg-plist @@ -1,19 +1,18 @@ bin/jbs include/ejdb2/ejdb2.h -include/ejdb2/jbl.h include/ejdb2/jbr.h include/ejdb2/jql.h lib/libejdb2-2.a lib/libejdb2.so lib/libejdb2.so.2 -lib/libejdb2.so.2.72 +lib/libejdb2.so.2.73 libdata/pkgconfig/libejdb2.pc share/man/man1/jbs.1.gz share/man/man3/ejdb2.3.gz %%PORTDOCS%%%%DOCSDIR%%2/Changelog %%PORTDOCS%%%%DOCSDIR%%2/LICENSE %%PORTDOCS%%%%DOCSDIR%%2/README %%DATADIR%%2/ejdb2-exports-%%CMAKE_BUILD_TYPE%%.cmake %%DATADIR%%2/ejdb2-exports.cmake %%DATADIR%%2/ejdb2-static-exports-%%CMAKE_BUILD_TYPE%%.cmake %%DATADIR%%2/ejdb2-static-exports.cmake