Index: head/databases/beansdb/files/patch-configure.ac =================================================================== --- head/databases/beansdb/files/patch-configure.ac (revision 406023) +++ head/databases/beansdb/files/patch-configure.ac (nonexistent) @@ -1,10 +0,0 @@ ---- configure.ac.orig 2013-07-17 08:09:12 UTC -+++ configure.ac -@@ -1,6 +1,6 @@ - AC_PREREQ(2.61) - AC_INIT([beansdb], [0.6.0], [davies.liu@gmail.com]) --AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) - AC_PROG_CC - AM_PROG_CC_C_O - AC_CONFIG_HEADERS([config.h]) Property changes on: head/databases/beansdb/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -y \ No newline at end of property Index: head/databases/beansdb/files/patch-src__bitcask.c =================================================================== --- head/databases/beansdb/files/patch-src__bitcask.c (revision 406023) +++ head/databases/beansdb/files/patch-src__bitcask.c (nonexistent) @@ -1,26 +0,0 @@ ---- src/bitcask.c.orig 2013-07-17 08:09:12 UTC -+++ src/bitcask.c -@@ -99,12 +99,12 @@ Bitcask* bc_open2(Mgr *mgr, int depth, i - return bc; - } - --inline bool file_exists(const char *path) { -+static inline bool file_exists(const char *path) { - struct stat st; - return stat(path, &st) == 0; - } - --inline char *gen_path(char *dst, const char *base, const char *fmt, int i) -+static inline char *gen_path(char *dst, const char *base, const char *fmt, int i) - { - static char path[256]; - char name[16]; -@@ -114,7 +114,7 @@ inline char *gen_path(char *dst, const c - return dst; - } - --inline char *new_path(char *dst, Mgr *mgr, const char *fmt, int i) -+static inline char *new_path(char *dst, Mgr *mgr, const char *fmt, int i) - { - char *path = gen_path(dst, mgr_base(mgr), fmt, i); - if (!file_exists(dst)) { Property changes on: head/databases/beansdb/files/patch-src__bitcask.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -y \ No newline at end of property Index: head/databases/beansdb/files/patch-src__htree.c =================================================================== --- head/databases/beansdb/files/patch-src__htree.c (revision 406023) +++ head/databases/beansdb/files/patch-src__htree.c (nonexistent) @@ -1,67 +0,0 @@ ---- src/htree.c.orig 2013-07-17 08:09:12 UTC -+++ src/htree.c -@@ -74,23 +74,23 @@ static void split_node(HTree *tree, Node - static void merge_node(HTree *tree, Node *node); - static void update_node(HTree *tree, Node *node); - --inline uint32_t get_pos(HTree *tree, Node *node) -+static inline uint32_t get_pos(HTree *tree, Node *node) - { - return (node - tree->root) - g_index[(int)node->depth]; - } - --inline Node *get_child(HTree *tree, Node *node, int b) -+static inline Node *get_child(HTree *tree, Node *node, int b) - { - int i = g_index[node->depth + 1] + (get_pos(tree, node) << 4) + b; - return tree->root + i; - } - --inline Data* get_data(Node *node) -+static inline Data* get_data(Node *node) - { - return node->data; - } - --inline void set_data(Node *node, Data *data) -+static inline void set_data(Node *node, Data *data) - { - if (data != node->data) { - if (node->data) free(node->data); -@@ -98,7 +98,7 @@ inline void set_data(Node *node, Data *d - } - } - --inline uint32_t key_hash(HTree *tree, Item* it) -+static inline uint32_t key_hash(HTree *tree, Item* it) - { - char buf[255]; - int n = dc_decode(tree->dc, buf, it->key, KEYLENGTH(it)); -@@ -256,8 +256,7 @@ static void merge_node(HTree *tree, Node - for (i=0; ihead; -- int count = (child+i)->count; -- for (j=0; j < count; j++){ -+ for (j=0; j < data->count; j++){ - if (it->ver > 0) { - add_item(tree, node, it, key_hash(tree, it), false); - } // drop deleted items, ver < 0 -@@ -315,7 +314,7 @@ static Item* get_item_hash(HTree* tree, - return r; - } - --inline int hex2int(char b) -+static inline int hex2int(char b) - { - if (('0'<=b && b<='9') || ('a'<=b && b<='f')) { - return (b>='a') ? (b-'a'+10) : (b-'0'); -@@ -690,7 +689,7 @@ void ht_destroy(HTree *tree) - free(tree); - } - --inline uint32_t keyhash(const char *s, int len) -+static inline uint32_t keyhash(const char *s, int len) - { - return fnv1a(s, len); - } Property changes on: head/databases/beansdb/files/patch-src__htree.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -y \ No newline at end of property Index: head/databases/beansdb/files/patch-src__hstore.c =================================================================== --- head/databases/beansdb/files/patch-src__hstore.c (revision 406023) +++ head/databases/beansdb/files/patch-src__hstore.c (nonexistent) @@ -1,19 +0,0 @@ ---- src/hstore.c.orig 2013-07-17 08:09:12 UTC -+++ src/hstore.c -@@ -45,14 +45,14 @@ struct t_hstore { - Bitcask* bitcasks[]; - }; - --inline int get_index(HStore *store, char *key) -+static inline int get_index(HStore *store, char *key) - { - if (store->height == 0) return 0; - uint32_t h = fnv1a(key, strlen(key)); - return h >> ((8 - store->height) * 4); - } - --inline pthread_mutex_t* get_mutex(HStore *store, char *key) -+static inline pthread_mutex_t* get_mutex(HStore *store, char *key) - { - uint32_t i = fnv1a(key, strlen(key)) % NUM_OF_MUTEX; - return &store->locks[i]; Property changes on: head/databases/beansdb/files/patch-src__hstore.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -y \ No newline at end of property Index: head/databases/beansdb/files/patch-src__codec.c =================================================================== --- head/databases/beansdb/files/patch-src__codec.c (revision 406023) +++ head/databases/beansdb/files/patch-src__codec.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/codec.c.orig 2013-07-17 08:09:12 UTC -+++ src/codec.c -@@ -28,7 +28,7 @@ typedef struct { - char fmt[7]; - } Fmt; - --inline int fmt_size(Fmt *fmt) { -+static inline int fmt_size(Fmt *fmt) { - return sizeof(Fmt) + strlen(fmt->fmt) - 7 + 1; - } - Property changes on: head/databases/beansdb/files/patch-src__codec.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -y \ No newline at end of property Index: head/databases/beansdb/Makefile =================================================================== --- head/databases/beansdb/Makefile (revision 406023) +++ head/databases/beansdb/Makefile (revision 406024) @@ -1,23 +1,23 @@ # Created by: Qing Feng # $FreeBSD$ PORTNAME= beansdb -PORTVERSION= 0.6.0 +PORTVERSION= 0.7.1.4 DISTVERSIONPREFIX= v CATEGORIES= databases MAINTAINER= ports@FreeBSD.org COMMENT= Yet another distributed key-value storage system from Douban Inc LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= douban USES= autoreconf GNU_CONFIGURE= yes PLIST_FILES= bin/beansdb man/man1/beansdb.1.gz .include Index: head/databases/beansdb/distinfo =================================================================== --- head/databases/beansdb/distinfo (revision 406023) +++ head/databases/beansdb/distinfo (revision 406024) @@ -1,2 +1,2 @@ -SHA256 (douban-beansdb-v0.6.0_GH0.tar.gz) = 64817d3c4dfde3342a2194e39becd17763a8dd854688fe47011017548b6247d8 -SIZE (douban-beansdb-v0.6.0_GH0.tar.gz) = 151711 +SHA256 (douban-beansdb-v0.7.1.4_GH0.tar.gz) = c89f267484dd47bab272b985ba0a9b9196ca63a9201fdf86963b8ed04f52ccdb +SIZE (douban-beansdb-v0.7.1.4_GH0.tar.gz) = 163292