Dramatically increase likeliness of cdrtools working. Bump revision,

since it compiled before.

9 files changed, 161 insertions, 5 deletions

diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index a8e91e1895d..c18689296cd 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/25 16:03:00 joerg Exp $
 
 DISTNAME=	cdrtools-2.01
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index 8917d06793c..03ec8653d1d 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,10 +1,16 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: distinfo,v 1.2 2006/01/25 16:03:00 joerg Exp $
 
 SHA1 (cdrtools-2.01.tar.bz2) = f94cfe51dd512d4e0b9106b986bde12d4f7967ce
 RMD160 (cdrtools-2.01.tar.bz2) = b34a8b81b21cc8ed1927f34e44130513d2ee0407
 Size (cdrtools-2.01.tar.bz2) = 1400389 bytes
+SHA1 (patch-aa) = e6ca173814be22af60626a973d61e36b2a06798d
+SHA1 (patch-ab) = a94454664efc8e7b36087ecbfc94557050d1cad5
 SHA1 (patch-ac) = 45c660e3d9f55e161614f29b0e94e177012213aa
-SHA1 (patch-ah) = 8dc829b923493f1d0f47926fc11af30ceeb4b0db
+SHA1 (patch-ad) = 8ca45e2fc52cdd25e666a0fbf40e6679140cecd9
+SHA1 (patch-ae) = 013d57cb94dc9653b41ed8b21c7d8a819d5e10f3
+SHA1 (patch-af) = d91bb7f1ed63725639228e59437982d903223fbb
+SHA1 (patch-ag) = 398889dab85fb52600f1e1dac3fdaf2601d92f90
+SHA1 (patch-ah) = f3b163c78fcc77722d7f8f9338556685d50d2919
 SHA1 (patch-ai) = df338ebfc23b8016fd839a41f279e1e31835ee05
 SHA1 (patch-aj) = ef92e08cd85ee9ade5c99ea52481f5887365f726
 SHA1 (patch-ba) = 3eb8a53bba94e3226d32e39fe0a7f18086c5797b
