svn commit: r352709 - in head: audio/libcoverart devel/jansson devel/jansson/files net-p2p/cpuminer net/libcapn net/pecl-apn ports-mgmt/fbsdmon textproc/jshon
Vanilla I. Shu
vanilla at FreeBSD.org
Thu May 1 01:31:09 UTC 2014
Author: vanilla
Date: Thu May 1 01:31:06 2014
New Revision: 352709
URL: http://svnweb.freebsd.org/changeset/ports/352709
QAT: https://qat.redports.org/buildarchive/r352709/
Log:
1: Upgrade jansson to 2.6.
2: bump revision due shared library version.
Modified:
head/audio/libcoverart/Makefile
head/devel/jansson/Makefile
head/devel/jansson/distinfo
head/devel/jansson/files/patch-src_hashtable.c
head/devel/jansson/pkg-plist
head/net-p2p/cpuminer/Makefile
head/net/libcapn/Makefile
head/net/pecl-apn/Makefile
head/ports-mgmt/fbsdmon/Makefile
head/textproc/jshon/Makefile
Modified: head/audio/libcoverart/Makefile
==============================================================================
--- head/audio/libcoverart/Makefile Thu May 1 00:12:36 2014 (r352708)
+++ head/audio/libcoverart/Makefile Thu May 1 01:31:06 2014 (r352709)
@@ -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}/
Modified: head/devel/jansson/Makefile
==============================================================================
--- head/devel/jansson/Makefile Thu May 1 00:12:36 2014 (r352708)
+++ head/devel/jansson/Makefile Thu May 1 01:31:06 2014 (r352709)
@@ -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 at 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
Modified: head/devel/jansson/distinfo
==============================================================================
--- head/devel/jansson/distinfo Thu May 1 00:12:36 2014 (r352708)
+++ head/devel/jansson/distinfo Thu May 1 01:31:06 2014 (r352709)
@@ -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: head/devel/jansson/files/patch-src_hashtable.c
==============================================================================
--- head/devel/jansson/files/patch-src_hashtable.c Thu May 1 00:12:36 2014 (r352708)
+++ head/devel/jansson/files/patch-src_hashtable.c Thu May 1 01:31:06 2014 (r352709)
@@ -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);
Modified: head/devel/jansson/pkg-plist
==============================================================================
--- head/devel/jansson/pkg-plist Thu May 1 00:12:36 2014 (r352708)
+++ head/devel/jansson/pkg-plist Thu May 1 01:31:06 2014 (r352709)
@@ -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
Modified: head/net-p2p/cpuminer/Makefile
==============================================================================
--- head/net-p2p/cpuminer/Makefile Thu May 1 00:12:36 2014 (r352708)
+++ head/net-p2p/cpuminer/Makefile Thu May 1 01:31:06 2014 (r352709)
@@ -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
Modified: head/net/libcapn/Makefile
==============================================================================
--- head/net/libcapn/Makefile Thu May 1 00:12:36 2014 (r352708)
+++ head/net/libcapn/Makefile Thu May 1 01:31:06 2014 (r352709)
@@ -3,6 +3,7 @@
PORTNAME= libcapn
PORTVERSION= 1.0.0.b3
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= gasol.wu at gmail.com
Modified: head/net/pecl-apn/Makefile
==============================================================================
--- head/net/pecl-apn/Makefile Thu May 1 00:12:36 2014 (r352708)
+++ head/net/pecl-apn/Makefile Thu May 1 01:31:06 2014 (r352709)
@@ -3,6 +3,7 @@
PORTNAME= apn
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= net pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
Modified: head/ports-mgmt/fbsdmon/Makefile
==============================================================================
--- head/ports-mgmt/fbsdmon/Makefile Thu May 1 00:12:36 2014 (r352708)
+++ head/ports-mgmt/fbsdmon/Makefile Thu May 1 01:31:06 2014 (r352709)
@@ -3,7 +3,7 @@
PORTNAME= fbsdmon
PORTVERSION= 1.00
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ports-mgmt sysutils
MASTER_SITES= LOCAL/gblach/
Modified: head/textproc/jshon/Makefile
==============================================================================
--- head/textproc/jshon/Makefile Thu May 1 00:12:36 2014 (r352708)
+++ head/textproc/jshon/Makefile Thu May 1 01:31:06 2014 (r352709)
@@ -2,7 +2,7 @@
PORTNAME= jshon
PORTVERSION= 20121210
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MAINTAINER= bdrewery at FreeBSD.org
More information about the svn-ports-all
mailing list