From 46df97b03d83235a760b8cf67d71cdf3a102b569 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme>
Date: Sun, 4 Jan 2004 18:26:17 +0000
Subject: Update to 0.99.9 from Min Sik Kim in PR pkg/23930.

Changes in 0.99.9
        * (cdaudio.c) cd_poll: accept CDS_MIXED CD's too.
        * (cddb.c) cddb_read_line: fixed fprintf() format.
        * (coverart.c) coverart_direct_erase_data: removed unused local
          variable.
        * (cddb.h): added cddb_mc_generate_new_entry's interface, which is
          used in cdindex.c.

Changes in 0.99.8
	* Minor bugfix release.  Switched to Automake 1.6.

Changes in 0.99.7
	* Fixed a bug that made libcdaudio log more messages than desired to
	  klogd.  Thanks to Matt Kraai.
---
 audio/libcdaudio/Makefile         |  4 ++--
 audio/libcdaudio/PLIST            |  6 +++---
 audio/libcdaudio/distinfo         |  8 ++++----
 audio/libcdaudio/patches/patch-aa | 18 ++++++++++--------
 4 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'audio')

diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index ed759a4c21b..58b53159c7e 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/10/18 11:59:58 cjep Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/04 18:26:17 xtraeme Exp $
 #
 
-DISTNAME=	libcdaudio-0.99.6
+DISTNAME=	libcdaudio-0.99.9
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libcdaudio/}
 
diff --git a/audio/libcdaudio/PLIST b/audio/libcdaudio/PLIST
index be78b0462b5..7d8c2d424d0 100644
--- a/audio/libcdaudio/PLIST
+++ b/audio/libcdaudio/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:05 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/01/04 18:26:17 xtraeme Exp $
 bin/libcdaudio-config
 include/cdaudio.h
+lib/libcdaudio.a
+lib/libcdaudio.la
 lib/libcdaudio.so
 lib/libcdaudio.so.1
 lib/libcdaudio.so.1.0
-lib/libcdaudio.a
-lib/libcdaudio.la
 share/aclocal/libcdaudio.m4
diff --git a/audio/libcdaudio/distinfo b/audio/libcdaudio/distinfo
index d85a75ff1a5..c880c2bbc9e 100644
--- a/audio/libcdaudio/distinfo
+++ b/audio/libcdaudio/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/08/25 19:21:51 jlam Exp $
+$NetBSD: distinfo,v 1.6 2004/01/04 18:26:17 xtraeme Exp $
 
-SHA1 (libcdaudio-0.99.6.tar.gz) = a75bd8c8204081d05f09e7c1139f26e9ca7cf801
-Size (libcdaudio-0.99.6.tar.gz) = 262260 bytes
-SHA1 (patch-aa) = 4515a6847b27067a871832ad2f9941229488a6f1
+SHA1 (libcdaudio-0.99.9.tar.gz) = 5d861d30c9d2db195b7e8263cb9e6f977b5ee075
+Size (libcdaudio-0.99.9.tar.gz) = 298968 bytes
+SHA1 (patch-aa) = 6f2acd74312924a21efecea3ca3ebc1b552479ea
diff --git a/audio/libcdaudio/patches/patch-aa b/audio/libcdaudio/patches/patch-aa
index cfe58976128..e257e6c4d27 100644
--- a/audio/libcdaudio/patches/patch-aa
+++ b/audio/libcdaudio/patches/patch-aa
@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2002/08/31 03:19:08 wiz Exp $
---- source/cdaudio.c.orig	Fri Jul  5 12:15:13 2002
-+++ source/cdaudio.c	Fri Jul  5 12:16:25 2002
-@@ -306,6 +306,7 @@
-   struct CDAUDIO_SUBCHANNEL_DATA cdsc_data;
+$NetBSD: patch-aa,v 1.6 2004/01/04 18:26:17 xtraeme Exp $
+
+--- source/cdaudio.c.orig	2004-01-04 19:21:41.000000000 +0100
++++ source/cdaudio.c	2004-01-04 19:22:18.000000000 +0100
+@@ -317,7 +317,7 @@
+       }
+   }
  #endif
- 
-+	memset(&cdsc, '\0', sizeof(cdsc));
- 
+-
++  memset(&cdsc, '\0', sizeof(cdsc));
  #ifdef CDAUDIO_SUBCHANNEL_DATA
    memset(&cdsc_data, '\0', sizeof(cdsc_data));
+   cdsc.CDSC_DATA = &cdsc_data;
-- 
cgit v1.2.3