summaryrefslogtreecommitdiff
path: root/devel/json-glib
diff options
context:
space:
mode:
Diffstat (limited to 'devel/json-glib')
-rw-r--r--devel/json-glib/Makefile12
-rw-r--r--devel/json-glib/distinfo6
-rw-r--r--devel/json-glib/files/patch-json-glib_json-object.c21
-rw-r--r--devel/json-glib/pkg-plist13
4 files changed, 20 insertions, 32 deletions
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index 37d5331423db..ad53b2667d02 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -3,20 +3,22 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/json-glib/Makefile,v 1.5 2009/10/30 11:35:48 kwm Exp $
#
PORTNAME= json-glib
-PORTVERSION= 0.6.2
-PORTREVISION= 1
+PORTVERSION= 0.8.2
CATEGORIES= devel
-MASTER_SITES= http://folks.o-hand.com/~ebassi/sources/ \
- ${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= marcus:local
+MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= JSON (RFC 4627) interface for Glib
+BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
+RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
+
USE_GMAKE= yes
+USE_BZIP2= yes
USE_GNOME= glib20 gnomehack gnomeprefix ltverhack
USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
diff --git a/devel/json-glib/distinfo b/devel/json-glib/distinfo
index 8068b304c217..6d40520cedca 100644
--- a/devel/json-glib/distinfo
+++ b/devel/json-glib/distinfo
@@ -1,3 +1,3 @@
-MD5 (json-glib-0.6.2.tar.gz) = d98f5580035ad0b37fa11896053a57af
-SHA256 (json-glib-0.6.2.tar.gz) = 7befca7f7d7d65cbb260eacd86eff2c1dcae8d859ae2c3e3002e2536d02b2c49
-SIZE (json-glib-0.6.2.tar.gz) = 453865
+MD5 (json-glib-0.8.2.tar.bz2) = 5fcd08da526a60d28d0ced4524799231
+SHA256 (json-glib-0.8.2.tar.bz2) = 51d64ee2f70e7d8d67eca4c1b35575dd7aa2a08dad7662e53d6c6c60af7a3dde
+SIZE (json-glib-0.8.2.tar.bz2) = 392020
diff --git a/devel/json-glib/files/patch-json-glib_json-object.c b/devel/json-glib/files/patch-json-glib_json-object.c
deleted file mode 100644
index b01ae9261354..000000000000
--- a/devel/json-glib/files/patch-json-glib_json-object.c
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/json-glib/json-gobject.c b/json-glib/json-gobject.c
-index 15e9ed5..eeb571c 100644
---- json-glib/json-gobject.c
-+++ json-glib/json-gobject.c
-@@ -189,7 +189,7 @@ json_deserialize_pspec (GValue *value,
- {
- JsonArray *array = json_node_get_array (node);
- guint i, array_len = json_array_get_length (array);
-- GPtrArray *str_array = g_ptr_array_sized_new (array_len);
-+ GPtrArray *str_array = g_ptr_array_sized_new (array_len + 1);
-
- for (i = 0; i < array_len; i++)
- {
-@@ -201,6 +201,7 @@ json_deserialize_pspec (GValue *value,
- if (json_node_get_string (val) != NULL);
- g_ptr_array_add (str_array, (gpointer) json_node_get_string (val));
- }
-+ g_ptr_array_add (str_array, NULL);
-
- g_value_set_boxed (value, str_array->pdata);
-
diff --git a/devel/json-glib/pkg-plist b/devel/json-glib/pkg-plist
index 41dae00996b1..9a9ef319cbb6 100644
--- a/devel/json-glib/pkg-plist
+++ b/devel/json-glib/pkg-plist
@@ -5,6 +5,7 @@ include/json-glib-1.0/json-glib/json-gobject.h
include/json-glib-1.0/json-glib/json-parser.h
include/json-glib-1.0/json-glib/json-types.h
include/json-glib-1.0/json-glib/json-version.h
+lib/girepository-1.0/Json-1.0.typelib
lib/libjson-glib-1.0.a
lib/libjson-glib-1.0.la
lib/libjson-glib-1.0.so
@@ -12,20 +13,25 @@ lib/libjson-glib-1.0.so.0
libdata/pkgconfig/json-glib-1.0.pc
%%DOCSDIR%%/JsonGenerator.html
%%DOCSDIR%%/JsonParser.html
+%%DOCSDIR%%/annotation-glossary.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/ch02.html
%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/ix01.html
%%DOCSDIR%%/ix02.html
+%%DOCSDIR%%/ix03.html
+%%DOCSDIR%%/ix04.html
+%%DOCSDIR%%/ix05.html
%%DOCSDIR%%/json-advanced.html
%%DOCSDIR%%/json-base.html
%%DOCSDIR%%/json-glib-GObject-integration.html
-%%DOCSDIR%%/json-glib-JsonArray.html
-%%DOCSDIR%%/json-glib-JsonNode.html
-%%DOCSDIR%%/json-glib-JsonObject.html
+%%DOCSDIR%%/json-glib-JSON-Array.html
+%%DOCSDIR%%/json-glib-JSON-Node.html
+%%DOCSDIR%%/json-glib-JSON-Object.html
%%DOCSDIR%%/json-glib-Versioning-information.html
%%DOCSDIR%%/json-glib.devhelp
%%DOCSDIR%%/json-glib.devhelp2
@@ -37,6 +43,7 @@ libdata/pkgconfig/json-glib-1.0.pc
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
+share/gir-1.0/Json-1.0.gir
@dirrm %%DOCSDIR%%
@dirrm include/json-glib-1.0/json-glib
@dirrm include/json-glib-1.0