Update to 3.8.0.

Lots of build fixes and other bug fixes.

15 files changed, 10 insertions, 240 deletions

diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index ef857775b20..d0ec320ee6f 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/08/25 19:21:47 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/31 01:56:56 wiz Exp $
 #
 
-DISTNAME=	id3lib-3.8.0pre2
-PKGNAME=	id3lib-3.8.0.0.2
+DISTNAME=	id3lib-3.8.0
+PKGNAME=	id3lib-3.8.0.0.3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=id3lib/}
 
@@ -14,8 +14,4 @@ GNU_CONFIGURE=	YES
 USE_LIBTOOL=	yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-post-extract:
-	${MV} ${WRKSRC}/include/id3/strings.h \
-		${WRKSRC}/include/id3/id3strings.h
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/id3lib/PLIST b/audio/id3lib/PLIST
index 877be4dda28..770086c3769 100644
--- a/audio/id3lib/PLIST
+++ b/audio/id3lib/PLIST
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:53 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/31 01:56:56 wiz Exp $
 bin/id3convert
 bin/id3cp
 bin/id3info
 bin/id3tag
 include/id3.h
 include/id3/field.h
-include/id3/frame.h
 include/id3/globals.h
+include/id3/id3lib_frame.h
+include/id3/id3lib_streams.h
+include/id3/id3lib_strings.h
 include/id3/misc_support.h
 include/id3/reader.h
 include/id3/readers.h
diff --git a/audio/id3lib/distinfo b/audio/id3lib/distinfo
index ff397e7f880..9437daa1649 100644
--- a/audio/id3lib/distinfo
+++ b/audio/id3lib/distinfo
@@ -1,18 +1,6 @@
-$NetBSD: distinfo,v 1.6 2002/01/08 17:49:12 drochner Exp $
+$NetBSD: distinfo,v 1.7 2002/08/31 01:56:56 wiz Exp $
 
-SHA1 (id3lib-3.8.0pre2.tar.gz) = 080565bb65aaa328dc2fbb3465ff4a49b6f52fe4
-Size (id3lib-3.8.0pre2.tar.gz) = 680219 bytes
-SHA1 (patch-ab) = 98e39e985478adeca539dc094e6d2fdb205fbb3a
-SHA1 (patch-ac) = 85533553c659d3071c1afb58b5ee82f5af45b615
-SHA1 (patch-ae) = 6d091f6f28af46143726947f0e153b804cff8c60
+SHA1 (id3lib-3.8.0.tar.gz) = 704cc9af55c11adba4d004b91576147a96ff4a04
+Size (id3lib-3.8.0.tar.gz) = 934333 bytes
 SHA1 (patch-af) = 0266e9220791b7b14a35dc9b7564ab75cbc6562b
 SHA1 (patch-ag) = a047fe90d83c88e0f6d0a6a0595a440ef49276e3
