Recognize new json-c library name.

2 files changed, 53 insertions, 3 deletions

diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 7a80f6c9acf..58969cda97f 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.38 2013/11/25 10:14:37 wiz Exp $
+$NetBSD: distinfo,v 1.39 2013/11/30 12:34:52 wiz Exp $
 
 SHA1 (pulseaudio-2.1.tar.xz) = 56b4ad9207ea3aec0ad1b8be4b55793b426a4f01
 RMD160 (pulseaudio-2.1.tar.xz) = 87f6051bbbe59c26e505a9765f388d3ee4d3a485
 Size (pulseaudio-2.1.tar.xz) = 1355004 bytes
 SHA1 (patch-aa) = 2fb8b36669e34f3ca0108176171be567a9eeda44
-SHA1 (patch-configure) = 79f938c79a2c3a714d9c81b22030084a421da360
+SHA1 (patch-configure) = 8754fc3493e43baef14c99a6b9a24bbb2800b2ea
 SHA1 (patch-dc) = 1e8d79a37617aae18f55564757b5065fef2b9025
 SHA1 (patch-src_Makefile.in) = 21daf6069ae067dd235de6d43a013e4e70bbca78
 SHA1 (patch-src_pulsecore_semaphore-osx.c) = f9b1962a700932434e05471b2d4df4a5ff5c1b00
diff --git a/audio/pulseaudio/patches/patch-configure b/audio/pulseaudio/patches/patch-configure
index cce71de8de2..9530f676d15 100644
--- a/audio/pulseaudio/patches/patch-configure
+++ b/audio/pulseaudio/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2013/05/06 20:44:18 markd Exp $
+$NetBSD: patch-configure,v 1.4 2013/11/30 12:34:52 wiz Exp $
 
 - always use atomic_ops(3) on NetBSD, even on arm
 - kill test(1) bash'ism
@@ -47,3 +47,53 @@ $NetBSD: patch-configure,v 1.3 2013/05/06 20:44:18 markd Exp $
  
  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
  
+@@ -23063,12 +23063,12 @@ if test -n "$LIBJSON_CFLAGS"; then
+     pkg_cv_LIBJSON_CFLAGS="$LIBJSON_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json >= 0.9 \""; } >&5
+-  ($PKG_CONFIG --exists --print-errors " json >= 0.9 ") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json-c >= 0.9 \""; } >&5
++  ($PKG_CONFIG --exists --print-errors " json-c >= 0.9 ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBJSON_CFLAGS=`$PKG_CONFIG --cflags " json >= 0.9 " 2>/dev/null`
++  pkg_cv_LIBJSON_CFLAGS=`$PKG_CONFIG --cflags " json-c >= 0.9 " 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -23080,12 +23080,12 @@ if test -n "$LIBJSON_LIBS"; then
+     pkg_cv_LIBJSON_LIBS="$LIBJSON_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json >= 0.9 \""; } >&5
+-  ($PKG_CONFIG --exists --print-errors " json >= 0.9 ") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json-c >= 0.9 \""; } >&5
++  ($PKG_CONFIG --exists --print-errors " json-c >= 0.9 ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBJSON_LIBS=`$PKG_CONFIG --libs " json >= 0.9 " 2>/dev/null`
++  pkg_cv_LIBJSON_LIBS=`$PKG_CONFIG --libs " json-c >= 0.9 " 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -23106,14 +23106,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LIBJSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " json >= 0.9 " 2>&1`
++	        LIBJSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " json-c >= 0.9 " 2>&1`
+         else
+-	        LIBJSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " json >= 0.9 " 2>&1`
++	        LIBJSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " json-c >= 0.9 " 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBJSON_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "Package requirements ( json >= 0.9 ) were not met:
++	as_fn_error $? "Package requirements ( json-c >= 0.9 ) were not met:
+ 
+ $LIBJSON_PKG_ERRORS
+