diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2012-03-15 15:28:41 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2012-03-15 15:28:41 +0000 |
| commit | d4f7a64c51561e9756bb4eecea7a1780bd10550f (patch) | |
| tree | 63880fcf7305f373a29bb5842214a21e7917f641 /devel/jansson | |
| parent | 60b6213236e34d83c4faa4da6acd93c1a175d254 (diff) | |
| download | ports-d4f7a64c51561e9756bb4eecea7a1780bd10550f.tar.gz ports-d4f7a64c51561e9756bb4eecea7a1780bd10550f.zip | |
Notes
Diffstat (limited to 'devel/jansson')
| -rw-r--r-- | devel/jansson/Makefile | 2 | ||||
| -rw-r--r-- | devel/jansson/distinfo | 4 | ||||
| -rw-r--r-- | devel/jansson/files/patch-src_hashtable.c | 16 | ||||
| -rw-r--r-- | devel/jansson/pkg-plist | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/devel/jansson/Makefile b/devel/jansson/Makefile index 14452743e2c2..644f7b0db753 100644 --- a/devel/jansson/Makefile +++ b/devel/jansson/Makefile @@ -6,7 +6,7 @@ # PORTNAME= jansson -PORTVERSION= 2.2.1 +PORTVERSION= 2.3 CATEGORIES= devel MASTER_SITES= http://www.digip.org/jansson/releases/ diff --git a/devel/jansson/distinfo b/devel/jansson/distinfo index a6cb8100a0da..8ed201ccb7e7 100644 --- a/devel/jansson/distinfo +++ b/devel/jansson/distinfo @@ -1,2 +1,2 @@ -SHA256 (jansson-2.2.1.tar.gz) = 3c2523d81788a721d3648291ed64a89e0b9799ac1c9a5ab1ececbb1365cf6249 -SIZE (jansson-2.2.1.tar.gz) = 367087 +SHA256 (jansson-2.3.tar.gz) = db2a4202b4731398b16c97335f94536611283801236dbcd529e190f11e837292 +SIZE (jansson-2.3.tar.gz) = 389855 diff --git a/devel/jansson/files/patch-src_hashtable.c b/devel/jansson/files/patch-src_hashtable.c index 285f7a454516..1888ac6ed43c 100644 --- a/devel/jansson/files/patch-src_hashtable.c +++ b/devel/jansson/files/patch-src_hashtable.c @@ -1,6 +1,6 @@ ---- src/hashtable.c.orig 2011-04-02 22:36:44.000000000 +0800 -+++ src/hashtable.c 2011-04-02 22:37:52.000000000 +0800 -@@ -101,10 +101,10 @@ static int hashtable_do_del(hashtable_t +--- src/hashtable.c.orig 2012-03-15 23:19:46.000000000 +0800 ++++ src/hashtable.c 2012-03-15 23:21:20.000000000 +0800 +@@ -118,10 +118,10 @@ static int hashtable_do_del(hashtable_t { pair_t *pair; bucket_t *bucket; @@ -14,7 +14,7 @@ pair = hashtable_find_pair(hashtable, bucket, key, hash); if(!pair) -@@ -153,7 +153,7 @@ static int hashtable_do_rehash(hashtable +@@ -163,7 +163,7 @@ static int hashtable_do_rehash(hashtable { list_t *list, *next; pair_t *pair; @@ -23,7 +23,7 @@ jsonp_free(hashtable->buckets); -@@ -176,8 +176,8 @@ static int hashtable_do_rehash(hashtable +@@ -186,8 +186,8 @@ static int hashtable_do_rehash(hashtable for(; list != &hashtable->list; list = next) { next = list->next; pair = list_to_pair(list); @@ -34,7 +34,7 @@ } return 0; -@@ -244,7 +244,7 @@ int hashtable_set(hashtable_t *hashtable +@@ -227,7 +227,7 @@ int hashtable_set(hashtable_t *hashtable { pair_t *pair; bucket_t *bucket; @@ -43,10 +43,10 @@ /* rehash if the load ratio exceeds 1 */ if(hashtable->size >= num_buckets(hashtable)) -@@ -252,8 +252,8 @@ int hashtable_set(hashtable_t *hashtable +@@ -235,8 +235,8 @@ int hashtable_set(hashtable_t *hashtable return -1; - hash = hashtable->hash_key(key); + hash = hash_str(key); - index = hash % num_buckets(hashtable); - bucket = &hashtable->buckets[index]; + my_index = hash % num_buckets(hashtable); diff --git a/devel/jansson/pkg-plist b/devel/jansson/pkg-plist index afdfa9729cd5..70672e44bc96 100644 --- a/devel/jansson/pkg-plist +++ b/devel/jansson/pkg-plist @@ -3,5 +3,5 @@ include/jansson_config.h lib/libjansson.a lib/libjansson.la lib/libjansson.so -lib/libjansson.so.6 +lib/libjansson.so.7 libdata/pkgconfig/jansson.pc |