[Midnightbsd-cvs] mports [16940] trunk/devel/jansson: jansson 2.6

[laffer1 at midnightbsd.org]

Revision: 16940
          http://svnweb.midnightbsd.org/mports/?rev=16940
Author:   laffer1
Date:     2014-09-07 12:18:48 -0400 (Sun, 07 Sep 2014)
Log Message:
-----------
jansson 2.6

Modified Paths:
--------------
    trunk/devel/jansson/Makefile
    trunk/devel/jansson/distinfo
    trunk/devel/jansson/files/patch-src_hashtable.c
    trunk/devel/jansson/pkg-plist

Modified: trunk/devel/jansson/Makefile
===================================================================
--- trunk/devel/jansson/Makefile	2014-09-07 16:17:04 UTC (rev 16939)
+++ trunk/devel/jansson/Makefile	2014-09-07 16:18:48 UTC (rev 16940)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	jansson
-PORTVERSION=	2.5
+PORTVERSION=	2.6
 CATEGORIES=	devel
 MASTER_SITES=	http://www.digip.org/jansson/releases/
 
@@ -10,8 +10,7 @@
 
 LICENSE=	mit
 
-USES=		pathfix pkgconfig gmake
-USE_BZIP2=	yes
+USES=		pathfix pkgconfig gmake tar:bzip2 libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 

Modified: trunk/devel/jansson/distinfo
===================================================================
--- trunk/devel/jansson/distinfo	2014-09-07 16:17:04 UTC (rev 16939)
+++ trunk/devel/jansson/distinfo	2014-09-07 16:18:48 UTC (rev 16940)
@@ -1,2 +1,2 @@
-SHA256 (jansson-2.5.tar.bz2) = 262f5a3e9ad8f5d8b3c8683e8c57b5148ff0ad97cfe3d6f10b8b15ece126e4c7
-SIZE (jansson-2.5.tar.bz2) = 312937
+SHA256 (jansson-2.6.tar.bz2) = d2cc63ee7f6dcda6c9a8f0b558f94b8f25f048706b7cbd6a79d3e877b738cd4d
+SIZE (jansson-2.6.tar.bz2) = 319429

Modified: trunk/devel/jansson/files/patch-src_hashtable.c
===================================================================
--- trunk/devel/jansson/files/patch-src_hashtable.c	2014-09-07 16:17:04 UTC (rev 16939)
+++ trunk/devel/jansson/files/patch-src_hashtable.c	2014-09-07 16:18:48 UTC (rev 16940)
@@ -1,6 +1,6 @@
---- src/hashtable.c.orig	2013-09-20 01:47:31.000000000 +0800
-+++ src/hashtable.c	2013-09-25 06:17:31.000000000 +0800
-@@ -118,10 +118,10 @@ static int hashtable_do_del(hashtable_t 
+--- src/hashtable.c.orig	2014-02-11 15:53:06.000000000 +0800
++++ src/hashtable.c	2014-02-15 18:45:56.864995487 +0800
+@@ -103,10 +103,10 @@ static int hashtable_do_del(hashtable_t 
  {
      pair_t *pair;
      bucket_t *bucket;
@@ -7,14 +7,14 @@
 -    size_t index;
 +    size_t ind;
  
--    index = hash % num_buckets(hashtable);
+-    index = hash & hashmask(hashtable->order);
 -    bucket = &hashtable->buckets[index];
-+    ind = hash % num_buckets(hashtable);
++    ind = hash & hashmask(hashtable->order);
 +    bucket = &hashtable->buckets[ind];
  
      pair = hashtable_find_pair(hashtable, bucket, key, hash);
      if(!pair)
-@@ -163,7 +163,7 @@ static int hashtable_do_rehash(hashtable
+@@ -148,7 +148,7 @@ static int hashtable_do_rehash(hashtable
  {
      list_t *list, *next;
      pair_t *pair;
@@ -23,7 +23,7 @@
  
      jsonp_free(hashtable->buckets);
  
-@@ -186,8 +186,8 @@ static int hashtable_do_rehash(hashtable
+@@ -171,8 +171,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;
-@@ -227,7 +227,7 @@ int hashtable_set(hashtable_t *hashtable
+@@ -212,7 +212,7 @@ int hashtable_set(hashtable_t *hashtable
  {
      pair_t *pair;
      bucket_t *bucket;
@@ -42,14 +42,14 @@
 +    size_t hash, ind;
  
      /* rehash if the load ratio exceeds 1 */
-     if(hashtable->size >= num_buckets(hashtable))
-@@ -235,8 +235,8 @@ int hashtable_set(hashtable_t *hashtable
+     if(hashtable->size >= hashsize(hashtable->order))
+@@ -220,8 +220,8 @@ int hashtable_set(hashtable_t *hashtable
              return -1;
  
      hash = hash_str(key);
--    index = hash % num_buckets(hashtable);
+-    index = hash & hashmask(hashtable->order);
 -    bucket = &hashtable->buckets[index];
-+    ind = hash % num_buckets(hashtable);
++    ind = hash & hashmask(hashtable->order);
 +    bucket = &hashtable->buckets[ind];
      pair = hashtable_find_pair(hashtable, bucket, key, hash);
  

Modified: trunk/devel/jansson/pkg-plist
===================================================================
--- trunk/devel/jansson/pkg-plist	2014-09-07 16:17:04 UTC (rev 16939)
+++ trunk/devel/jansson/pkg-plist	2014-09-07 16:18:48 UTC (rev 16940)
@@ -1,7 +1,6 @@
 include/jansson.h
 include/jansson_config.h
 lib/libjansson.a
-lib/libjansson.la
 lib/libjansson.so
-lib/libjansson.so.9
+lib/libjansson.so.10
 libdata/pkgconfig/jansson.pc