- Update to 1.8.

- Add option to build Cython bindings.
- Add two patches to fix build with Clang.

5 files changed, 69 insertions, 24 deletions

diff --git a/devel/libplist/Makefile b/devel/libplist/Makefile
index 1f6dc5a7bd38..6a0064becbab 100644
--- a/devel/libplist/Makefile
+++ b/devel/libplist/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	libplist
-PORTVERSION=	1.4
+PORTVERSION=	1.8
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libimobiledevice.org/downloads/
 
@@ -15,28 +15,45 @@ COMMENT=	A library to handle Apple Property List format
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
-USE_BZIP2=	yes
-USE_GNOME=	glib20 libxml2
+USE_GNOME=	libxml2
+# Unlisted dependency.
 USE_ICONV=	yes
-MAKE_JOBS_SAFE=	yes
+USE_BZIP2=	yes
 USE_CMAKE=	yes
+# Required for iconv headers.
 CFLAGS+=	-I${LOCALBASE}/include
-USE_LDCONFIG=	yes
+# Required for MAKE_JOBS_SAFE to work.
+USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+USE_LDCONFIG=	${LOCALBASE}/lib
 
-PORTDOCS=	AUTHORS README
+PORTDOCS=	AUTHORS NEWS README
 
-OPTIONS=	PYTHON	"Enable Python bindings (needs Swig)" off
+OPTIONS=	CYTHON	"Enable Cython Python bindings" off \
+		SWIG	"Enable Swig Python bindings" off
 
 .include <bsd.port.options.mk>
 
-.ifdef(WITH_PYTHON)
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+.ifdef(WITH_CYTHON)
+BUILD_DEPENDS+=	cython:${PORTSDIR}/lang/cython
+USE_PYTHON=	yes
+CMAKE_ARGS+=	-DENABLE_CYTHON:BOOL=On
+# Is this really needed?
+USE_LDCONFIG+=	${PYTHON_SITELIBDIR}
+PLIST_SUB+=	CYTHON=""
+.else
+CMAKE_ARGS+=	-DENABLE_CYTHON:BOOL=Off
+PLIST_SUB+=	CYTHON="@comment "
+.endif
+
+.ifdef(WITH_SWIG)
+BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13
 USE_PYTHON=	yes
-CMAKE_ARGS+=	-DENABLE_PYTHON:BOOL=On
-PLIST_SUB+=	PYTHON=""
+CMAKE_ARGS+=	-DENABLE_SWIG:BOOL=On
+PLIST_SUB+=	SWIG=""
 .else
-CMAKE_ARGS+=	-DENABLE_PYTHON:BOOL=Off
-PLIST_SUB+=	PYTHON="@comment "
+CMAKE_ARGS+=	-DENABLE_SWIG:BOOL=Off
+PLIST_SUB+=	SWIG="@comment "
 .endif
 
 pre-configure:
diff --git a/devel/libplist/distinfo b/devel/libplist/distinfo
index b7fb0f81aaa8..d7281a9040a0 100644
--- a/devel/libplist/distinfo
+++ b/devel/libplist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libplist-1.4.tar.bz2) = 2ad226abe1131a72e7ecbb2b921ad92f54b8e787c2281c89b00145b519479a71
-SIZE (libplist-1.4.tar.bz2) = 68176
+SHA256 (libplist-1.8.tar.bz2) = a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec
+SIZE (libplist-1.8.tar.bz2) = 81278
diff --git a/devel/libplist/files/patch-libcnary__node.c b/devel/libplist/files/patch-libcnary__node.c
new file mode 100644
index 000000000000..36f0bcc25b8e
--- /dev/null
+++ b/devel/libplist/files/patch-libcnary__node.c
@@ -0,0 +1,11 @@
+--- ./libcnary/node.c.orig	2012-01-29 11:49:28.786656365 +0100
++++ ./libcnary/node.c	2012-01-29 11:53:54.146697468 +0100
+@@ -104,7 +104,7 @@
+ 
+ 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/devel/libplist/files/patch-src__base64.c b/devel/libplist/files/patch-src__base64.c
new file mode 100644
index 000000000000..ae38994763a8
--- /dev/null
+++ b/devel/libplist/files/patch-src__base64.c
@@ -0,0 +1,14 @@
+--- ./src/base64.c.orig	2012-01-29 13:01:09.956709152 +0100
++++ ./src/base64.c	2012-01-29 13:17:28.106706024 +0100
+@@ -104,9 +104,9 @@
+ 
+ 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;
diff --git a/devel/libplist/pkg-plist b/devel/libplist/pkg-plist
index cb55a72d9865..22c55f694dab 100644
--- a/devel/libplist/pkg-plist
+++ b/devel/libplist/pkg-plist
@@ -1,5 +1,5 @@
 bin/plutil
-bin/plutil-1.4
+bin/plutil-1.8
 include/plist/Array.h
 include/plist/Boolean.h
 include/plist/Data.h
@@ -10,20 +10,23 @@ include/plist/Node.h
 include/plist/Real.h
 include/plist/String.h
 include/plist/Structure.h
+%%CYTHON%%include/plist/cython/plist.pxd
 include/plist/plist++.h
 include/plist/plist.h
-%%PYTHON%%include/plist/swig/plist.i
+%%SWIG%%include/plist/swig/plist.i
 lib/libplist++.so
 lib/libplist++.so.1
-lib/libplist++.so.1.1.4
+lib/libplist++.so.1.1.8
 lib/libplist.so
 lib/libplist.so.1
-lib/libplist.so.1.1.4
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/plist/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/plist/_plist.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/plist/plist.py
+lib/libplist.so.1.1.8
+%%SWIG%%%%PYTHON_SITELIBDIR%%/plist/__init__.py
+%%SWIG%%%%PYTHON_SITELIBDIR%%/plist/_plist.so
+%%SWIG%%%%PYTHON_SITELIBDIR%%/plist/plist.py
+%%CYTHON%%%%PYTHON_SITELIBDIR%%/plist.so
 libdata/pkgconfig/libplist++.pc
 libdata/pkgconfig/libplist.pc
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/plist
-%%PYTHON%%@dirrm include/plist/swig
+%%SWIG%%@dirrm %%PYTHON_SITELIBDIR%%/plist
+%%SWIG%%@dirrm include/plist/swig
+%%CYTHON%%@dirrm include/plist/cython
 @dirrm include/plist