update to 1.1.5

Changes:
Fixed bug in CD-TEXT writing code that caused the problems with the unreliable
	read back of the written CD-TEXT data
Added CD-TEXT writing capability to the generic-mmc-raw driver; the recorder
	must support the 96 byte raw P-W sub-channel writing mode to make use
	of it
Fixed bug in generic-mmc-raw driver: the TOC type was not written correctly and
	some flags for data tracks were missing in the lead-in
Fixed handling of toc type for multi session CDs: the toc-type of a session
	that just contains audio tracks is always CD_DA, even in multi session
	mode
BURN Proof support added by ITOH Yasufumi/Martin Buck
Fixed bug in calculating the CDDB id (SourceForge bug 413467)
Added option --with-cddb to read CDDB data automatically with commands copy,
	read-toc and read-cd; it is now possible to add CD-TEXT data from CDDB
	while performing an on-the-fly copy
Updated to libscg-0.5 from cdrtools-1.10
Handle drives that do not support the explicit power calibration command
Blanking of CD-RWs is now officially supported (command blank, option
	--blank-mode)
Updated CD-R vendor table
Settings are now first read from "/etc/cdrdao.conf" and "/etc/defaults/cdrdao"
	and then from "$HOME/.cdrdao"
Added command msinfo to output multi session information suitable for mkisofs
Overburning is now prevented by default and must be explicitly requested with
	option --overburn. Fix for Debian bug #79585 (http://bugs.debian.org/cg
	i-bin/bugreport.cgi?bug=79585&repeatmerged=yes).
Fixed error in cdrdao's manual page (Debian bug #82816, http://bugs.debian.org/
	cgi-bin/bugreport.cgi?bug=82816&repeatmerged=yes)
cdrdao's help screen was reworked by Michael Reinelt
Added Giuseppe Corbelli's enhancements for the mp32dao script
Makefiles now use make variable datadir to specify the share directory location
Fixed printing toc-file name with command copy --keepimage

4 files changed, 19 insertions, 29 deletions

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index a7134d362bc..61304fd2e45 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2001/03/27 03:20:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/05/19 12:47:05 drochner Exp $
 #
 
 DISTNAME=		${PKGNAME}.src
-PKGNAME=		cdrdao-1.1.4
+PKGNAME=		cdrdao-1.1.5
 WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		sysutils
-MASTER_SITES=		ftp://cdrdao.sourceforge.net/pub/cdrdao/
+MASTER_SITES=		http://prdownloads.sourceforge.net/cdrdao/
 
 MAINTAINER=		David Maxwell <david@maxwell.net>
-HOMEPAGE=		http://www.ping.de/sites/daneb/cdrdao.html
+HOMEPAGE=		http://cdrdao.sourceforge.net/
 COMMENT=		Records audio or data CD-Rs in disk-at-once (DAO) mode
 
 BUILD_DEPENDS+=		pccts-1.33.22:../../devel/pccts
@@ -19,6 +19,8 @@ CONFIGURE_ARGS+=	--with-pcctsbin=${PREFIX}/bin
 CONFIGURE_ARGS+=	--with-pcctsinc=${PREFIX}/include/pccts
 CONFIGURE_ARGS+=	--without-posix-threads
 CONFIGURE_ARGS+=	--with-gtkmm-exec-prefix=/dev/null
+# don't pick up an installed libcdda_paranoia
+LDFLAGS+=		-L../paranoia
 
 #override ARCH to avoid picking up a bad ${ARCH} during the build
 MAKE_ENV+=      ARCH=""
diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index 78de28fcd5a..81a20f109d7 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:28:59 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/19 12:47:05 drochner Exp $
 
-SHA1 (cdrdao-1.1.4.src.tar.gz) = c509d2b239ea54db8b31ca1ac77cbc4cc02e117b
-Size (cdrdao-1.1.4.src.tar.gz) = 710690 bytes
-SHA1 (patch-aa) = 11d6db5db716aab3b9a0296be625dbec8b8825b3
+SHA1 (cdrdao-1.1.5.src.tar.gz) = f766277957b8d4eeaa7ec1162ded9b0bf04c4c79
+Size (cdrdao-1.1.5.src.tar.gz) = 868001 bytes
 SHA1 (patch-ab) = 071fedfbc598400d9d41e050aa01c5902e97caaa
-SHA1 (patch-ac) = ed3062bb78ade3c60fe8dfcc922c8a3f261408ab
+SHA1 (patch-ac) = 92e971a906662feea0311c4f274743bbf9667b47
diff --git a/sysutils/cdrdao/patches/patch-aa b/sysutils/cdrdao/patches/patch-aa
deleted file mode 100644
index e84e6d1c66a..00000000000
--- a/sysutils/cdrdao/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/02/18 15:13:50 wiz Exp $
-
---- scsilib/include/mconfig.h.orig	Tue Jan 18 19:43:58 2000
-+++ scsilib/include/mconfig.h	Tue Jan 18 19:44:15 2000
-@@ -45,7 +45,7 @@
- extern "C" {
- #endif
- 
--#if defined(unix) || defined(__unix) || defined(__unix__)
-+#if defined (__NetBSD__)
- #	define	IS_UNIX
- #endif
- 
diff --git a/sysutils/cdrdao/patches/patch-ac b/sysutils/cdrdao/patches/patch-ac
index a5e48202e34..5880954098e 100644
--- a/sysutils/cdrdao/patches/patch-ac
+++ b/sysutils/cdrdao/patches/patch-ac
@@ -1,14 +1,15 @@
-$NetBSD: patch-ac,v 1.1 2000/07/07 16:25:04 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2001/05/19 12:47:05 drochner Exp $
 
---- scsilib/include/btorder.h.orig	Thu Apr 29 05:02:27 1999
-+++ scsilib/include/btorder.h	Fri Jul  7 09:11:17 2000
-@@ -44,4 +44,13 @@
-  * Bitorder is known.
+--- scsilib/include/btorder.h.orig	Sun Apr 29 11:28:21 2001
++++ scsilib/include/btorder.h	Fri May 18 19:04:13 2001
+@@ -54,6 +54,15 @@
+ /*
+  * Bitorder is already known.
   */
 +
-+#elif	defined(__NetBSD__)
++#elif defined(__NetBSD__)
 +#include <machine/endian.h>
-+#if	BYTE_ORDER == LITTLE_ENDIAN
++#if   BYTE_ORDER == LITTLE_ENDIAN
 +#define _BIT_FIELDS_LTOH
 +#else
 +#define _BIT_FIELDS_HTOL
@@ -16,3 +17,4 @@ $NetBSD: patch-ac,v 1.1 2000/07/07 16:25:04 dmcmahill Exp $
 +
  #else
  /*
+  * Bitorder not yet known.