summaryrefslogtreecommitdiff
path: root/textproc/libplist
diff options
context:
space:
mode:
authorjoerg <joerg>2013-05-29 13:20:22 +0000
committerjoerg <joerg>2013-05-29 13:20:22 +0000
commitb907281604ecc2186eec2f1c3e73a8616acc03bc (patch)
tree4c2e5db88d192eaae93b9754595b4ef35ffcd70e /textproc/libplist
parent1f03bba86faddd263e42598089de903ce10fcd5b (diff)
downloadpkgsrc-b907281604ecc2186eec2f1c3e73a8616acc03bc.tar.gz
Return end() when iteration fails due to node being NULL.
Bump revision.
Diffstat (limited to 'textproc/libplist')
-rw-r--r--textproc/libplist/Makefile4
-rw-r--r--textproc/libplist/distinfo3
-rw-r--r--textproc/libplist/patches/patch-src_Dictionary.cpp15
3 files changed, 19 insertions, 3 deletions
diff --git a/textproc/libplist/Makefile b/textproc/libplist/Makefile
index 0f57e4933cf..ae9c84fc939 100644
--- a/textproc/libplist/Makefile
+++ b/textproc/libplist/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2012/10/25 06:56:03 asau Exp $
+# $NetBSD: Makefile,v 1.11 2013/05/29 13:20:22 joerg Exp $
#
DISTNAME= libplist-1.8
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= textproc
MASTER_SITES= http://www.libimobiledevice.org/downloads/
EXTRACT_SUFX= .tar.bz2
diff --git a/textproc/libplist/distinfo b/textproc/libplist/distinfo
index 4ecbd63706f..57c25a8fabc 100644
--- a/textproc/libplist/distinfo
+++ b/textproc/libplist/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2012/09/29 08:39:22 dholland Exp $
+$NetBSD: distinfo,v 1.7 2013/05/29 13:20:22 joerg Exp $
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_Dictionary.cpp) = ba7a53cc2e3d760d3f1661aed171a501b841e0f2
SHA1 (patch-src_base64.c) = efc37b2345e0328eb7c74be1f07487e14eb3d3f6
SHA1 (patch-swig_plist.i) = 6ec7b989168e0e20da06722a97631e082cd5b05d
diff --git a/textproc/libplist/patches/patch-src_Dictionary.cpp b/textproc/libplist/patches/patch-src_Dictionary.cpp
new file mode 100644
index 00000000000..17fb6d5f7a1
--- /dev/null
+++ b/textproc/libplist/patches/patch-src_Dictionary.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Dictionary.cpp,v 1.1 2013/05/29 13:20:22 joerg Exp $
+
+What is the intention here?
+
+--- src/Dictionary.cpp.orig 2013-04-28 13:27:28.000000000 +0000
++++ src/Dictionary.cpp
+@@ -151,7 +151,7 @@ Dictionary::iterator Dictionary::Insert(
+ _map[key] = clone;
+ return _map.find(key);
+ }
+- return iterator(NULL);
++ return _map.end();
+ }
+
+ void Dictionary::Remove(Node* node)