Update to 2.1.0:

2.1.0
     * @nonodename, @patperry - fixed some compiler warnings
     * @yep, @emaste - documentation improvements
     * @sgravrock - build fix for NetBSD (and whenever sh != bash)
     * @rotty, @brimstone3, @lloyd - allow client to reset generator
     * @sgravrock - remove bash dependencies
     * @lloyd - add api tests
     * @rflynn - remove ruby dependency
     * @cloderic - nmake install works on windows
     * @shahbag - build fix for qnx
     * @breese - debugging improvements
     * @lloyd - json_verify supports -s flag for stream processing
     * @lloyd - json_reformat supports -s flag for stream processing

4 files changed, 25 insertions, 17 deletions

diff --git a/devel/yajl/Makefile b/devel/yajl/Makefile
index 0ca626a3989..52c686b8284 100644
--- a/devel/yajl/Makefile
+++ b/devel/yajl/Makefile
@@ -1,25 +1,19 @@
-# $NetBSD: Makefile,v 1.5 2014/01/05 03:23:21 rodent Exp $
+# $NetBSD: Makefile,v 1.6 2014/04/18 12:16:57 wiz Exp $
 
-DISTNAME=	2.0.1
-PKGNAME=	yajl-${DISTNAME}
-PKGREVISION=	1
+DISTNAME=	yajl-2.1.0
 CATEGORIES=	devel textproc
-MASTER_SITES=	http://nodeload.github.com/lloyd/yajl/tarball/
-DIST_SUBDIR=	yajl
-EXTRACT_SUFX=
+MASTER_SITES=	# http://nodeload.github.com/lloyd/yajl/tarball/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://lloyd.github.com/yajl/
 COMMENT=	Small JSON library written in ANSI C
 LICENSE=	modified-bsd
 
-WRKSRC=		${WRKDIR}/lloyd-yajl-f4b2b1a
+WRKSRC=		${WRKDIR}/lloyd-yajl-66cb08c
 
 USE_LANGUAGES=	c
 USE_LIBTOOL=	yes
-USE_TOOLS+=	tar gzcat
 USE_CMAKE=	yes
-
-EXTRACT_OPTS=	-c gzip -f tar
+PKGCONFIG_OVERRIDE=	src/yajl.pc.cmake
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/yajl/PLIST b/devel/yajl/PLIST
index 2bb07ea8965..990016e4065 100644
--- a/devel/yajl/PLIST
+++ b/devel/yajl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/03/18 23:22:03 abs Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/04/18 12:16:57 wiz Exp $
 bin/json_reformat
 bin/json_verify
 include/yajl/yajl_common.h
@@ -8,5 +8,6 @@ include/yajl/yajl_tree.h
 include/yajl/yajl_version.h
 lib/libyajl.so
 lib/libyajl.so.2
-lib/libyajl.so.2.0.1
+lib/libyajl.so.${PKGVERSION}
 lib/libyajl_s.a
+lib/pkgconfig/yajl.pc
diff --git a/devel/yajl/distinfo b/devel/yajl/distinfo
index e593d21db64..b6f73f48ce2 100644
--- a/devel/yajl/distinfo
+++ b/devel/yajl/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/03/18 16:56:32 abs Exp $
+$NetBSD: distinfo,v 1.2 2014/04/18 12:16:57 wiz Exp $
 
-SHA1 (yajl/2.0.1) = 2734dcfe754e18927e5ad6d04324706f1ff71bec
-RMD160 (yajl/2.0.1) = 305f928bc2ff01e20b9c362f3032de7f948fdcc1
-Size (yajl/2.0.1) = 82102 bytes
+SHA1 (yajl-2.1.0.tar.gz) = fe6b3c7439b26175aee59cabf8c4923b9eb3650d
+RMD160 (yajl-2.1.0.tar.gz) = df525cb99a1e6f1786c8f8f047127cad1b4eb80a
+Size (yajl-2.1.0.tar.gz) = 84039 bytes
+SHA1 (patch-src_CMakeLists.txt) = 6999cdcb8450ec3abd1c81b8a8ab3cab8c9d008e
diff --git a/devel/yajl/patches/patch-src_CMakeLists.txt b/devel/yajl/patches/patch-src_CMakeLists.txt
new file mode 100644
index 00000000000..1cb8aeae9fe
--- /dev/null
+++ b/devel/yajl/patches/patch-src_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2014/04/18 12:16:57 wiz Exp $
+
+Install into default pkgconfig directory.
+
+--- src/CMakeLists.txt.orig	2014-03-19 04:58:29.000000000 +0000
++++ src/CMakeLists.txt
+@@ -84,4 +84,4 @@ INSTALL(TARGETS yajl
+ INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl)
+ INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl)
+-INSTALL(FILES ${shareDir}/yajl.pc DESTINATION share/pkgconfig)
++INSTALL(FILES ${shareDir}/yajl.pc DESTINATION lib/pkgconfig)