diff --git a/sysutils/cdrtools/patches/patch-aa b/sysutils/cdrtools/patches/patch-aa
new file mode 100644
index 00000000000..539ce26375b
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1 2006/01/25 16:03:00 joerg Exp $
+
+--- cdda2wav/interface.c.orig	2006-01-25 15:51:29.000000000 +0000
++++ cdda2wav/interface.c
+@@ -439,12 +439,12 @@ static void Check_interface_for_device( 
+ #endif
+ #endif
+        break;
+-#if defined (__linux__) || defined (__FreeBSD__)
++#if defined (__linux__) || defined (__FreeBSD__) || defined(__DragonFly__)
+ #if defined (__linux__)
+     case SCSI_CDROM_MAJOR:     /* scsi cd */
+     default:			/* for example ATAPI cds */
+ #else
+-#if defined (__FreeBSD__)
++#if defined (__FreeBSD__) || defined(__DragonFly__)
+     case 117:
+ 	if (!S_ISCHR(statstruct->st_mode)) {
+ 	    fprintf(stderr, "%s is not a char device\n",pdev_name);
diff --git a/sysutils/cdrtools/patches/patch-ab b/sysutils/cdrtools/patches/patch-ab
new file mode 100644
index 00000000000..385d9a1f1d6
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-ab
@@ -0,0 +1,58 @@
+$NetBSD: patch-ab,v 1.1 2006/01/25 16:03:00 joerg Exp $
+
+--- cdda2wav/ioctl.c.orig	2006-01-25 15:52:17.000000000 +0000
++++ cdda2wav/ioctl.c
+@@ -156,7 +156,7 @@ static unsigned ReadToc_cooked ( x )
+ 	    fprintf( stderr, "can't get TocEntry #%d lba (error %d).\n", i+1, err );
+ 	    exit( MEDIA_ERROR );
+ 	}
+-#ifdef	__FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ 	entry[i].cdte_addr.lba = be32_to_cpu(entry[i].cdte_addr.lba);
+ #endif
+     }
+@@ -168,7 +168,7 @@ static unsigned ReadToc_cooked ( x )
+ 	fprintf( stderr, "can't get TocEntry LEADOUT lba (error %d).\n", err );
+ 	exit( MEDIA_ERROR );
+     }
+-#ifdef	__FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+     entry[i].cdte_addr.lba = be32_to_cpu(entry[i].cdte_addr.lba);
+ #endif
+ 
+@@ -196,7 +196,7 @@ static void trash_cache_cooked(p, lSecto
+ {
+       /* trash the cache */
+ 
+-#if	defined __FreeBSD__
++#if	defined(__FreeBSD__) || defined(__DragonFly__)
+       static struct cdrom_read_audio arg2;
+ 
+       arg2.address.lba = find_an_off_sector(lSector, SectorBurstVal);
+@@ -266,7 +266,7 @@ static int ReadCdRom_cooked (x, p, lSect
+   static int nothing_read = 1;
+ 
+ /* read 2352 bytes audio data */
+-#if	defined __FreeBSD__
++#if	defined(__FreeBSD__) || defined(__DragonFly__)
+   arg.address.lba = lSector;
+   arg.addr_format = CDROM_LBA;
+   arg.nframes = SectorBurstVal;
+@@ -395,7 +395,7 @@ static subq_chnl *ReadSubQ_cooked ( x, s
+ {
+     struct cdrom_subchnl sub_ch;
+ 
+-#if	defined __FreeBSD__
++#if	defined(__FreeBSD__) || defined(__DragonFly__)
+     struct cd_sub_channel_info sub_ch_info;
+ 
+     if (x && x->verbose) {
+@@ -433,7 +433,7 @@ static subq_chnl *ReadSubQ_cooked ( x, s
+           return NULL;
+       }
+       case GET_POSITIONDATA:
+-#if	defined __FreeBSD__
++#if	defined(_FreeBSD__) || defined(__DragonFly__)
+       sub_ch.data_format = CD_CURRENT_POSITION;
+ #endif
+ #if defined (__linux__)
diff --git a/sysutils/cdrtools/patches/patch-ad b/sysutils/cdrtools/patches/patch-ad
new file mode 100644
index 00000000000..568b056c178
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/01/25 16:03:00 joerg Exp $
+
+--- cdda2wav/mycdrom.h.orig	2006-01-25 15:53:18.000000000 +0000
++++ cdda2wav/mycdrom.h
+@@ -52,7 +52,7 @@ All subcode only
+ 
+ #   endif /* if 0 */
+ #  else /* not Sun SVR4 */
+-#   if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
++#   if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined __DragonFly__
+ #    if !defined CDIOCREADAUDIO
+ #     undef HAVE_IOCTL_INTERFACE
+ #    else
diff --git a/sysutils/cdrtools/patches/patch-ae b/sysutils/cdrtools/patches/patch-ae
new file mode 100644
index 00000000000..3c43b773215
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/01/25 16:03:00 joerg Exp $
+
+--- include/xmconfig.h.orig	2006-01-25 15:54:29.000000000 +0000
++++ include/xmconfig.h
+@@ -765,7 +765,7 @@ extern "C" {
+ /*
+  * Prototype for FreeBSD / NetBSD / OpenBSD / BSD/OS
+  */
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__)
+ #	define	PROTOTYPES
+ #	define	HAVE_AOUT
+ #	define	HAVE_STDARG_H
diff --git a/sysutils/cdrtools/patches/patch-af b/sysutils/cdrtools/patches/patch-af
new file mode 100644
index 00000000000..d1577645844
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/01/25 16:03:00 joerg Exp $
+
+--- libscg/scsihack.c.orig	2006-01-25 15:54:47.000000000 +0000
++++ libscg/scsihack.c
+@@ -129,7 +129,7 @@ EXPORT scg_ops_t scg_std_ops = {
+ 
+ #endif	/* linux */
+ 
+-#if	defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if	defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #define	SCSI_IMPL		/* We have a SCSI implementation for *BSD */
+ 
+ #include "scsi-bsd.c"
diff --git a/sysutils/cdrtools/patches/patch-ag b/sysutils/cdrtools/patches/patch-ag
new file mode 100644
index 00000000000..80395c5bc11
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2006/01/25 16:03:00 joerg Exp $
+
+--- mkisofs/defaults.h.orig	2006-01-25 15:55:08.000000000 +0000
++++ mkisofs/defaults.h
+@@ -67,6 +67,10 @@
+ #define	SYSTEM_ID_DEFAULT	"FreeBSD"
+ #endif
+ 
++#ifdef __DragonFly__
++#define	SYSTEM_ID_DEFAULT	"DragonFly"
++#endif
++
+ #ifdef __NetBSD__
+ #define	SYSTEM_ID_DEFAULT	"NetBSD"
+ #endif
diff --git a/sysutils/cdrtools/patches/patch-ah b/sysutils/cdrtools/patches/patch-ah
index de345a01b04..1c1b3541905 100644
--- a/sysutils/cdrtools/patches/patch-ah
+++ b/sysutils/cdrtools/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2006/01/25 16:03:00 joerg Exp $
 
---- cdda2wav/setuid.c.orig	2004-08-19 12:54:34.000000000 +0200
+--- cdda2wav/setuid.c.orig	2004-08-19 10:54:34.000000000 +0000
 +++ cdda2wav/setuid.c
 @@ -94,7 +94,7 @@ void needroot(necessary)
  
@@ -20,6 +20,15 @@ $NetBSD: patch-ah,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
      if (seteuid(real_uid)) {
  	perror("seteuid in dontneedroot()");
  	exit(PERM_ERROR);
+@@ -176,7 +176,7 @@ void neverneedroot()
+       }
+ #endif
+     }
+-#if	defined(__FreeBSD__)	/* XXX this is a big hack and and not a permanent solution */
++#if	defined(__FreeBSD__) || defined(__DragonFly__)	/* XXX this is a big hack and and not a permanent solution */
+     else {
+ #if defined (HAVE_SETUID)
+ 	if (setuid(real_uid)) {
 @@ -217,7 +217,7 @@ void needgroup(necessary)
  
      if (getegid() == effective_gid) return; /* nothing to do */
@@ -38,3 +47,12 @@ $NetBSD: patch-ah,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
      if (setegid(real_gid)) {
  	perror("setegid in dontneedgroup()");
  	exit(PERM_ERROR);
+@@ -292,7 +292,7 @@ void neverneedgroup()
+       }
+ #endif
+     }
+-#if	defined(__FreeBSD__)	/* XXX this is a big hack and and not a permanent solution */
++#if	defined(__FreeBSD__) || defined(__DragonFly__)	/* XXX this is a big hack and and not a permanent solution */
+     else {
+ #if defined (HAVE_SETGID)
+ 	if (setgid(real_gid)) {