Update of audio/id3lib to 3.8.2

PR:		several
Submitted by:	Roman Shterenzon <roman@xpert.com> and others

12 files changed, 38 insertions, 272 deletions

diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index becde3771bd4..a85f492e3817 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -6,25 +6,30 @@
 #
 
 PORTNAME=	id3lib
-PORTVERSION=	3.7.13
+PORTVERSION=	3.8.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	roman@xpert.com
 
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
-USE_AUTOMAKE=	yes
-USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+BROKEN=		"Doesn't link properly, std::char_traits<wchar_t> thingie"
+.endif
+
 post-extract:
-.for i in zlib popt
-	${RM} -rf ${WRKSRC}/$i
-.endfor
+	@${RM} -rf ${WRKSRC}/zlib
+
+post-install:
+	@${RM} -f ${LOCALBASE}/lib/libid3.la
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/id3lib/distinfo b/audio/id3lib/distinfo
index 223e085b16eb..80e965257f64 100644
--- a/audio/id3lib/distinfo
+++ b/audio/id3lib/distinfo
@@ -1 +1 @@
-MD5 (id3lib-3.7.13.tar.gz) = 19ab352ac8d522ebcabb85f2445bfced
+MD5 (id3lib-3.8.2.tar.gz) = b5da9d2f714203eb6f78f63d1725ff39
diff --git a/audio/id3lib/files/patch-Makefile.am b/audio/id3lib/files/patch-Makefile.am
deleted file mode 100644
index 837430a55f2b..000000000000
--- a/audio/id3lib/files/patch-Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.am.orig	Fri Sep 15 02:13:51 2000
-+++ Makefile.am	Sun Jul 21 15:13:19 2002
-@@ -32,7 +32,7 @@
- popt_subdir = 
- endif
- 
--SUBDIRS =  . m4 $(popt_subdir) $(zlib_subdir) doc include src examples
-+SUBDIRS =  . m4 doc include src examples
- DIST_SUBDIRS = . m4 popt zlib doc include src examples
- 
- INCLUDES = @ID3LIB_DEBUG_FLAGS@
diff --git a/audio/id3lib/files/patch-Makefile.in b/audio/id3lib/files/patch-Makefile.in
new file mode 100644
index 000000000000..5214338a8125
--- /dev/null
+++ b/audio/id3lib/files/patch-Makefile.in
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Fri Dec  6 10:37:42 2002
++++ Makefile.in	Fri Dec  6 10:38:10 2002
+@@ -132,8 +132,8 @@
+ @ID3_NEEDZLIB_TRUE@zlib_subdir = zlib
+ @ID3_NEEDZLIB_FALSE@zlib_subdir = 
+ 
+-SUBDIRS = . m4 $(zlib_subdir) doc include id3com src examples
+-DIST_SUBDIRS = . m4 zlib doc include id3com src examples prj libprj
++SUBDIRS = . m4 doc include id3com src examples
++DIST_SUBDIRS = . m4 doc include id3com src examples prj libprj
+ 
+ INCLUDES = @ID3LIB_DEBUG_FLAGS@
+ 
diff --git a/audio/id3lib/files/patch-configure.in b/audio/id3lib/files/patch-configure.in
deleted file mode 100644
index c9b7b12866f9..000000000000
--- a/audio/id3lib/files/patch-configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- configure.in.orig	Fri Sep 15 02:03:02 2000
-+++ configure.in	Sun Jul 21 15:13:19 2002
-@@ -143,7 +143,7 @@
- )
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
--AC_CHECK_HEADER(iostream.h iomanip.h)
-+AC_CHECK_HEADERS(iostream.h iomanip.h)
- 
- dnl Check for functions.
- AC_FUNC_MEMCMP
diff --git a/audio/id3lib/files/patch-src_tag__file.cpp b/audio/id3lib/files/patch-src_tag__file.cpp
deleted file mode 100644
index 3fed50e74ff1..000000000000
--- a/audio/id3lib/files/patch-src_tag__file.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-
-$FreeBSD$
-
---- src/tag_file.cpp.orig	Mon Sep 11 09:46:32 2000
-+++ src/tag_file.cpp	Sun Jul 21 15:13:19 2002
-@@ -184,7 +184,7 @@
-     }
-   }
-   
--  file.write(sTag, tag_size);
-+  file.write((const char*) sTag, tag_size);
- 
-   return tag_size;
- }
-@@ -221,7 +221,7 @@
-     file.seekp(0, ios::beg);
-     if (buffer)
-     {
--      file.write(buffer, tag_size);
-+      file.write((const char*) buffer, tag_size);
-     }
-   }
-   else
-@@ -282,8 +282,9 @@
-       remove(sTempFile);
-       ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");
-     }
--
--    ofstream tmpOut(fd);
-+    
-+    close(fd);
-+    ofstream tmpOut(sTempFile);
-     if (!tmpOut)
-     {
-       tmpOut.close();
-@@ -292,15 +293,15 @@
-     }
-     if (buffer)
-     {
--      tmpOut.write(buffer, tag_size);
-+      tmpOut.write((const char*) buffer, tag_size);
-     }
-     file.seekg(tag.GetPrependedBytes(), ios::beg);
-     uchar buffer2[BUFSIZ];
-     while (file)
-     {
--      file.read(buffer2, BUFSIZ);
-+      file.read((char*) buffer2, BUFSIZ);
-       size_t nBytes = file.gcount();
--      tmpOut.write(buffer2, nBytes);
-+      tmpOut.write((const char*) buffer2, nBytes);
-     }
-       
-     tmpOut.close();
-@@ -431,7 +432,7 @@
-     while (!file.eof())
-     {
-       size_t nBytesToRead = MIN(nBytesRemaining - nBytesCopied, BUFSIZ);
--      file.read(aucBuffer, nBytesToRead);
-+      file.read((char*) aucBuffer, nBytesToRead);
-       size_t nBytesRead = file.gcount();
- 
-       if (nBytesRead != nBytesToRead)
-@@ -444,7 +445,7 @@
-       {
-         long offset = nBytesRead + this->GetPrependedBytes();
-         file.seekp(-offset, ios::cur);
--        file.write(aucBuffer, nBytesRead);
-+        file.write((const char*) aucBuffer, nBytesRead);
-         file.seekg(this->GetPrependedBytes(), ios::cur);
-         nBytesCopied += nBytesRead;
-       }
diff --git a/audio/id3lib/files/patch-src_tag__parse.cpp b/audio/id3lib/files/patch-src_tag__parse.cpp
deleted file mode 100644
index b685a7353795..000000000000
--- a/audio/id3lib/files/patch-src_tag__parse.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/tag_parse.cpp.orig	Fri Sep 15 01:54:08 2000
-+++ src/tag_parse.cpp	Sun Jul 21 15:13:19 2002
-@@ -178,7 +178,7 @@
-     return 0;
-   }
-   uchar header[ID3_TAGHEADERSIZE];
--  file.read(header, ID3_TAGHEADERSIZE);
-+  file.read((char*) header, ID3_TAGHEADERSIZE);
-   if (file.gcount() != ID3_TAGHEADERSIZE)
-   {
-     return 0;
-@@ -188,7 +188,7 @@
-   if (tagSize > 0)
-   {
-     uchar* bin = new uchar[tagSize];
--    file.read(bin, tagSize - ID3_TagHeader::SIZE);
-+    file.read((char*) bin, tagSize - ID3_TagHeader::SIZE);
-     if (tagSize != (size_t)file.gcount())
-     {
-       // log this...
diff --git a/audio/id3lib/files/patch-src_tag__parse__lyrics3.cpp b/audio/id3lib/files/patch-src_tag__parse__lyrics3.cpp
deleted file mode 100644
index 17ee04f6349d..000000000000
--- a/audio/id3lib/files/patch-src_tag__parse__lyrics3.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/tag_parse_lyrics3.cpp.orig	Mon Sep 11 08:34:06 2000
-+++ src/tag_parse_lyrics3.cpp	Sun Jul 21 15:13:19 2002
-@@ -200,7 +200,7 @@
-       // reserve enough space for lyrics3 + id3v1 tag
-       const size_t max_lyr_size = 11 + 5100 + 9 + 128;
- 
--      size_t lyr_buffer_size = MIN(max_lyr_size, file.tellg());
-+      size_t lyr_buffer_size = MIN(max_lyr_size, (size_t) file.tellg());
- 
-       file.seekg(- static_cast<long>(lyr_buffer_size), ios::cur);
-       if (!file)
-@@ -274,7 +274,7 @@
-       
-       // Using binary minus rather than unary minus to avoid compiler warning
-       
--      file.seekg(- MIN(file.tellg(), 
-+      file.seekg(- MIN((size_t) file.tellg(), 
-                        (static_cast<long>(lyr_size) + 6 + 9 + 3)), ios::cur);
-       if (!file)
-       {
diff --git a/audio/id3lib/files/patch-src_tag__parse__musicmatch.cpp b/audio/id3lib/files/patch-src_tag__parse__musicmatch.cpp
deleted file mode 100644
index efc5c2629094..000000000000
--- a/audio/id3lib/files/patch-src_tag__parse__musicmatch.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-
-$FreeBSD$
-
---- src/tag_parse_musicmatch.cpp.orig	Mon Sep 11 09:46:32 2000
-+++ src/tag_parse_musicmatch.cpp	Sun Jul 21 15:13:19 2002
-@@ -221,7 +221,7 @@
-     return 0;
-   }
- 
--  file.seekg(tag_end - tag_size);
-+  file.seekg((size_t) tag_end - tag_size);
-   tag_beg = file.tellg();
- 
-   // Now calculate the actual offsets
-@@ -229,17 +229,17 @@
-   offsets[0] = tag_beg;
-   for (size_t i = 0; i < 4; ++i)
-   {
--    offsets[i+1] = offsets[i] + section_sizes[i];
-+    offsets[i+1] = offsets[i] + (streampos) section_sizes[i];
-   }
- 
-   // now check for a tag header and adjust the tag_beg pointer appropriately
-   if (tag_beg >= 256)
-   {
--    file.seekg(tag_beg - 256);
-+    file.seekg((size_t) tag_beg - 256);
-     file.read(sig, 8);
-     if (memcmp(sig, "18273645", 8) == 0)
-     {
--      file.seekg(tag_beg - 256);
-+      file.seekg((size_t) tag_beg - 256);
-       tag_beg = file.tellg();
-       file.ignore(256);
-     }
-@@ -267,7 +267,7 @@
-   {
-     // no image binary.  don't do anything.
-   }
--  else if (offsets[0] + 4 + nImgSize > static_cast<size_t>(offsets[2]))
-+  else if ((size_t) offsets[0] + 4 + nImgSize > static_cast<size_t>(offsets[2]))
-   {
-     // Ack!  The image size given extends beyond the next offset!  This is 
-     // not good...  log?
-@@ -275,7 +275,7 @@
-   else
-   {
-     uchar* img_data = new uchar[nImgSize];
--    file.read(img_data, nImgSize);
-+    file.read((char*) img_data, nImgSize);
-     ID3_Frame* frame = new ID3_Frame(ID3FID_PICTURE);
-     if (frame)
-     {
diff --git a/audio/id3lib/files/patch-src_tag__parse__v1.cpp b/audio/id3lib/files/patch-src_tag__parse__v1.cpp
deleted file mode 100644
index 0fa75dbffe55..000000000000
--- a/audio/id3lib/files/patch-src_tag__parse__v1.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/tag_parse_v1.cpp.orig	Mon Sep 11 08:34:06 2000
-+++ src/tag_parse_v1.cpp	Sun Jul 21 15:13:19 2002
-@@ -67,7 +67,7 @@
-   {
-     const size_t data_size = ID3_V1_LEN - ID3_V1_LEN_ID;
-     uchar tag_bytes[data_size];
--    file.read(tag_bytes, data_size);
-+    file.read((char*) tag_bytes, data_size);
-     if (file.gcount() != data_size)
-     {
-       return num_bytes;
diff --git a/audio/id3lib/files/patch-src_utils.cpp b/audio/id3lib/files/patch-src_utils.cpp
deleted file mode 100644
index 582967c26659..000000000000
--- a/audio/id3lib/files/patch-src_utils.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-
-$FreeBSD$
-
---- src/utils.cpp.orig	Mon Sep 11 09:46:32 2000
-+++ src/utils.cpp	Sun Jul 21 15:13:19 2002
-@@ -231,7 +231,7 @@
- 
-   bool exists(const char *name)
-   {
--    ifstream file(name, ios::nocreate);
-+    ifstream file(name/*, ios::nocreate*/);
-     return file.is_open() != 0;
-   }
-   
-@@ -256,7 +256,7 @@
-     size_t size = 0;
-     if (file.is_open())
-     {
--      streamoff curpos = file.tellp();
-+      streampos curpos = file.tellp();
-       file.seekp(0, ios::end);
-       size = file.tellp();
-       file.seekp(curpos);
-@@ -275,7 +275,7 @@
-     {
-       file.close();
-     }
--    file.open(name, ios::in | ios::out | ios::binary | ios::nocreate);
-+    file.open(name, ios::in | ios::out | ios::binary /*| ios::nocreate*/);
-     if (!file)
-     {
-       return ID3E_ReadOnly;
-@@ -290,7 +290,7 @@
-     {
-       file.close();
-     }
--    file.open(name, ios::in | ios::binary | ios::nocreate);
-+    file.open(name, ios::in | ios::binary /*| ios::nocreate*/);
-     if (!file)
-     {
-       return ID3E_NoFile;
diff --git a/audio/id3lib/pkg-plist b/audio/id3lib/pkg-plist
index 1cc62be02676..ad07c9a0c499 100644
--- a/audio/id3lib/pkg-plist
+++ b/audio/id3lib/pkg-plist
@@ -3,19 +3,21 @@ bin/id3cp
 bin/id3info
 bin/id3tag
 include/id3.h
-include/id3/error.h
 include/id3/field.h
-include/id3/flags.h
-include/id3/frame.h
 include/id3/globals.h
-include/id3/header.h
-include/id3/header_frame.h
-include/id3/header_tag.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
 include/id3/sized_types.h
-include/id3/spec.h
 include/id3/tag.h
-lib/libid3-3.7.so.13
+include/id3/utils.h
+include/id3/writer.h
+include/id3/writers.h
+lib/libid3-3.8.so
+lib/libid3-3.8.so.2
 lib/libid3.a
 lib/libid3.so
 @dirrm include/id3