cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1: Upgrade jansson to 2.3.

Browse Source 
2: bump revision of fbsdmon to chase shared library version.

Feature safe: yes
This commit is contained in:
Vanilla I. Shu 2012-03-15 15:28:41 +00:00
parent 60b6213236
commit d4f7a64c51
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=293357
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/jansson/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= jansson
PORTVERSION= 2.2.1
PORTVERSION= 2.3
CATEGORIES= devel
MASTER_SITES= http://www.digip.org/jansson/releases/

4
devel/jansson/distinfo
View File

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

16
devel/jansson/files/patch-src_hashtable.c
View File

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

2
devel/jansson/pkg-plist
View File

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

3
ports-mgmt/fbsdmon/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= fbsdmon
PORTVERSION= 0.90
PORTREVISION= 1
CATEGORIES= ports-mgmt sysutils
MASTER_SITES= http://files.roorback.net/
@ -14,7 +15,7 @@ MAINTAINER= magik@roorback.net
COMMENT= Sumbit system and ports statistics to fbsdmon.org
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
jansson.6:${PORTSDIR}/devel/jansson \
jansson.7:${PORTSDIR}/devel/jansson \
SUB_FILES= 600.fbsdmon pkg-message
USE_RC_SUBR= fbsdmon