When checking for C++ features, use valid C++. Expect libc++ to provide

the wchar traits.

3 files changed, 23 insertions, 6 deletions

diff --git a/audio/id3lib/distinfo b/audio/id3lib/distinfo
index a20ecaf4584..723200b437c 100644
--- a/audio/id3lib/distinfo
+++ b/audio/id3lib/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.19 2010/08/22 23:20:57 obache Exp $
+$NetBSD: distinfo,v 1.20 2013/04/29 21:13:30 joerg Exp $
 
 SHA1 (id3lib-3.8.3.tar.gz) = c92c880da41d1ec0b242745a901702ae87970838
 RMD160 (id3lib-3.8.3.tar.gz) = bfa2499ec649ed40815ad0a370c78eb1517952c4
 Size (id3lib-3.8.3.tar.gz) = 950726 bytes
-SHA1 (patch-aa) = a9adf3da8f41390582171b43d1a910aafb41c308
+SHA1 (patch-aa) = 23ccb36fc35e1f645a72b9292c1cd8eeb0379a38
 SHA1 (patch-af) = 0266e9220791b7b14a35dc9b7564ab75cbc6562b
 SHA1 (patch-ag) = a047fe90d83c88e0f6d0a6a0595a440ef49276e3
 SHA1 (patch-ah) = 42a04014cc839565063daa395884b757214eb911
 SHA1 (patch-ai) = c0521a6d62d17826c9b1f35f6be51e1b72c48e7c
 SHA1 (patch-aj) = 626952e7bbddbcf5db66a0509f62d588ccaed17a
 SHA1 (patch-ak) = f7d1155a7750b455ac590d5777b332a55542393d
-SHA1 (patch-aq) = a93740aaf50c4f38525e30497d640b856829b27e
+SHA1 (patch-aq) = 711a66086a591515b14358abeb265e28b2a178db
 SHA1 (patch-ar) = bee59462bfb3c5729e24827953a6da9f281cd8a7
 SHA1 (patch-as) = 50ca42926c603361864bf2891d6b4e01e7f59ade
 SHA1 (patch-at) = f5ab25d72d3d6e47c1710bbc17dd0cd0749a0b22
diff --git a/audio/id3lib/patches/patch-aa b/audio/id3lib/patches/patch-aa
index 3070aa79845..b98f98a7ae8 100644
--- a/audio/id3lib/patches/patch-aa
+++ b/audio/id3lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2010/08/22 09:25:28 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2013/04/29 21:13:30 joerg Exp $
 
 * make gcc-4.3 compliant
   http://id3lib.cvs.sourceforge.net/viewvc/id3lib/id3lib-devel/include/id3/id3lib_strings.h?r1=1.7&r2=1.8
@@ -34,7 +34,7 @@ $NetBSD: patch-aa,v 1.6 2010/08/22 09:25:28 wiz Exp $
  
 -#ifndef _GLIBCPP_USE_WCHAR_T
 +/* gcc-3.4 defines _GLIBCXX_USE_WCHAR_T instead of _GLIBCPP_USE_WCHAR_T */
-+#if !defined(_GLIBCPP_USE_WCHAR_T) && !defined(_GLIBCXX_USE_WCHAR_T)
++#if !defined(_GLIBCPP_USE_WCHAR_T) && !defined(_GLIBCXX_USE_WCHAR_T) && !defined(_LIBCPP_VERSION)
  #if (defined(ID3_NEED_WCHAR_TEMPLATE))
     template<>
       struct char_traits<wchar_t>
diff --git a/audio/id3lib/patches/patch-aq b/audio/id3lib/patches/patch-aq
index 04ed51bc60a..8c199277643 100644
--- a/audio/id3lib/patches/patch-aq
+++ b/audio/id3lib/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.2 2010/08/22 09:25:28 wiz Exp $
+$NetBSD: patch-aq,v 1.3 2013/04/29 21:13:30 joerg Exp $
 
 make gcc-4.3 compliant
 http://id3lib.cvs.sourceforge.net/viewvc/id3lib/id3lib-devel/configure?r1=1.78&r2=1.79
@@ -14,3 +14,20 @@ http://id3lib.cvs.sourceforge.net/viewvc/id3lib/id3lib-devel/configure?r1=1.78&r
  
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+@@ -10440,7 +10440,7 @@ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+-main() { bool b1=true; bool b2=false; }
++int main() { bool b1=true; bool b2=false; }
+ _ACEOF
+ rm -f conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -10475,7 +10475,6 @@ echo $ECHO_N "checking whether C++ has c
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+-#include <iostream.h>
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+      extern "C"