1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00

1: Upgrade jansson to 2.6.

2: bump revision due shared library version.
This commit is contained in:
Vanilla I. Shu 2014-05-01 01:31:06 +00:00
parent 99f317fa88
commit b3b7323d8e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=352709
10 changed files with 25 additions and 22 deletions

View File

@ -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}/

View File

@ -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

View File

@ -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

View File

@ -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);

View File

@ -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

View File

@ -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

View File

@ -3,6 +3,7 @@
PORTNAME= libcapn
PORTVERSION= 1.0.0.b3
PORTREVISION= 1
CATEGORIES= net
MAINTAINER= gasol.wu@gmail.com

View File

@ -3,6 +3,7 @@
PORTNAME= apn
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= net pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-

View File

@ -3,7 +3,7 @@
PORTNAME= fbsdmon
PORTVERSION= 1.00
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= ports-mgmt sysutils
MASTER_SITES= LOCAL/gblach/

View File

@ -2,7 +2,7 @@
PORTNAME= jshon
PORTVERSION= 20121210
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= textproc
MAINTAINER= bdrewery@FreeBSD.org