From cfe20c9cf78985ae79f28b6927d7dba0ba3ed51b Mon Sep 17 00:00:00 2001
From: tnn <tnn@pkgsrc.org>
Date: Sat, 19 Sep 2009 17:14:21 +0000
Subject: do previous differently. id3lib_strings.h is where memmove is used,
 so pull in string.h there instead.

---
 audio/taglib/distinfo               | 4 ++--
 audio/taglib/files/id3lib_strings.h | 3 ++-
 audio/taglib/patches/patch-aa       | 8 ++------
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'audio/taglib')

diff --git a/audio/taglib/distinfo b/audio/taglib/distinfo
index 177cea82e25..414c05e31e0 100644
--- a/audio/taglib/distinfo
+++ b/audio/taglib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2009/09/19 17:00:39 tnn Exp $
+$NetBSD: distinfo,v 1.10 2009/09/19 17:14:21 tnn Exp $
 
 SHA1 (taglib-1.6.tar.gz) = 2cb5309fa658c695b4ee28a72f85b4d892b63045
 RMD160 (taglib-1.6.tar.gz) = 895788b1f6e6d84f749cd545c107afb174edc4a2
 Size (taglib-1.6.tar.gz) = 1098674 bytes
-SHA1 (patch-aa) = 4022eefdebe1ede4727f8f07dec6743bdc265b04
+SHA1 (patch-aa) = f1b1dd6686140cf64e59badc4601488b94c9f290
diff --git a/audio/taglib/files/id3lib_strings.h b/audio/taglib/files/id3lib_strings.h
index b16eb256132..72885eaf34a 100644
--- a/audio/taglib/files/id3lib_strings.h
+++ b/audio/taglib/files/id3lib_strings.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: id3lib_strings.h,v 1.4 2006/09/23 13:26:24 wiz Exp $
+// $Id: id3lib_strings.h,v 1.5 2009/09/19 17:14:21 tnn Exp $
 
 // id3lib: a software library for creating and manipulating id3v1/v2 tags
 // Copyright 1999, 2000  Scott Thomas Haug
@@ -30,6 +30,7 @@
 #define _ID3LIB_STRINGS_H_
 
 #include <string>
+#include <string.h>
 
 #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
 namespace std
diff --git a/audio/taglib/patches/patch-aa b/audio/taglib/patches/patch-aa
index db52c30820b..ae9863208b9 100644
--- a/audio/taglib/patches/patch-aa
+++ b/audio/taglib/patches/patch-aa
@@ -1,12 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2009/09/19 17:00:39 tnn Exp $
+$NetBSD: patch-aa,v 1.3 2009/09/19 17:14:21 tnn Exp $
 
 --- taglib/toolkit/taglib.h.orig	2009-09-03 20:05:58.000000000 +0200
 +++ taglib/toolkit/taglib.h
-@@ -37,9 +37,17 @@
- #endif
- 
- #include <string>
-+#include <string.h>
+@@ -40,6 +40,13 @@
  
  //! A namespace for all TagLib related classes and functions
  
-- 
cgit v1.2.3