Update to 1.8, fix compilation issues.

Removed glib2 dependency, bump depends in bl3.mk.

Version 1.8
~~~~~~~~~~~

- Changes:
  * Add cython bindings
  * Fix error in swig bindings
  * Fix memory corruption in libcnary

Version 1.7
~~~~~~~~~~~

- Changes:
  * Fix building on Big Endian systems

Version 1.6
~~~~~~~~~~~

- Changes:
  * Updated libcnary sources, adding license and copyright info

Version 1.5
~~~~~~~~~~~

- Changes:
  * Removed glib dependency, libplist now uses libcnary
    (http://github.com/Chronic-Dev/libcnary)
  * Fix building of python bindings with GCC 4.6

6 files changed, 45 insertions, 96 deletions

diff --git a/textproc/libplist/Makefile b/textproc/libplist/Makefile
index 9d4ffa2eade..4837bd91b3b 100644
--- a/textproc/libplist/Makefile
+++ b/textproc/libplist/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2012/03/15 11:53:40 obache Exp $
+# $NetBSD: Makefile,v 1.7 2012/04/22 16:11:13 wiz Exp $
 #
 
-DISTNAME=	libplist-1.4
-PKGREVISION=	4
+DISTNAME=	libplist-1.8
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.libimobiledevice.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -15,8 +14,9 @@ LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_CMAKE=	yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	gmake pkg-config
 USE_LANGUAGES=	c c++
+MAKE_JOBS_SAFE=	no
 
 PKGCONFIG_OVERRIDE+=	libplist++.pc.in
 PKGCONFIG_OVERRIDE+=	libplist.pc.in
@@ -25,5 +25,4 @@ PY_PATCHPLIST=		yes
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../devel/swig/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libplist/buildlink3.mk b/textproc/libplist/buildlink3.mk
index d1ad4b58faa..7f116d9bc47 100644
--- a/textproc/libplist/buildlink3.mk
+++ b/textproc/libplist/buildlink3.mk
@@ -1,16 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/03/03 00:12:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2012/04/22 16:11:13 wiz Exp $
 
 BUILDLINK_TREE+=	libplist
 
 .if !defined(LIBPLIST_BUILDLINK3_MK)
 LIBPLIST_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libplist+=	libplist>=1.3
-BUILDLINK_ABI_DEPENDS.libplist?=	libplist>=1.4nb3
+BUILDLINK_API_DEPENDS.libplist+=	libplist>=1.8
 BUILDLINK_PKGSRCDIR.libplist?=	../../textproc/libplist
 
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .endif	# LIBPLIST_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libplist
diff --git a/textproc/libplist/distinfo b/textproc/libplist/distinfo
index 738aa844114..018e5a675bd 100644
--- a/textproc/libplist/distinfo
+++ b/textproc/libplist/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2012/02/16 19:53:53 hans Exp $
+$NetBSD: distinfo,v 1.5 2012/04/22 16:11:13 wiz Exp $
 
-SHA1 (libplist-1.4.tar.bz2) = 82e98d13cdff1a62ad1184d515d71e8898866ee4
-RMD160 (libplist-1.4.tar.bz2) = a00366f0fe164d7bd5d516092e2731b3233ac075
-Size (libplist-1.4.tar.bz2) = 68176 bytes
-SHA1 (patch-cmake_modules_FindGLIB2.cmake) = 9ce39d6f623c15e1d68af18e461821c95afbe7e1
+SHA1 (libplist-1.8.tar.bz2) = dea18ac31cc497dba959bdb459a2a49fb41664c3
+RMD160 (libplist-1.8.tar.bz2) = b8da55db4bec34e4c8b9126da0ea46e79f36ccf1
+Size (libplist-1.8.tar.bz2) = 81278 bytes
+SHA1 (patch-libcnary_node.c) = fb68624e544acee262f1440d5920cbb4288c1958
+SHA1 (patch-src_base64.c) = efc37b2345e0328eb7c74be1f07487e14eb3d3f6
 SHA1 (patch-swig_plist.i) = f4a375c2b96c8eb04c5f53f4753703c0bb86088d
diff --git a/textproc/libplist/patches/patch-cmake_modules_FindGLIB2.cmake b/textproc/libplist/patches/patch-cmake_modules_FindGLIB2.cmake
deleted file mode 100644
index a16d7852114..00000000000
--- a/textproc/libplist/patches/patch-cmake_modules_FindGLIB2.cmake
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-cmake_modules_FindGLIB2.cmake,v 1.2 2012/02/16 19:53:54 hans Exp $
-
-Fix glib2 detection using macros from spectrum.im.
-
---- cmake/modules/FindGLIB2.cmake.orig	2010-04-18 13:30:19.000000000 +0000
-+++ cmake/modules/FindGLIB2.cmake
-@@ -1,15 +1,4 @@
--# - Try to find the GLIB2 libraries
--# Once done this will define
--#
--#  GLIB2_FOUND - system has glib2
--#  GLIB2_INCLUDE_DIR - the glib2 include directory
--#  GLIB2_LIBRARIES - glib2 library
--
--# Copyright (c) 2008 Laurent Montel, <montel@kde.org>
--#
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
--
-+set(GLIB2_LIBRARIES "GLIB2_LIBRARIES-NOTFOUND")
- 
- if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
-     # Already in cache, be silent
-@@ -17,35 +6,44 @@ if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES
- endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
- 
- if (NOT WIN32)
--   FIND_PACKAGE(PkgConfig)
--   PKG_CHECK_MODULES(PC_GLIB2 glib-2.0)
--   SET(GLIB2_DEFINITIONS ${PC_GLIB2_CFLAGS_OTHER})
-+   find_package(PkgConfig REQUIRED)
-+   pkg_check_modules(PKG_GLIB REQUIRED glib-2.0)
- endif(NOT WIN32)
- 
- find_path(GLIB2_MAIN_INCLUDE_DIR glib.h
-           PATH_SUFFIXES glib-2.0
--          PATHS ${_LibGLIB2IncDir} )
-+          PATHS ${PKG_GLIB_INCLUDE_DIRS} NO_DEFAULT_PATH)
- 
- # search the glibconfig.h include dir under the same root where the library is found
--find_library(GLIB2_LIBRARIES 
--             NAMES glib-2.0 
--             PATHS ${_LibGLIB2LinkDir} )
--
--get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH)
-+find_library(GLIB2_LIBRARIES
-+             NAMES glib-2.0
-+             PATHS ${PKG_GLIB_LIBRARY_DIRS} NO_DEFAULT_PATH)
-+
-+find_library(GLIB2_THREAD
-+             NAMES gthread-2.0
-+             PATHS ${PKG_GLIB_LIBRARY_DIRS} NO_DEFAULT_PATH)
- 
- find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h
-           PATH_SUFFIXES glib-2.0/include
--          PATHS ${_LibGLIB2IncDir} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH})
-+          PATHS ${PKG_GLIB_INCLUDE_DIRS} ${PKG_GLIB_LIBRARIES} ${CMAKE_SYSTEM_LIBRARY_PATH} NO_DEFAULT_PATH)
-+
-+if(GLIB2_THREAD)
-+	set(GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ${GLIB2_THREAD})
-+else(GLIB2_THREAD)
-+	message( FATAL_ERROR "Could NOT find gthread-2.0" )
-+endif(GLIB2_THREAD)
-+
- 
--set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}")
-+set(GLIB2_INCLUDE_DIR ${GLIB2_MAIN_INCLUDE_DIR})
- 
- # not sure if this include dir is optional or required
- # for now it is optional
- if(GLIB2_INTERNAL_INCLUDE_DIR)
--  set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR} "${GLIB2_INTERNAL_INCLUDE_DIR}")
-+  set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR} ${GLIB2_INTERNAL_INCLUDE_DIR})
-+  set(GLIB2_FOUND TRUE)
- endif(GLIB2_INTERNAL_INCLUDE_DIR)
- 
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(GLIB2  DEFAULT_MSG  GLIB2_LIBRARIES GLIB2_MAIN_INCLUDE_DIR)
- 
--mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES)
-\ No newline at end of file
-+mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES)
diff --git a/textproc/libplist/patches/patch-libcnary_node.c b/textproc/libplist/patches/patch-libcnary_node.c
new file mode 100644
index 00000000000..85bf5c08b0f
--- /dev/null
+++ b/textproc/libplist/patches/patch-libcnary_node.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-libcnary_node.c,v 1.1 2012/04/22 16:11:13 wiz Exp $
+
+Non-void functions need return values.
+
+--- libcnary/node.c.orig	2012-01-11 14:29:30.000000000 +0000
++++ libcnary/node.c
+@@ -104,7 +104,7 @@ int node_detach(node_t* parent, node_t* 
+ 
+ int node_insert(node_t* parent, unsigned int index, node_t* child)
+ {
+-	if (!parent || !child) return;
++	if (!parent || !child) return -1;
+ 	child->isLeaf = TRUE;
+ 	child->isRoot = FALSE;
+ 	child->parent = parent;
diff --git a/textproc/libplist/patches/patch-src_base64.c b/textproc/libplist/patches/patch-src_base64.c
new file mode 100644
index 00000000000..d3aeda1fb5b
--- /dev/null
+++ b/textproc/libplist/patches/patch-src_base64.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_base64.c,v 1.1 2012/04/22 16:11:13 wiz Exp $
+
+Non-void functions need return values.
+
+--- src/base64.c.orig	2012-01-11 14:29:30.000000000 +0000
++++ src/base64.c
+@@ -104,9 +104,9 @@ static int base64decode_block(unsigned c
+ 
+ unsigned char *base64decode(const char *buf, size_t *size)
+ {
+-	if (!buf) return;
++	if (!buf) return NULL;
+ 	size_t len = strlen(buf);
+-	if (len <= 0) return;
++	if (len <= 0) return NULL;
+ 	unsigned char *outbuf = (unsigned char*)malloc((len/4)*3+3);
+ 
+ 	unsigned char *line;