Fix build of included id3lib on 64-bit platforms.

Obtained from:	id3lib 3.8.0

3 files changed, 61 insertions, 1 deletions

diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index 089fe874592b..262d10957146 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -13,7 +13,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 LIB_DEPENDS=	musicbrainz.2:${PORTSDIR}/audio/musicbrainz \
 		id3:${PORTSDIR}/audio/id3lib
 
@@ -35,6 +34,7 @@ LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
+BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 CPPFLAGS+=	"-D_M_IX86"
 .elif ${ARCH} == "alpha"
 CPPFLAGS+=	"-D_M_ALPHA"
diff --git a/audio/zinf/files/patch-plm_metadata_id3v2_io__helpers.cpp b/audio/zinf/files/patch-plm_metadata_id3v2_io__helpers.cpp
new file mode 100644
index 000000000000..091dfb3a52f3
--- /dev/null
+++ b/audio/zinf/files/patch-plm_metadata_id3v2_io__helpers.cpp
@@ -0,0 +1,19 @@
+
+$FreeBSD$
+
+--- plm/metadata/id3v2/io_helpers.cpp.orig	Sat Dec 21 18:10:14 2002
++++ plm/metadata/id3v2/io_helpers.cpp	Sat Dec 21 18:11:59 2002
+@@ -290,11 +290,11 @@
+   return writer.writeChars(bytes, size);
+ }
+ 
+-ID3_Writer::size_type io::writeTrailingSpaces(ID3_Writer& writer, String buf, size_t len)
++size_t io::writeTrailingSpaces(ID3_Writer& writer, String buf, size_t len)
+ {
+   ID3_Writer::pos_type beg = writer.getCur();
+   ID3_Writer::size_type strLen = buf.size();
+-  ID3_Writer::size_type size = min(len, strLen);
++  ID3_Writer::size_type size = min((unsigned int)len, (unsigned int)strLen);
+   writer.writeChars(buf.data(), size);
+   for (; size < len; ++size)
+   {
diff --git a/audio/zinf/files/patch-plm_metadata_id3v2_io__strings.h b/audio/zinf/files/patch-plm_metadata_id3v2_io__strings.h
new file mode 100644
index 000000000000..7088ab18db11
--- /dev/null
+++ b/audio/zinf/files/patch-plm_metadata_id3v2_io__strings.h
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- plm/metadata/id3v2/io_strings.h.orig	Thu Jun 20 08:41:07 2002
++++ plm/metadata/id3v2/io_strings.h	Sat Dec 21 17:30:55 2002
+@@ -63,7 +63,7 @@
+       }
+       virtual size_type readChars(char_type buf[], size_type len)
+       {
+-        size_type size = min(len, _string.size() - _cur);
++        size_type size = min((unsigned int)len, (unsigned int)(_string.size() - _cur));
+         _string.copy(reinterpret_cast<String::value_type *>(buf), size, _cur);
+         _cur += size;
+         return size;
+@@ -100,7 +100,7 @@
+ 
+       virtual size_type skipChars(size_type len)
+       {
+-        size_type size = min(len, _string.size() - _cur);
++        size_type size = min((unsigned int)len, (unsigned int)(_string.size() - _cur));
+         _cur += size;
+         return size;
+       }
+@@ -133,7 +133,7 @@
+       }
+       virtual size_type readChars(char_type buf[], size_type len)
+       {
+-        size_type size = min(len, _string.size() - _cur);
++        size_type size = min((unsigned int)len, (unsigned int)(_string.size() - _cur));
+         _string.copy(reinterpret_cast<BString::value_type *>(buf), size, _cur);
+         _cur += size;
+         return size;
+@@ -170,7 +170,7 @@
+ 
+       virtual size_type skipChars(size_type len)
+       {
+-        size_type size = min(len, _string.size() - _cur);
++        size_type size = min((unsigned int)len,(unsigned int)( _string.size() - _cur));
+         _cur += size;
+         return size;
+       }