1: Upgrade jansson to 2.6.

2: bump revision due shared library version.

10 files changed, 25 insertions, 22 deletions

diff --git a/audio/libcoverart/Makefile b/audio/libcoverart/Makefile
index 2730756..9db37e3 100644
--- a/audio/libcoverart/Makefile
+++ b/audio/libcoverart/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libcoverart
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://cloud.github.com/downloads/metabrainz/${PORTNAME}/
 
diff --git a/devel/jansson/Makefile b/devel/jansson/Makefile
index 734116b..788e535 100644
--- a/devel/jansson/Makefile
+++ b/devel/jansson/Makefile
@@ -2,15 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	jansson
-PORTVERSION=	2.5
+PORTVERSION=	2.6
 CATEGORIES=	devel
 MASTER_SITES=	http://www.digip.org/jansson/releases/
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	C library for encoding, decoding, and manipulating JSON data
 
-USES=		pathfix pkgconfig gmake
-USE_BZIP2=	yes
+LICENSE=	MIT
+
+USES=		pathfix pkgconfig gmake tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/devel/jansson/distinfo b/devel/jansson/distinfo
index dace3c9..859e30e 100644
--- a/devel/jansson/distinfo
+++ b/devel/jansson/distinfo
@@ -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
diff --git a/devel/jansson/files/patch-src_hashtable.c b/devel/jansson/files/patch-src_hashtable.c
index 9aa8a85..43c75c7 100644
--- a/devel/jansson/files/patch-src_hashtable.c
+++ b/devel/jansson/files/patch-src_hashtable.c
@@ -1,20 +1,20 @@
---- 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;
 -    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);
  
diff --git a/devel/jansson/pkg-plist b/devel/jansson/pkg-plist
index 0a271da..adabbfd 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.9
+lib/libjansson.so.10
 libdata/pkgconfig/jansson.pc
diff --git a/net-p2p/cpuminer/Makefile b/net-p2p/cpuminer/Makefile
index 2d8a895..d8b61ba 100644
--- a/net-p2p/cpuminer/Makefile
+++ b/net-p2p/cpuminer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cpuminer
 PORTVERSION=	2.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p math
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	cpuminer
diff --git a/net/libcapn/Makefile b/net/libcapn/Makefile
index 22aeb7e..8393c40 100644
--- a/net/libcapn/Makefile
+++ b/net/libcapn/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libcapn
 PORTVERSION=	1.0.0.b3
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	gasol.wu@gmail.com
diff --git a/net/pecl-apn/Makefile b/net/pecl-apn/Makefile
index bfc096b..cb18c64 100644
--- a/net/pecl-apn/Makefile
+++ b/net/pecl-apn/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	apn
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	net pear
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
diff --git a/ports-mgmt/fbsdmon/Makefile b/ports-mgmt/fbsdmon/Makefile
index 25587a9..60ded08 100644
--- a/ports-mgmt/fbsdmon/Makefile
+++ b/ports-mgmt/fbsdmon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fbsdmon
 PORTVERSION=	1.00
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt sysutils
 MASTER_SITES=	LOCAL/gblach/
 
diff --git a/textproc/jshon/Makefile b/textproc/jshon/Makefile
index dbb6a9e..969522d 100644
--- a/textproc/jshon/Makefile
+++ b/textproc/jshon/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	jshon
 PORTVERSION=	20121210
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 
 MAINTAINER=	bdrewery@FreeBSD.org