solve the strings.h problem in a better way -

The library contains a header file "strings.h" which gets pulled in
by <string.h>, leading to lossage. Defining ANSI_SOURCE used to help,
but now we don't get an mkstemp() prototype anymore if this is defined,
leading to compile problems at another place...
So finally rename the pkg's strings.h.
Being here, update to ...pre2, the changelog is
* Many bug fixes -- mostly compilation problems -- more detailed info will be
  provided in a later release.

15 files changed, 150 insertions, 34 deletions

diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index f039a151498..cef37cd4d8b 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/08/03 17:05:16 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/01/08 17:49:12 drochner Exp $
 #
 
-DISTNAME=	id3lib-3.8.0pre1
-PKGNAME=	id3lib-3.8.0.0.1
+DISTNAME=	id3lib-3.8.0pre2
+PKGNAME=	id3lib-3.8.0.0.2
 CATEGORIES=	audio
 MASTER_SITES=	http://prdownloads.sourceforge.net/id3lib/
 
@@ -14,4 +14,8 @@ 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/distinfo b/audio/id3lib/distinfo
index 367d8d26638..ff397e7f880 100644
--- a/audio/id3lib/distinfo
+++ b/audio/id3lib/distinfo
@@ -1,10 +1,18 @@
-$NetBSD: distinfo,v 1.5 2001/11/17 06:26:44 itohy Exp $
+$NetBSD: distinfo,v 1.6 2002/01/08 17:49:12 drochner Exp $
 
-SHA1 (id3lib-3.8.0pre1.tar.gz) = ea4ae07187eaabb3c30de24676a3d8c6a4d3d55f
-Size (id3lib-3.8.0pre1.tar.gz) = 679835 bytes
-SHA1 (patch-aa) = 520d9d30e01993c66f324f5306b7ccb9e3e2909b
+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) = 42d93571c413f795af4333ae41cf652c3d3aebdc
-SHA1 (patch-af) = ed166f4d7934531c82fcd8fd13eedaa7b22ab1dd
-SHA1 (patch-ag) = a9bf091af8e3d3c1ff647b85413f4fca35021491
+SHA1 (patch-ae) = 6d091f6f28af46143726947f0e153b804cff8c60
+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-aa b/audio/id3lib/patches/patch-aa
deleted file mode 100644
index 04940912c27..00000000000
--- a/audio/id3lib/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/07/31 14:28:00 drochner Exp $
-
---- src/Makefile.in.orig	Mon Jul 30 16:27:57 2001
-+++ src/Makefile.in	Mon Jul 30 16:28:44 2001
-@@ -129,7 +129,7 @@
- LTLIBRARIES =  $(lib_LTLIBRARIES)
- 
- 
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -D_ANSI_SOURCE
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
diff --git a/audio/id3lib/patches/patch-ae b/audio/id3lib/patches/patch-ae
index 8e469ff0685..d5fc59bb3a1 100644
--- a/audio/id3lib/patches/patch-ae
+++ b/audio/id3lib/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/07/31 14:28:00 drochner Exp $
+$NetBSD: patch-ae,v 1.2 2002/01/08 17:49:12 drochner Exp $
 
---- include/id3/strings.h.orig	Mon Jul 30 16:51:38 2001
-+++ include/id3/strings.h	Mon Jul 30 16:52:01 2001
+--- 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;
diff --git a/audio/id3lib/patches/patch-af b/audio/id3lib/patches/patch-af
index 6a3417db754..fe9b6cdfeba 100644
--- a/audio/id3lib/patches/patch-af
+++ b/audio/id3lib/patches/patch-af
@@ -1,9 +1,9 @@
-$NetBSD: patch-af,v 1.1 2001/11/17 06:26:45 itohy Exp $
+$NetBSD: patch-af,v 1.2 2002/01/08 17:49:13 drochner Exp $
 
---- include/id3/reader.h.orig	Mon Oct 23 17:20:54 2000
-+++ include/id3/reader.h	Thu Nov 15 23:10:04 2001
+--- include/id3/reader.h.orig	Mon Jul 30 20:22:53 2001
++++ include/id3/reader.h	Tue Jan  8 18:27:06 2002
 @@ -33,7 +33,7 @@
- class ID3_Reader
+ class ID3_CPP_EXPORT ID3_Reader
  {
   public:
 -  typedef uint32 size_type;
diff --git a/audio/id3lib/patches/patch-ag b/audio/id3lib/patches/patch-ag
index fb28d8dd5b7..541f12bb611 100644
--- a/audio/id3lib/patches/patch-ag
+++ b/audio/id3lib/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.1 2001/11/17 06:26:45 itohy Exp $
+$NetBSD: patch-ag,v 1.2 2002/01/08 17:49:13 drochner Exp $
 
---- include/id3/writer.h.orig	Mon Oct 23 17:20:54 2000
-+++ include/id3/writer.h	Thu Nov 15 23:10:05 2001
+--- include/id3/writer.h.orig	Mon Jul 30 20:22:53 2001
++++ include/id3/writer.h	Tue Jan  8 18:28:35 2002
 @@ -33,7 +33,7 @@
- class ID3_Writer
+ class ID3_CPP_EXPORT ID3_Writer
  {
   public:
 -  typedef uint32 size_type;
diff --git a/audio/id3lib/patches/patch-ah b/audio/id3lib/patches/patch-ah
new file mode 100644
index 00000000000..f406ad52beb
--- /dev/null
+++ b/audio/id3lib/patches/patch-ah
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..13545b51456
--- /dev/null
+++ b/audio/id3lib/patches/patch-ai
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..8db9737736b
--- /dev/null
+++ b/audio/id3lib/patches/patch-aj
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..3892b3619d0
--- /dev/null
+++ b/audio/id3lib/patches/patch-ak
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..181c2b469a8
--- /dev/null
+++ b/audio/id3lib/patches/patch-al
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..2246dc990de
--- /dev/null
+++ b/audio/id3lib/patches/patch-am
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..c82e5244a9e
--- /dev/null
+++ b/audio/id3lib/patches/patch-an
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..c4e38e15404
--- /dev/null
+++ b/audio/id3lib/patches/patch-ao
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..9ac6b9de3ea
--- /dev/null
+++ b/audio/id3lib/patches/patch-ap
@@ -0,0 +1,13 @@
+$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;