-SHA1 (patch-ah) = c213341c16226f3a8546ed1cae554a2f9c229265
-SHA1 (patch-ai) = 00246c1a2115e6d8497c20d2cfa941f189c3ca2f
-SHA1 (patch-aj) = cc98060718fd9d960ca56af39d9d4c58334660ca
-SHA1 (patch-ak) = 6c2fa8e4bb8d76d3a3db273407d100e5a19a896a
-SHA1 (patch-al) = 7b4b89e740611d04ee8230595813c7658f0cb332
-SHA1 (patch-am) = 3be2da1d2663cfc33df0a7b3a063f4c21e858fdb
-SHA1 (patch-an) = 7df3bfa44798ae79ff825512b9073c928e1ece84
-SHA1 (patch-ao) = f8fff6ba72b43278a4379a9138034b526cc47ab8
-SHA1 (patch-ap) = 452f39fd529498b0dc20415df8237d80eca5f74b
diff --git a/audio/id3lib/patches/patch-ab b/audio/id3lib/patches/patch-ab
deleted file mode 100644
index 1a97738bcd2..00000000000
--- a/audio/id3lib/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/07/31 14:28:00 drochner Exp $
-
---- src/frame_impl.h.orig	Mon Jul 30 16:21:20 2001
-+++ src/frame_impl.h	Mon Jul 30 16:30:26 2001
-@@ -29,13 +29,12 @@
- #define _ID3LIB_FRAME_IMPL_H_
- 
- #include <vector>
--#include <bitset>
- #include "frame.h"
- #include "header_frame.h"
- 
- class ID3_FrameImpl
- {
--  typedef std::bitset<ID3FN_LASTFIELDID> Bitset;
-+  typedef std::bit_vector Bitset;
-   typedef std::vector<ID3_Field *> Fields;
- public:
-   typedef Fields::iterator iterator;
-@@ -68,7 +67,7 @@
-   void        Render(ID3_Writer&) const;
-   size_t      Size();
-   bool        Contains(ID3_FieldID fld) const
--  { return _bitset.test(fld); }
-+  { return _bitset[fld]; }
-   bool        SetSpec(ID3_V2Spec);
-   ID3_V2Spec  GetSpec() const;
- 
diff --git a/audio/id3lib/patches/patch-ac b/audio/id3lib/patches/patch-ac
deleted file mode 100644
index a60698adcc8..00000000000
--- a/audio/id3lib/patches/patch-ac
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/07/31 14:28:00 drochner Exp $
-
---- src/frame_impl.cpp.orig	Mon Jul 30 16:21:31 2001
-+++ src/frame_impl.cpp	Mon Jul 30 16:31:41 2001
-@@ -37,7 +37,7 @@
- 
- ID3_FrameImpl::ID3_FrameImpl(ID3_FrameID id)
-   : _changed(false),
--    _bitset(),
-+    _bitset(ID3FN_LASTFIELDID, false),
-     _fields(),
-     _encryption_id('\0'),
-     _grouping_id('\0')
-@@ -48,7 +48,7 @@
- 
- ID3_FrameImpl::ID3_FrameImpl(const ID3_FrameHeader &hdr)
-   : _changed(false),
--    _bitset(),
-+    _bitset(ID3FN_LASTFIELDID, false),
-     _fields(),
-     _hdr(hdr),
-     _encryption_id('\0'),
-@@ -59,7 +59,7 @@
- 
- ID3_FrameImpl::ID3_FrameImpl(const ID3_Frame& frame)
-   : _changed(false),
--    _bitset(),
-+    _bitset(ID3FN_LASTFIELDID, false),
-     _fields(),
-     _encryption_id('\0'),
-     _grouping_id('\0')
-@@ -80,7 +80,7 @@
-   }
- 
-   _fields.clear();
--  _bitset.reset();
-+  _bitset.clear();
- 
-   _changed = true;
-   return true;
-@@ -102,7 +102,7 @@
-     // log this
-     ID3_Field* fld = new ID3_FieldImpl(ID3_FieldDef::DEFAULT[0]);
-     _fields.push_back(fld);
--    _bitset.set(fld->GetID());
-+    _bitset[fld->GetID()] = true;
-   }
-   else
-   {
-@@ -111,7 +111,7 @@
-     {
-       ID3_Field* fld = new ID3_FieldImpl(info->aeFieldDefs[i]);
-       _fields.push_back(fld);
--      _bitset.set(fld->GetID());
-+      _bitset[fld->GetID()] = true;
-     }
-     
-     _changed = true;
diff --git a/audio/id3lib/patches/patch-ae b/audio/id3lib/patches/patch-ae
deleted file mode 100644
index d5fc59bb3a1..00000000000
--- a/audio/id3lib/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/01/08 17:49:12 drochner Exp $
-
---- include/id3/id3strings.h.orig	Mon Oct 23 06:32:33 2000
-+++ include/id3/id3strings.h	Tue Jan  8 16:27:07 2002
-@@ -34,7 +34,7 @@
- {
-   typedef std::basic_string<char>           String;
-   typedef std::basic_string<unsigned char> BString;
--  typedef std::basic_string<wchar_t>       WString;
-+  typedef std::basic_string<unsigned char>       WString;
- };
- 
- #endif /* _ID3LIB_STRINGS_H_ */
diff --git a/audio/id3lib/patches/patch-ah b/audio/id3lib/patches/patch-ah
deleted file mode 100644
index f406ad52beb..00000000000
--- a/audio/id3lib/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/01/08 17:49:13 drochner Exp $
-
---- include/id3/utils.h.orig	Tue Jan  8 16:43:45 2002
-+++ include/id3/utils.h	Tue Jan  8 16:44:06 2002
-@@ -34,7 +34,7 @@
- 
- #include <fstream.h>
- #include "globals.h"
--#include "strings.h"
-+#include "id3strings.h"
- 
- namespace dami
- {
diff --git a/audio/id3lib/patches/patch-ai b/audio/id3lib/patches/patch-ai
deleted file mode 100644
index 13545b51456..00000000000
--- a/audio/id3lib/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2002/01/08 17:49:13 drochner Exp $
-
---- include/id3/helpers.h.orig	Tue Jan  8 16:46:04 2002
-+++ include/id3/helpers.h	Tue Jan  8 16:46:16 2002
-@@ -28,7 +28,7 @@
- #ifndef _ID3LIB_HELPERS_H_
- #define _ID3LIB_HELPERS_H_
- 
--#include "strings.h"
-+#include "id3strings.h"
- #include "globals.h"
- 
- class ID3_TagImpl;
diff --git a/audio/id3lib/patches/patch-aj b/audio/id3lib/patches/patch-aj
deleted file mode 100644
index 8db9737736b..00000000000
--- a/audio/id3lib/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/01/08 17:49:13 drochner Exp $
-
---- include/id3/io_helpers.h.orig	Tue Jan  8 16:47:21 2002
-+++ include/id3/io_helpers.h	Tue Jan  8 16:47:33 2002
-@@ -28,7 +28,7 @@
- #ifndef _ID3LIB_IO_HELPERS_H_
- #define _ID3LIB_IO_HELPERS_H_
- 
--#include "strings.h"
-+#include "id3strings.h"
- #include "reader.h"
- #include "writer.h"
- 
diff --git a/audio/id3lib/patches/patch-ak b/audio/id3lib/patches/patch-ak
deleted file mode 100644
index 3892b3619d0..00000000000
--- a/audio/id3lib/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2002/01/08 17:49:13 drochner Exp $
-
---- src/tag.cpp.orig	Tue Jan  8 16:51:19 2002
-+++ src/tag.cpp	Tue Jan  8 16:51:33 2002
-@@ -32,7 +32,7 @@
- #include "readers.h"
- #include "writers.h"
- #include "tag_impl.h"
--#include "strings.h"
-+#include "id3strings.h"
- #include "utils.h"
- 
- using namespace dami;
diff --git a/audio/id3lib/patches/patch-al b/audio/id3lib/patches/patch-al
deleted file mode 100644
index 181c2b469a8..00000000000
--- a/audio/id3lib/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2002/01/08 17:49:13 drochner Exp $
-
---- src/tag_impl.h.orig	Tue Jan  8 16:52:15 2002
-+++ src/tag_impl.h	Tue Jan  8 16:52:28 2002
-@@ -35,7 +35,7 @@
- #include "frame.h"
- #include "field.h"
- #include "spec.h"
--#include "strings.h"
-+#include "id3strings.h"
- 
- class ID3_Reader;
- class ID3_Writer;
diff --git a/audio/id3lib/patches/patch-am b/audio/id3lib/patches/patch-am
deleted file mode 100644
index 2246dc990de..00000000000
--- a/audio/id3lib/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2002/01/08 17:49:13 drochner Exp $
-
---- include/id3/io_decorators.h.orig	Tue Jan  8 17:01:03 2002
-+++ include/id3/io_decorators.h	Tue Jan  8 17:01:14 2002
-@@ -28,7 +28,7 @@
- #ifndef _ID3LIB_READER_DECORATORS_H_
- #define _ID3LIB_READER_DECORATORS_H_
- 
--#include "strings.h"
-+#include "id3strings.h"
- #include "readers.h"
- #include "io_helpers.h"
- #include "utils.h"
diff --git a/audio/id3lib/patches/patch-an b/audio/id3lib/patches/patch-an
deleted file mode 100644
index c82e5244a9e..00000000000
--- a/audio/id3lib/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2002/01/08 17:49:13 drochner Exp $
-
---- include/id3/io_strings.h.orig	Tue Jan  8 17:12:24 2002
-+++ include/id3/io_strings.h	Tue Jan  8 17:12:38 2002
-@@ -28,7 +28,7 @@
- #ifndef _ID3LIB_IO_STRINGS_H_
- #define _ID3LIB_IO_STRINGS_H_
- 
--#include "strings.h"
-+#include "id3strings.h"
- #include "reader.h"
- #include "writer.h"
- 
diff --git a/audio/id3lib/patches/patch-ao b/audio/id3lib/patches/patch-ao
deleted file mode 100644
index c4e38e15404..00000000000
--- a/audio/id3lib/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2002/01/08 17:49:13 drochner Exp $
-
---- include/id3/Makefile.in.orig	Tue Jan  8 16:37:19 2002
-+++ include/id3/Makefile.in	Tue Jan  8 16:37:34 2002
-@@ -108,7 +108,7 @@
- id3includedir = $(includedir)/id3
- id3include_HEADERS = $(the_headers)
- 
--noinst_HEADERS =    helpers.h                       io_decorators.h                 io_helpers.h                    io_strings.h                    strings.h                     
-+noinst_HEADERS =    helpers.h                       io_decorators.h                 io_helpers.h                    io_strings.h                    id3strings.h                     
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
diff --git a/audio/id3lib/patches/patch-ap b/audio/id3lib/patches/patch-ap
deleted file mode 100644
index 9ac6b9de3ea..00000000000
--- a/audio/id3lib/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2002/01/08 17:49:13 drochner Exp $
-
---- src/field_impl.h.orig	Tue Jan  8 16:40:06 2002
-+++ src/field_impl.h	Tue Jan  8 16:40:21 2002
-@@ -30,7 +30,7 @@
- 
- #include <stdlib.h>
- #include "field.h"
--#include "strings.h"
-+#include "id3strings.h"
- 
- struct ID3_FieldDef;
- struct ID3_FrameDef;