Update to 0.81:

version 0.81
2008-10-27

- license of manual now GFDL 1.2 or later, with no invariant sections.
  Source is GPL 3.

  Thanks to Karl Berry.

- Nero image handling more complete.
    CD-Text processing.
    DAO in read_audio_sectors.
    ISRC processing.

- ISRC query for image files.

  Thanks to Robert William Fuller on the above two items

- Allow reading pregap of a track via get_track_pregap_lsn(). Add
  Section on "CD-DA pregap" in libcdio manual

- Allow cross-compiling to mingw32. Patch from Peter Hartley.

- Make iso9660 time setting/getting routines (iso9660_{g,s}et_{d,l}time)
  reentrant and remove bugs in that code. Courtesy Nicolas Boullis.

- OSX fixes

7 files changed, 12 insertions, 69 deletions

diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile
index 8739e84709c..e0dd519d9f4 100644
--- a/misc/libcdio/Makefile
+++ b/misc/libcdio/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2008/04/18 14:58:32 tron Exp $
+# $NetBSD: Makefile,v 1.37 2008/11/10 22:30:43 wiz Exp $
 
-DISTNAME=	libcdio-0.80
-PKGREVISION=	2
+DISTNAME=	libcdio-0.81
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU:=libcdio/}
 
@@ -25,6 +24,7 @@ PKGCONFIG_OVERRIDE+=	libiso9660++.pc.in
 PKGCONFIG_OVERRIDE+=	libudf.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-versioned-libs
+CONFIGURE_ARGS+=	--enable-cpp-progs
 INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/misc/libcdio/distinfo b/misc/libcdio/distinfo
index 30bf7143994..69eaa71e103 100644
--- a/misc/libcdio/distinfo
+++ b/misc/libcdio/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.18 2008/10/30 09:04:20 is Exp $
+$NetBSD: distinfo,v 1.19 2008/11/10 22:30:43 wiz Exp $
 
-SHA1 (libcdio-0.80.tar.gz) = 40c1558a65a9eca2b693d1951ed2664efbe7d1ed
-RMD160 (libcdio-0.80.tar.gz) = 3ca404bffb107ad950505b8ccd9e659e306545cb
-Size (libcdio-0.80.tar.gz) = 2083287 bytes
+SHA1 (libcdio-0.81.tar.gz) = f3d9a38d220483563a6c05d0c412d16fbc64a555
+RMD160 (libcdio-0.81.tar.gz) = 094108aa064d27763060edbd849383571ea5b92b
+Size (libcdio-0.81.tar.gz) = 2245595 bytes
 SHA1 (patch-aa) = 8e70ee2840c19da3efc0c47dfa9f7ea400a1ec2e
-SHA1 (patch-ab) = a2bcb4fec5acf46ede7386287dec3d0d4aa0d81e
-SHA1 (patch-ac) = 7932908d34f8d1cc7946bce6a6d61d5036d102d6
-SHA1 (patch-ad) = c675f7413a672cb7b37c073b01d43339467e636c
-SHA1 (patch-ae) = 2d9248077d271640aa89327d716c0434f114d580
-SHA1 (patch-af) = 112d329207e2dfdbd792113caef8dc03a71a294f
+SHA1 (patch-ac) = 7bea49d753bb88d8fa2b5b87a4e9a327c5d7f05f
diff --git a/misc/libcdio/patches/patch-ab b/misc/libcdio/patches/patch-ab
deleted file mode 100644
index 736f69dd286..00000000000
--- a/misc/libcdio/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2008/04/18 14:58:32 tron Exp $
-
---- Makefile.in.orig	2008-03-15 17:45:36.000000000 +0000
-+++ Makefile.in	2008-04-18 15:49:22.000000000 +0100
-@@ -284,7 +284,8 @@
- 	         libcdio++.pc  \
- 	         libiso9660.pc \
- 	         libiso9660++.pc \
--	         libudf.pc
-+	         libudf.pc \
-+	         $(paranoiapcs)
- 
- 
- # List of additional files for expanded regression tests
diff --git a/misc/libcdio/patches/patch-ac b/misc/libcdio/patches/patch-ac
index 44c68f6fcf4..f547dd5b076 100644
--- a/misc/libcdio/patches/patch-ac
+++ b/misc/libcdio/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2008/04/15 16:13:12 tron Exp $
+$NetBSD: patch-ac,v 1.4 2008/11/10 22:30:43 wiz Exp $
 
---- src/cd-paranoia/cd-paranoia.c.orig	2008-03-03 12:07:37.000000000 +0000
-+++ src/cd-paranoia/cd-paranoia.c	2008-04-15 13:30:03.000000000 +0100
-@@ -278,7 +278,7 @@
+--- src/cd-paranoia/cd-paranoia.c.orig	2008-06-25 07:52:33.000000000 +0000
++++ src/cd-paranoia/cd-paranoia.c
+@@ -276,7 +276,7 @@ display_toc(cdrom_drive_t *d)
    report("");
  }
  
diff --git a/misc/libcdio/patches/patch-ad b/misc/libcdio/patches/patch-ad
deleted file mode 100644
index 2a91bfd18d8..00000000000
--- a/misc/libcdio/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/05/22 13:18:55 drochner Exp $
-
---- lib/driver/FreeBSD/freebsd.h.orig	2007-12-28 02:01:06.000000000 +0100
-+++ lib/driver/FreeBSD/freebsd.h
-@@ -158,7 +158,7 @@ void get_drive_cap_freebsd_cam (const _i
- 				cdio_drive_write_cap_t *p_write_cap,
- 				cdio_drive_misc_cap_t  *p_misc_cap);
- 
--int get_media_changed_freebsd (const void *p_user_data);
-+static int get_media_changed_freebsd (const void *p_user_data);
- 
- char *get_mcn_freebsd_ioctl (const _img_private_t *p_env);
- 
diff --git a/misc/libcdio/patches/patch-ae b/misc/libcdio/patches/patch-ae
deleted file mode 100644
index 8a87ad97dd4..00000000000
--- a/misc/libcdio/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/10/30 09:04:20 is Exp $
-
---- src/cddb.h.orig	2007-06-16 22:12:16.000000000 +0200
-+++ src/cddb.h
-@@ -38,7 +38,7 @@ cddb_opts_t cddb_opts;
-       the total length of the disk, and 
-       the number of tracks.
- */
--u_int32_t cddb_discid(CdIo_t *p_cdio, track_t i_tracks);
-+uint32_t cddb_discid(CdIo_t *p_cdio, track_t i_tracks);
- 
- #ifdef HAVE_CDDB
- #include <cddb/cddb.h>
diff --git a/misc/libcdio/patches/patch-af b/misc/libcdio/patches/patch-af
deleted file mode 100644
index ac7a259deb6..00000000000
--- a/misc/libcdio/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2008/10/30 09:04:20 is Exp $
-
---- src/cddb.c.orig	2007-06-16 22:12:16.000000000 +0200
-+++ src/cddb.c
-@@ -48,7 +48,7 @@ cddb_dec_digit_sum(int n)
-       the total length of the disk, and 
-       the number of tracks.
- */
--u_int32_t
-+uint32_t
- cddb_discid(CdIo_t *p_cdio, track_t i_tracks)
- {
-   int i,t,n=0;