Update to 0.5.0. Changes:

- Read ISRCs and MCNs on Linux, Mac OS X and Windows.
- Add read_sparse() for faster reading again
- Added Solaris, OpenBSD and kFreeBSD support.

4 files changed, 18 insertions, 36 deletions

diff --git a/audio/libdiscid/Makefile b/audio/libdiscid/Makefile
index fd575931d6d..651b661e4b8 100644
--- a/audio/libdiscid/Makefile
+++ b/audio/libdiscid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2012/09/12 00:24:42 asau Exp $
+# $NetBSD: Makefile,v 1.9 2013/06/16 09:58:48 shattered Exp $
 
-DISTNAME=	libdiscid-0.2.2
+DISTNAME=	libdiscid-0.5.0
 CATEGORIES=	audio
-MASTER_SITES=	http://users.musicbrainz.org/~matt/
+MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://musicbrainz.org/doc/libdiscid
@@ -10,7 +10,7 @@ COMMENT=	Library for creating MusicBrainz DiscIDs
 LICENSE=	gnu-lgpl-v2.1
 
 ONLY_FOR_PLATFORM=	Darwin-*-* DragonFly-*-* FreeBSD-*-* Linux-*-*
-ONLY_FOR_PLATFORM+=	NetBSD-*-*
+ONLY_FOR_PLATFORM+=	NetBSD-*-* OpenBSD-*-* SunOS-*-*
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
diff --git a/audio/libdiscid/distinfo b/audio/libdiscid/distinfo
index dfd3a772147..811f7f2d2d9 100644
--- a/audio/libdiscid/distinfo
+++ b/audio/libdiscid/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2011/03/27 07:28:24 obache Exp $
+$NetBSD: distinfo,v 1.4 2013/06/16 09:58:48 shattered Exp $
 
-SHA1 (libdiscid-0.2.2.tar.gz) = 103ead94eeb8bea04ad92ab15ed6832be9b3fad9
-RMD160 (libdiscid-0.2.2.tar.gz) = 200703a02cb47d19f478b9a9c83e01a22737f491
-Size (libdiscid-0.2.2.tar.gz) = 347907 bytes
-SHA1 (patch-aa) = 6dec55986fed1441c74f5be6bb9f97ef50c7cb2f
-SHA1 (patch-ab) = 364cc81b7db9f84a82fe7dd7330f8648fa23cf21
+SHA1 (libdiscid-0.5.0.tar.gz) = e046be72fca56bc1e5dce3568055331b58ee4dfc
+RMD160 (libdiscid-0.5.0.tar.gz) = 306e23457e191c07d906bbb5eb85fec127f1c3a7
+Size (libdiscid-0.5.0.tar.gz) = 366828 bytes
+SHA1 (patch-ab) = 6b626d5f7e2ca0b0bb231418429bdbea7b093dc4
diff --git a/audio/libdiscid/patches/patch-aa b/audio/libdiscid/patches/patch-aa
deleted file mode 100644
index 220b51ccb49..00000000000
--- a/audio/libdiscid/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2011/03/27 07:28:25 obache Exp $
-
---- configure.orig	2008-05-25 06:45:56.000000000 +0000
-+++ configure
-@@ -2473,8 +2473,9 @@ case "${host_cpu}-${host_os}" in
-   *-cygwin*)  os=win32; LIBS='-lwinmm' ;;
-   *-freebsd*) os=freebsd ;;
-   *-darwin*)  os=darwin; LIBS='-framework CoreFoundation -framework IOKit';;
-+  *-dragonfly*)  os=freebsd ;;
-   *-linux*)   os=linux ;;
--  #*-netbsd*)  os=netbsd ;;
-+  *-netbsd*)  os=freebsd ;;
-   #*-openbsd*) os=openbsd ;;
-   #*-os2_emx*) os=os2 ;;
-   #*-solaris*) os=solaris; LIBS='-lsocket -lnsl' ;;
diff --git a/audio/libdiscid/patches/patch-ab b/audio/libdiscid/patches/patch-ab
index 0edad29f1bb..b45bde0b86e 100644
--- a/audio/libdiscid/patches/patch-ab
+++ b/audio/libdiscid/patches/patch-ab
@@ -1,19 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2009/07/07 17:44:51 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2013/06/16 09:58:48 shattered Exp $
 
---- src/disc_freebsd.c.orig	2008-01-12 12:41:51.000000000 +0100
+--- src/disc_freebsd.c.orig	2013-04-12 11:46:44.000000000 +0000
 +++ src/disc_freebsd.c
-@@ -45,6 +45,9 @@
+@@ -47,11 +47,19 @@
+ #define MB_DEFAULT_DEVICE		"/dev/acd0"
  
  #define XA_INTERVAL			((60 + 90 + 2) * CD_FRAMES)
- 
+-
++ 
 +#ifdef __NetBSD__
 +#define CDIOREADTOCENTRY CDIOREADTOCENTRIES
 +#endif
  
- /* TODO: make sure it's available */
- int snprintf(char *str, size_t size, const char *format, ...);
-@@ -52,7 +55,12 @@ int snprintf(char *str, size_t size, con
- 
  static int read_toc_header(int fd, int *first, int *last) {
  	struct ioc_toc_header th;
 +#ifdef __NetBSD__
@@ -25,7 +23,7 @@ $NetBSD: patch-ab,v 1.1 2009/07/07 17:44:51 drochner Exp $
  
  	int ret = ioctl(fd, CDIOREADTOCHEADER, &th);
  
-@@ -68,10 +76,20 @@ static int read_toc_header(int fd, int *
+@@ -67,10 +75,20 @@ static int read_toc_header(int fd, int *
  	 * session are handled correctly.
  	 */
  	te.address_format = CD_LBA_FORMAT;
@@ -46,7 +44,7 @@ $NetBSD: patch-ab,v 1.1 2009/07/07 17:44:51 drochner Exp $
  		(*last)--;
  
  	return ret;
-@@ -79,17 +97,32 @@ static int read_toc_header(int fd, int *
+@@ -78,17 +96,32 @@ static int read_toc_header(int fd, int *
  
  
  static int read_toc_entry(int fd, int track_num, unsigned long *lba) {
@@ -79,7 +77,7 @@ $NetBSD: patch-ab,v 1.1 2009/07/07 17:44:51 drochner Exp $
  
  	return ret;
  }
-@@ -97,16 +130,32 @@ static int read_toc_entry(int fd, int tr
+@@ -96,16 +129,32 @@ static int read_toc_entry(int fd, int tr
  
  static int read_leadout(int fd, unsigned long *lba) {
  	struct ioc_toc_header th;