Sync DragonFly/FreeBSD support with FreeBSD ports by adding

cdda_device_name to struct cdrom_drive. This makes a number of hacks in various places superfluous and should fix the KDE multimedia issues. Bump revision. Recursive bump will follow, since the major version changed.
author: joerg <joerg> 2006-03-07 06:29:03 +0000
committer: joerg <joerg> 2006-03-07 06:29:03 +0000
commit: e76f98b7da037240ca24a15c139516dc37506695 (patch)
tree: beb433fa5a71a498a8a6b0f10b0088561f94a43c /audio
parent: 9fcb3f0f4e65234ddd9394a9f24cf6a80b3a4892 (diff)
download: pkgsrc-e76f98b7da037240ca24a15c139516dc37506695.tar.gz
21 files changed, 87 insertions, 394 deletions
diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index 06273572bbd..2dedf458078 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:06 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/07 06:29:03 joerg Exp $
 #
 
 DISTNAME=	cdparanoia-III-alpha9.8
 PKGNAME=	cdparanoia-3.0.9.8
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.xiph.org/paranoia/download/
 EXTRACT_SUFX=	.src.tgz
diff --git a/audio/cdparanoia/distinfo b/audio/cdparanoia/distinfo
index eef19a47bea..31d78c9b339 100644
--- a/audio/cdparanoia/distinfo
+++ b/audio/cdparanoia/distinfo
@@ -1,28 +1,20 @@
-$NetBSD: distinfo,v 1.12 2005/12/29 22:50:53 joerg Exp $
+$NetBSD: distinfo,v 1.13 2006/03/07 06:29:03 joerg Exp $
 
 SHA1 (cdparanoia-III-alpha9.8.src.tgz) = 04cc33a7d22d6255f6239e3e74195506b3bdde06
 RMD160 (cdparanoia-III-alpha9.8.src.tgz) = d9225165f83b5386c58db263d6918a7006df1481
 Size (cdparanoia-III-alpha9.8.src.tgz) = 116591 bytes
 SHA1 (patch-aa) = 31b37e9fb7be1cb16249bcd6a8561ab64c2fbf39
-SHA1 (patch-ab) = 8753d808ef7afe077dde8a47053e04640d6c3e4d
+SHA1 (patch-ab) = 69d2996b7089cb87ce4e3de969da795ae041e720
 SHA1 (patch-ac) = 7de8b30c5b5ed2e82090115897d7c98e61776214
 SHA1 (patch-ad) = 45cb1d2d402f5769447507c8da24e289396021e7
 SHA1 (patch-ae) = ea4cbc4a13f36ba4da39bd9a944d4123f132b86e
-SHA1 (patch-ba) = 05f8efe4f0a2753217d3c1cf1014da64b1d92b73
-SHA1 (patch-ca) = 803673cc139cf1267bfa2af82dfef3071e58e0bc
-SHA1 (patch-cb) = 00215d433a86a35ae13f2092efefabadc5967bfb
-SHA1 (patch-cc) = 0980c20c8fcd11de11294dd8fed0f9555ea0ef0d
-SHA1 (patch-cd) = a2595237ddbaf35dfc1a5ce0bf7d1fa9244e1d67
-SHA1 (patch-ce) = 813f18a27808234a8a9139f0c53951b5fea83b37
-SHA1 (patch-cf) = dd96eddefca6a6cd5794a483efa94005fdf8b9f8
-SHA1 (patch-cg) = d57b8019fd14baf0701a9a9f824a4f4bd64ab3ad
-SHA1 (patch-ch) = 73c38418cd7ab5fa5a072abfc78479fdd1d87787
-SHA1 (patch-ci) = cff3eaff31ea324d7bde5d0d840df57453085bec
-SHA1 (patch-da) = 41636b882727e101980915a59382f2dc07ce2250
-SHA1 (patch-db) = ae806ddbc2fc8cfc6c2a911ea187715991ae2ea3
-SHA1 (patch-dc) = f1538a89f93fad029f2285370f74fa6899568452
-SHA1 (patch-dd) = 227a9092cf4896ce3f4fe0aa19460f4769bec033
-SHA1 (patch-de) = 7ef3e0a2286ee8a35794667b4123235382afe7a0
-SHA1 (patch-df) = 9312bf37493cfd3a1d67c94f495089f832514df3
-SHA1 (patch-dg) = 1dd22bf1b3525a43fa029e11e807088a877f236e
-SHA1 (patch-dh) = 979db75fc97e3403eca01f524bfad14e22f6f6dc
+SHA1 (patch-ba) = 51151796493c946e5bdafbd22005136ea7f27a09
+SHA1 (patch-ca) = cf29a467bd37bc642edd81f8a6aa76cfb0c15344
+SHA1 (patch-cb) = 2123635be4d7765419d62958365a6df621471439
+SHA1 (patch-cc) = 311f8e45a9c3bc86cdb106730295f28a856ae2ab
+SHA1 (patch-cd) = 81a35822f89b4f674f03cbcbd5831cac96c3aa92
+SHA1 (patch-ce) = 282e3169cc26ab11924c66a312d77d7c1f59f242
+SHA1 (patch-cf) = 3ccf5e52737cb449dbead92c582646d0ebe24500
+SHA1 (patch-cg) = b9786ee81dcb7bd2f6572a20f424dd5291a8720d
+SHA1 (patch-ch) = d28ec06a56499ff96491edc49d462f43c41d15fe
+SHA1 (patch-ci) = 5d92d43084b0d9ef9951f0b0ced6fe601b91cce9
diff --git a/audio/cdparanoia/patches/patch-ab b/audio/cdparanoia/patches/patch-ab
index 206a1b2b507..7c737a12b5e 100644
--- a/audio/cdparanoia/patches/patch-ab
+++ b/audio/cdparanoia/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2002/03/04 14:45:13 itohy Exp $
+$NetBSD: patch-ab,v 1.5 2006/03/07 06:29:03 joerg Exp $
+
+Note tht VERSION is *not* used for the libtool versioning.
 
 --- Makefile.in.orig	Wed Mar 28 07:46:58 2001
 +++ Makefile.in	Sun Mar  3 23:08:01 2002
diff --git a/audio/cdparanoia/patches/patch-ba b/audio/cdparanoia/patches/patch-ba
index 292b3cb6ef1..5c866c415e8 100644
--- a/audio/cdparanoia/patches/patch-ba
+++ b/audio/cdparanoia/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.2 2001/04/29 09:47:03 skrll Exp $
+$NetBSD: patch-ba,v 1.3 2006/03/07 06:29:03 joerg Exp $
 
 --- paranoia/Makefile.in.orig	Tue Dec 14 04:28:04 1999
 +++ paranoia/Makefile.in
-@@ -21,10 +21,9 @@
+@@ -21,10 +21,9 @@ CPPFLAGS+=-D_REENTRANT
  OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
  #TFILES = isort.t gap.t p_block.t paranoia.t
  
@@ -15,7 +15,7 @@ $NetBSD: patch-ba,v 1.2 2001/04/29 09:47:03 skrll Exp $
  
  debug: 
  	$(MAKE) libcdda_paranoia.a CFLAGS="$(DEBUG)"
-@@ -33,23 +32,21 @@
+@@ -33,23 +32,21 @@ lib:	
  	$(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)" 
  
  slib:	
@@ -36,7 +36,7 @@ $NetBSD: patch-ba,v 1.2 2001/04/29 09:47:03 skrll Exp $
 -	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
 +libcdda_paranoia.la: 	$(OFILES)	
 +	$(LIBTOOL) --mode=link $(CC) -o libcdda_paranoia.la $(OFILES:.o=.lo) \
-+	    -version-info 0:$(VERSION) -rpath $(PREFIX)/lib
++	    -version-info 1:0 -rpath $(PREFIX)/lib
 +
 +libcdda_paranoia.a: 	libcdda_paranoia.la
 +
diff --git a/audio/cdparanoia/patches/patch-ca b/audio/cdparanoia/patches/patch-ca
index bb9ba1cd2e8..a43c478341a 100644
--- a/audio/cdparanoia/patches/patch-ca
+++ b/audio/cdparanoia/patches/patch-ca
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.3 2005/12/29 22:50:53 joerg Exp $
+$NetBSD: patch-ca,v 1.4 2006/03/07 06:29:03 joerg Exp $
 
 --- interface/Makefile.in.orig	1999-12-14 04:27:59.000000000 +0000
 +++ interface/Makefile.in
@@ -31,7 +31,7 @@ $NetBSD: patch-ca,v 1.3 2005/12/29 22:50:53 joerg Exp $
 +
 +libcdda_interface.la: 	$(OFILES)	
 +	$(LIBTOOL) --mode=link $(CC) -o libcdda_interface.la $(OFILES:.o=.lo) \
-+	    -version-info 0:$(VERSION) -rpath $(PREFIX)/lib $(LDFLAGS)
++	    -version-info 1:0 -rpath $(PREFIX)/lib $(LDFLAGS)
 +
 +libcdda_interface.a: 	libcdda_interface.la
  
diff --git a/audio/cdparanoia/patches/patch-cb b/audio/cdparanoia/patches/patch-cb
index cc26ae80d7f..90d5c02d17d 100644
--- a/audio/cdparanoia/patches/patch-cb
+++ b/audio/cdparanoia/patches/patch-cb
@@ -1,4 +1,4 @@
-$NetBSD: patch-cb,v 1.3 2003/10/20 12:07:23 grant Exp $
+$NetBSD: patch-cb,v 1.4 2006/03/07 06:29:03 joerg Exp $
 
 --- interface/low_interface.h.orig	2001-03-26 16:12:11.000000000 +1000
 +++ interface/low_interface.h
@@ -14,7 +14,7 @@ $NetBSD: patch-cb,v 1.3 2003/10/20 12:07:23 grant Exp $
  #include <linux/cdrom.h>
  #include <linux/major.h>
  
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +
 +#include <sys/cdio.h>
 +#include <sys/cdrio.h>
@@ -35,7 +35,7 @@ $NetBSD: patch-cb,v 1.3 2003/10/20 12:07:23 grant Exp $
  #define MIN_BIG_BUFF_SIZE 4096
 +#ifdef __linux__
  #define SG_OFF sizeof(struct sg_header)
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +#define SG_OFF (0)
 +#elif defined(__NetBSD__)
 +#define SG_OFF sizeof(scsireq_t)
@@ -47,7 +47,7 @@ $NetBSD: patch-cb,v 1.3 2003/10/20 12:07:23 grant Exp $
  #endif
  
  extern int  cooked_init_drive (cdrom_drive *d);
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  extern unsigned char *scsi_inquiry (cdrom_drive *d);
 +#endif
  extern int  scsi_init_drive (cdrom_drive *d);
diff --git a/audio/cdparanoia/patches/patch-cc b/audio/cdparanoia/patches/patch-cc
index c675dfd8792..f1288c88112 100644
--- a/audio/cdparanoia/patches/patch-cc
+++ b/audio/cdparanoia/patches/patch-cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-cc,v 1.4 2004/06/01 20:58:38 shannonjr Exp $
+$NetBSD: patch-cc,v 1.5 2006/03/07 06:29:03 joerg Exp $
 
 --- interface/utils.h.orig	2000-04-19 16:41:04.000000000 -0600
 +++ interface/utils.h
@@ -15,7 +15,7 @@ $NetBSD: patch-cc,v 1.4 2004/06/01 20:58:38 shannonjr Exp $
 +#include <machine/bswap.h>
 +#endif
 +#include <err.h>	/* XXX */
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <machine/endian.h>
 +#endif
  #include <stdio.h>
diff --git a/audio/cdparanoia/patches/patch-cd b/audio/cdparanoia/patches/patch-cd
index fffc512e8e2..696f6d66f95 100644
--- a/audio/cdparanoia/patches/patch-cd
+++ b/audio/cdparanoia/patches/patch-cd
@@ -1,4 +1,4 @@
-$NetBSD: patch-cd,v 1.2 2003/10/20 12:07:23 grant Exp $
+$NetBSD: patch-cd,v 1.3 2006/03/07 06:29:03 joerg Exp $
 
 --- interface/common_interface.c.orig	2000-04-20 08:41:04.000000000 +1000
 +++ interface/common_interface.c
@@ -16,7 +16,7 @@ $NetBSD: patch-cd,v 1.2 2003/10/20 12:07:23 grant Exp $
    struct cdrom_volctrl volctl;
    if (ioctl(fd, CDROMVOLREAD, &volctl)) 
      return(1); /* failure */
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +  struct ioc_vol volctl;
 +  if (ioctl(fd, CDIOCGETVOL, &volctl)) 
 +    return(1); /* failure */
@@ -53,7 +53,7 @@ $NetBSD: patch-cd,v 1.2 2003/10/20 12:07:23 grant Exp $
    /* For a scsi device, the ioctl must go to the specialized SCSI
       CDROM device, not the generic device. */
  
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
    if (d->ioctl_fd != -1) {
 +#ifdef __linux__
      int result;
diff --git a/audio/cdparanoia/patches/patch-ce b/audio/cdparanoia/patches/patch-ce
index 8a84047260b..54099737410 100644
--- a/audio/cdparanoia/patches/patch-ce
+++ b/audio/cdparanoia/patches/patch-ce
@@ -1,4 +1,4 @@
-$NetBSD: patch-ce,v 1.2 2003/10/20 12:07:23 grant Exp $
+$NetBSD: patch-ce,v 1.3 2006/03/07 06:29:03 joerg Exp $
 
 --- interface/cooked_interface.c.orig	2000-04-20 08:41:04.000000000 +1000
 +++ interface/cooked_interface.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ce,v 1.2 2003/10/20 12:07:23 grant Exp $
  #include "common_interface.h"
  #include "utils.h"
  
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  static int cooked_readtoc (cdrom_drive *d){
    int i;
    int tracks;
@@ -93,7 +93,7 @@ $NetBSD: patch-ce,v 1.2 2003/10/20 12:07:23 grant Exp $
 +  errx(1, "cooked_read: not implemented");
 +#endif
 +}
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +static int
 +cooked_readtoc(cdrom_drive *d)
 +{
@@ -235,7 +235,7 @@ $NetBSD: patch-ce,v 1.2 2003/10/20 12:07:23 grant Exp $
    default:
      d->nsectors=40; 
    }
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +  d->nsectors = 26;	/* FreeBSD only supports 64K I/O transfer size */
 +#endif
    d->enable_cdda = Dummy;
diff --git a/audio/cdparanoia/patches/patch-cf b/audio/cdparanoia/patches/patch-cf
index 495a546565a..7bdde5052d1 100644
--- a/audio/cdparanoia/patches/patch-cf
+++ b/audio/cdparanoia/patches/patch-cf
@@ -1,4 +1,4 @@
-$NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
+$NetBSD: patch-cf,v 1.6 2006/03/07 06:29:03 joerg Exp $
 
 --- interface/scan_devices.c.orig	2001-03-26 15:44:01.000000000 +1000
 +++ interface/scan_devices.c
@@ -11,11 +11,11 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
  #define MAX_DEV_LEN 20 /* Safe because strings only come from below */
  /* must be absolute paths! */
  static char *scsi_cdrom_prefixes[]={
-@@ -49,10 +51,18 @@
+@@ -49,10 +51,18 @@ static char *cdrom_devices[]={
    "/dev/cm206cd",
    "/dev/gscd",
    "/dev/optcd",NULL};
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +static char *cdrom_devices[] = {
 +	"/dev/cd?c",
 +	"/dev/acd?c",
@@ -26,11 +26,11 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
  /* Functions here look for a cdrom drive; full init of a drive type
     happens in interface.c */
  
-+#if defined(__linux__) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
  cdrom_drive *cdda_find_a_cdrom(int messagedest,char **messages){
    /* Brute force... */
    
-@@ -75,10 +85,12 @@
+@@ -75,10 +85,12 @@ cdrom_drive *cdda_find_a_cdrom(int messa
  	if((d=cdda_identify(buffer,messagedest,messages)))
  	  return(d);
  	idmessage(messagedest,messages,"",NULL);
@@ -43,7 +43,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
        }
      }else{
        /* Name.  Go for it. */
-@@ -98,6 +110,16 @@
+@@ -98,6 +110,16 @@ cdrom_drive *cdda_find_a_cdrom(int messa
    }
    return(NULL);
  }
@@ -60,14 +60,14 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
  
  cdrom_drive *cdda_identify(const char *device, int messagedest,char **messages){
    struct stat st;
-@@ -117,8 +139,14 @@
+@@ -117,8 +139,14 @@ cdrom_drive *cdda_identify(const char *d
    }
  #endif
  
 +#if defined(__linux__) || defined(__NetBSD__)
    d=cdda_identify_cooked(device,messagedest,messages);
    if(!d)d=cdda_identify_scsi(device,NULL,messagedest,messages);
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +  d = cdda_identify_scsi(device, NULL, messagedest, messages);
 +  if (d == NULL)
 +	d = cdda_identify_cooked(device, messagedest, messages);
@@ -75,7 +75,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
  
  #ifdef CDDA_TEST
    if(!d)d=cdda_identify_test(device,messagedest,messages);
-@@ -146,6 +174,7 @@
+@@ -146,6 +174,7 @@ char *test_resolve_symlink(const char *f
  cdrom_drive *cdda_identify_cooked(const char *dev, int messagedest,
  				  char **messages){
  
@@ -83,14 +83,14 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
    cdrom_drive *d=NULL;
    struct stat st;
    int fd=-1;
-@@ -273,8 +302,59 @@
+@@ -273,8 +302,60 @@ cdrom_drive *cdda_identify_cooked(const 
    idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
    
    return(d);
 +#elif defined(__NetBSD__)
 +  /* no kernel support for CD-DA */
 +  return NULL;
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +	cdrom_drive *d;
 +	struct stat st;
 +
@@ -120,6 +120,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
 +		goto cdda_identify_cooked_fail;
 +	}
 +
++	d->cdda_device_name = copystring(dev);
 +	d->drive_model = copystring("Generic cooked ioctl CDROM");
 +	d->interface = COOKED_IOCTL;
 +	d->bigendianp = -1;
@@ -139,11 +140,11 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
 +#endif
  }
  
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) || defined(__DragonFly__)
  struct  sg_id {
    long    l1; /* target | lun << 8 | channel << 16 | low_ino << 24 */
    long    l2; /* Unique id */
-@@ -289,12 +369,18 @@
+@@ -289,12 +370,18 @@ typedef struct scsiid{
  /* Even *this* isn't as simple as it bloody well should be :-P */
  /* SG has an easy interface, but SCSI overall does not */
  static int get_scsi_id(int fd, scsiid *id){
@@ -162,7 +163,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
    if(ioctl(fd,SCSI_IOCTL_GET_IDLUN,&argid))return(-1);
    id->bus=argid.l2; /* for now */
    id->id=argid.l1&0xff;
-@@ -302,6 +388,13 @@
+@@ -302,6 +389,13 @@ static int get_scsi_id(int fd, scsiid *i
  
    if(ioctl(fd,SCSI_IOCTL_GET_BUS_NUMBER,&busarg)==0)
      id->bus=busarg;
@@ -176,7 +177,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
    
    return(0);
  }
-@@ -390,6 +483,7 @@
+@@ -390,6 +484,7 @@ matchfail:
    if(dev!=-1)close(dev);
    return(NULL);
  }
@@ -184,7 +185,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
  
  void strscat(char *a,char *b,int n){
    int i;
-@@ -401,6 +495,7 @@
+@@ -401,6 +496,7 @@ void strscat(char *a,char *b,int n){
    strcat(a," ");
  }
  
@@ -192,7 +193,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
  /* At this point, we're going to punt compatability before SG2, and
     allow only SG2 and SG3 */
  static int verify_SG_version(cdrom_drive *d,int messagedest,
-@@ -430,7 +525,9 @@
+@@ -430,7 +526,9 @@ static int verify_SG_version(cdrom_drive
    idmessage(messagedest,messages,buffer,"");
    return(major);
  }
@@ -202,7 +203,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
  cdrom_drive *cdda_identify_scsi(const char *generic_device, 
  				const char *ioctl_device, int messagedest,
  				char **messages){
-@@ -460,6 +557,7 @@
+@@ -460,6 +558,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  	       generic_device);
        return(NULL);
      }
@@ -210,7 +211,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
      if((int)(g_st.st_rdev>>8)!=SCSI_GENERIC_MAJOR){
        if((int)(g_st.st_rdev>>8)!=SCSI_CDROM_MAJOR){
  	idmessage(messagedest,messages,"\t\t%s is not a SCSI device",
-@@ -471,6 +569,7 @@
+@@ -471,6 +570,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  	ioctl_device=temp;
        }
      }
@@ -218,7 +219,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
    }
    if(ioctl_device){
      if(stat(ioctl_device,&i_st)){
-@@ -478,6 +577,7 @@
+@@ -478,6 +578,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  	       ioctl_device);
        return(NULL);
      }
@@ -226,7 +227,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
      if((int)(i_st.st_rdev>>8)!=SCSI_CDROM_MAJOR){
        if((int)(i_st.st_rdev>>8)!=SCSI_GENERIC_MAJOR){
  	idmessage(messagedest,messages,"\t\t%s is not a SCSI device",
-@@ -489,6 +589,7 @@
+@@ -489,6 +590,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  	ioctl_device=temp;
        }
      }
@@ -234,7 +235,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
    }
  
    /* we need to resolve any symlinks for the lookup code to work */
-@@ -505,6 +606,7 @@
+@@ -505,6 +607,7 @@ cdrom_drive *cdda_identify_scsi(const ch
    }
  
    if(!generic_device || !ioctl_device){
@@ -242,7 +243,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
      if(generic_device){
        ioctl_device=
  	scsi_match(generic_device,scsi_cdrom_prefixes,
-@@ -520,6 +622,12 @@
+@@ -520,6 +623,12 @@ cdrom_drive *cdda_identify_scsi(const ch
        if(!generic_device)	
  	goto cdda_identify_scsi_fail;
      }
@@ -255,7 +256,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
    }
    
    idmessage(messagedest,messages,"\t\tgeneric device: %s",generic_device);
-@@ -556,6 +664,7 @@
+@@ -556,6 +665,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  
      type=(int)(i_st.st_rdev>>8);
  
@@ -263,7 +264,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
      if(type==SCSI_CDROM_MAJOR){
        if (!S_ISBLK(i_st.st_mode)) {
  	idmessage(messagedest,messages,"\t\tSCSI CDROM device %s not a "
-@@ -567,8 +676,10 @@
+@@ -567,8 +677,10 @@ cdrom_drive *cdda_identify_scsi(const ch
  		"major number",ioctl_device);
        goto cdda_identify_scsi_fail;
      }
@@ -274,7 +275,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
    if((int)(g_st.st_rdev>>8)==SCSI_GENERIC_MAJOR){
      if (!S_ISCHR(g_st.st_mode)) {
        idmessage(messagedest,messages,"\t\tGeneric SCSI device %s not a "
-@@ -580,6 +691,7 @@
+@@ -580,6 +692,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  	      "major number",generic_device);
      goto cdda_identify_scsi_fail;
    }
@@ -282,7 +283,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
    
  
    d=calloc(1,sizeof(cdrom_drive));
-@@ -590,6 +702,7 @@
+@@ -590,6 +703,7 @@ cdrom_drive *cdda_identify_scsi(const ch
    d->bigendianp=-1; /* We don't know yet... */
    d->nsectors=-1;
  
@@ -290,7 +291,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
    version=verify_SG_version(d,messagedest,messages);
    switch(version){
    case -1:case 0:case 1:
-@@ -599,6 +712,9 @@
+@@ -599,6 +713,9 @@ cdrom_drive *cdda_identify_scsi(const ch
      d->interface=GENERIC_SCSI;
      break;
    }
@@ -300,7 +301,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
  
    /* malloc our big buffer for scsi commands */
    d->sg=malloc(MAX_BIG_BUFF_SIZE);
-@@ -617,7 +733,16 @@
+@@ -617,7 +734,16 @@ cdrom_drive *cdda_identify_scsi(const ch
  
    /* It would seem some TOSHIBA CDROMs gets things wrong */
   
@@ -318,11 +319,11 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
        !strncmp (p + 16, "CD-ROM", 6) &&
        p[0] == TYPE_DISK) {
      p[0] = TYPE_ROM;
-@@ -653,6 +778,87 @@
+@@ -653,6 +779,88 @@ cdda_identify_scsi_fail:
    if(g_fd!=-1)close(g_fd);
    return(NULL);
  }
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +cdrom_drive *cdda_identify_scsi(const char *device,
 +    const char *dummy,
 +    int messagedest,
@@ -369,6 +370,7 @@ $NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
 +		goto cdda_identify_scsi_fail;
 +	}
 +
++	d->cdda_device_name = copystring(devname);
 +	d->ioctl_fd = -1;
 +	d->bigendianp = -1;
 +	d->nsectors = -1;
diff --git a/audio/cdparanoia/patches/patch-cg b/audio/cdparanoia/patches/patch-cg
index 83ce8ac3151..0f5f0aacc8b 100644
--- a/audio/cdparanoia/patches/patch-cg
+++ b/audio/cdparanoia/patches/patch-cg
@@ -1,4 +1,4 @@
-$NetBSD: patch-cg,v 1.7 2003/10/20 12:07:23 grant Exp $
+$NetBSD: patch-cg,v 1.8 2006/03/07 06:29:04 joerg Exp $
 
 --- interface/scsi_interface.c.orig	2001-03-24 12:15:46.000000000 +1100
 +++ interface/scsi_interface.c
@@ -6,7 +6,7 @@ $NetBSD: patch-cg,v 1.7 2003/10/20 12:07:23 grant Exp $
    int table,reserved;
    char buffer[256];
  
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) || defined(__DragonFly__)
 +#ifdef __linux__
    /* maximum transfer size? */
    if(ioctl(d->cdda_fd,SG_GET_RESERVED_SIZE,&reserved)){
@@ -66,7 +66,7 @@ $NetBSD: patch-cg,v 1.7 2003/10/20 12:07:23 grant Exp $
 +  d->enable_cdda(d,1);
 +}
 +
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +static void reset_scsi(cdrom_drive *d) {
 +	d->enable_cdda(d,0);
 +
@@ -100,7 +100,7 @@ $NetBSD: patch-cg,v 1.7 2003/10/20 12:07:23 grant Exp $
 +#endif
  
  /* process a complete scsi command. */
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  static int handle_scsi_cmd(cdrom_drive *d,
  			   unsigned int cmd_len, 
  			   unsigned int in_size, 
@@ -206,7 +206,7 @@ $NetBSD: patch-cg,v 1.7 2003/10/20 12:07:23 grant Exp $
    return(0);
  }
  
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +static int handle_scsi_cmd(cdrom_drive *d,
 +			   unsigned int cmd_len, 
 +			   unsigned int out_size, 
@@ -331,7 +331,7 @@ $NetBSD: patch-cg,v 1.7 2003/10/20 12:07:23 grant Exp $
  		(int)(sg_hd->sense_buffer[2]&0xf),
  		(int)(sg_hd->sense_buffer[12]),
  		(int)(sg_hd->sense_buffer[13]));
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +		d->ccb->csio.sense_data.flags & SSD_KEY,
 +		d->ccb->csio.sense_data.add_sense_code,
 +		d->ccb->csio.sense_data.add_sense_code_qual);
@@ -349,7 +349,7 @@ $NetBSD: patch-cg,v 1.7 2003/10/20 12:07:23 grant Exp $
 +	fputs(b, stderr);
  	cdmessage(d,b);
  
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  	fprintf(stderr,"scsi_read error: sector=%ld length=%ld retry=%d\n",
  		begin,sectors,retry_count);
  	fprintf(stderr,"                 Sense key: %x ASC: %x ASCQ: %x\n",
@@ -375,7 +375,7 @@ $NetBSD: patch-cg,v 1.7 2003/10/20 12:07:23 grant Exp $
    return;
  }
  
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  static int check_atapi(cdrom_drive *d){
 +#ifdef __linux__
    int atapiret=-1;
@@ -423,7 +423,7 @@ $NetBSD: patch-cg,v 1.7 2003/10/20 12:07:23 grant Exp $
      return(d->is_atapi);
    }
  }  
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +static int
 +check_atapi(cdrom_drive *d)
 +{
@@ -470,7 +470,7 @@ $NetBSD: patch-cg,v 1.7 2003/10/20 12:07:23 grant Exp $
    }
  }
  
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  /* request vendor brand and model */
  unsigned char *scsi_inquiry(cdrom_drive *d){
    memcpy(d->sg_buffer,(char[]){ 0x12,0,0,0,56,0},6);
@@ -495,7 +495,7 @@ $NetBSD: patch-cg,v 1.7 2003/10/20 12:07:23 grant Exp $
    check_fua_bit(d);
  
    d->error_retry=1;
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
    d->sg=realloc(d->sg,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
    d->sg_buffer=d->sg+SG_OFF;
 +#else
diff --git a/audio/cdparanoia/patches/patch-ch b/audio/cdparanoia/patches/patch-ch
index d96177e9554..f7216564559 100644
--- a/audio/cdparanoia/patches/patch-ch
+++ b/audio/cdparanoia/patches/patch-ch
@@ -1,4 +1,4 @@
-$NetBSD: patch-ch,v 1.1 2003/10/20 12:08:03 grant Exp $
+$NetBSD: patch-ch,v 1.2 2006/03/07 06:29:04 joerg Exp $
 
 --- interface/cdda_interface.h.orig	2001-03-24 12:15:46.000000000 +1100
 +++ interface/cdda_interface.h
@@ -6,7 +6,7 @@ $NetBSD: patch-ch,v 1.1 2003/10/20 12:08:03 grant Exp $
  #include <sys/types.h>
  #include <signal.h>
  
-+#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <stdio.h>
 +#include <camlib.h>
 +#endif
@@ -14,12 +14,11 @@ $NetBSD: patch-ch,v 1.1 2003/10/20 12:08:03 grant Exp $
  #define MAXTRK 100
  
  typedef struct TOC {	/* structure of table of contents */
-@@ -46,14 +51,20 @@ typedef struct cdrom_drive{
- 
+@@ -47,13 +50,19 @@ typedef struct cdrom_drive{
    int opened; /* This struct may just represent a candidate for opening */
  
-+#ifndef __FreeBSD__
    char *cdda_device_name;
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
    char *ioctl_device_name;
  
    int cdda_fd;
@@ -41,7 +40,7 @@ $NetBSD: patch-ch,v 1.1 2003/10/20 12:08:03 grant Exp $
    int is_mmc;
  
    /* SCSI command buffer and offset pointers */
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
    unsigned char *sg;
    unsigned char *sg_buffer;
    unsigned char inqbytes[4];
diff --git a/audio/cdparanoia/patches/patch-ci b/audio/cdparanoia/patches/patch-ci
index bb3440f3c7e..06a06fcbb09 100644
--- a/audio/cdparanoia/patches/patch-ci
+++ b/audio/cdparanoia/patches/patch-ci
@@ -1,4 +1,4 @@
-$NetBSD: patch-ci,v 1.1 2003/10/20 12:08:03 grant Exp $
+$NetBSD: patch-ci,v 1.2 2006/03/07 06:29:04 joerg Exp $
 
 --- interface/interface.c.orig	2000-04-20 08:41:04.000000000 +1000
 +++ interface/interface.c
@@ -6,8 +6,8 @@ $NetBSD: patch-ci,v 1.1 2003/10/20 12:08:03 grant Exp $
        d->enable_cdda(d,0);
  
      _clean_messages(d);
-+#ifndef __FreeBSD__
      if(d->cdda_device_name)free(d->cdda_device_name);
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
      if(d->ioctl_device_name)free(d->ioctl_device_name);
      if(d->drive_model)free(d->drive_model);
      if(d->cdda_fd!=-1)close(d->cdda_fd);
diff --git a/audio/cdparanoia/patches/patch-da b/audio/cdparanoia/patches/patch-da
deleted file mode 100644
index f1c389c7967..00000000000
--- a/audio/cdparanoia/patches/patch-da
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-da,v 1.1 2005/07/13 09:07:10 wiz Exp $
-
---- interface/cdda_interface.h.orig	2005-05-31 16:03:04.000000000 +0200
-+++ interface/cdda_interface.h
-@@ -21,7 +21,7 @@
- #include <sys/types.h>
- #include <signal.h>
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <stdio.h>
- #include <camlib.h>
- #endif
-@@ -51,7 +51,7 @@ typedef struct cdrom_drive{
- 
-   int opened; /* This struct may just represent a candidate for opening */
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
-   char *cdda_device_name;
-   char *ioctl_device_name;
- 
-@@ -94,7 +94,7 @@ typedef struct cdrom_drive{
-   int is_mmc;
- 
-   /* SCSI command buffer and offset pointers */
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
-   unsigned char *sg;
-   unsigned char *sg_buffer;
-   unsigned char inqbytes[4];
diff --git a/audio/cdparanoia/patches/patch-db b/audio/cdparanoia/patches/patch-db
deleted file mode 100644
index 9440741077f..00000000000
--- a/audio/cdparanoia/patches/patch-db
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-db,v 1.1 2005/07/13 09:07:10 wiz Exp $
-
---- interface/common_interface.c.orig	2005-05-31 16:03:00.000000000 +0200
-+++ interface/common_interface.c
-@@ -23,7 +23,7 @@ int ioctl_ping_cdrom(int fd){
-   struct cdrom_volctrl volctl;
-   if (ioctl(fd, CDROMVOLREAD, &volctl)) 
-     return(1); /* failure */
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-   struct ioc_vol volctl;
-   if (ioctl(fd, CDIOCGETVOL, &volctl)) 
-     return(1); /* failure */
-@@ -220,7 +220,7 @@ int FixupTOC(cdrom_drive *d,int tracks){
-   /* For a scsi device, the ioctl must go to the specialized SCSI
-      CDROM device, not the generic device. */
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
-   if (d->ioctl_fd != -1) {
- #ifdef __linux__
-     int result;
diff --git a/audio/cdparanoia/patches/patch-dc b/audio/cdparanoia/patches/patch-dc
deleted file mode 100644
index e3e27f4a9e4..00000000000
--- a/audio/cdparanoia/patches/patch-dc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-dc,v 1.1 2005/07/13 09:07:10 wiz Exp $
-
---- interface/cooked_interface.c.orig	2005-05-31 16:02:58.000000000 +0200
-+++ interface/cooked_interface.c
-@@ -10,7 +10,7 @@
- #include "common_interface.h"
- #include "utils.h"
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- static int cooked_readtoc (cdrom_drive *d){
-   int i;
-   int tracks;
-@@ -179,7 +179,7 @@ static long cooked_read (cdrom_drive *d,
-   errx(1, "cooked_read: not implemented");
- #endif
- }
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- static int
- cooked_readtoc(cdrom_drive *d)
- {
-@@ -419,7 +419,7 @@ int cooked_init_drive (cdrom_drive *d){
-   default:
-     d->nsectors=40; 
-   }
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-   d->nsectors = 26;	/* FreeBSD only supports 64K I/O transfer size */
- #endif
-   d->enable_cdda = Dummy;
diff --git a/audio/cdparanoia/patches/patch-dd b/audio/cdparanoia/patches/patch-dd
deleted file mode 100644
index c2b05189eff..00000000000
--- a/audio/cdparanoia/patches/patch-dd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dd,v 1.1 2005/07/13 09:07:10 wiz Exp $
-
---- interface/interface.c.orig	2005-05-31 16:02:55.000000000 +0200
-+++ interface/interface.c
-@@ -29,7 +29,7 @@ int cdda_close(cdrom_drive *d){
-       d->enable_cdda(d,0);
- 
-     _clean_messages(d);
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
-     if(d->cdda_device_name)free(d->cdda_device_name);
-     if(d->ioctl_device_name)free(d->ioctl_device_name);
-     if(d->drive_model)free(d->drive_model);
diff --git a/audio/cdparanoia/patches/patch-de b/audio/cdparanoia/patches/patch-de
deleted file mode 100644
index 1957b0fddcc..00000000000
--- a/audio/cdparanoia/patches/patch-de
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-de,v 1.1 2005/07/13 09:07:10 wiz Exp $
-
---- interface/low_interface.h.orig	2005-05-31 16:02:53.000000000 +0200
-+++ interface/low_interface.h
-@@ -49,7 +49,7 @@
- #include <linux/cdrom.h>
- #include <linux/major.h>
- 
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 
- #include <sys/cdio.h>
- #include <sys/cdrio.h>
-@@ -70,7 +70,7 @@
- #define MIN_BIG_BUFF_SIZE 4096
- #ifdef __linux__
- #define SG_OFF sizeof(struct sg_header)
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- #define SG_OFF (0)
- #elif defined(__NetBSD__)
- #define SG_OFF sizeof(scsireq_t)
-@@ -85,7 +85,7 @@
- #endif
- 
- extern int  cooked_init_drive (cdrom_drive *d);
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- extern unsigned char *scsi_inquiry (cdrom_drive *d);
- #endif
- extern int  scsi_init_drive (cdrom_drive *d);
diff --git a/audio/cdparanoia/patches/patch-df b/audio/cdparanoia/patches/patch-df
deleted file mode 100644
index 519ca1a0529..00000000000
--- a/audio/cdparanoia/patches/patch-df
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-df,v 1.1 2005/07/13 09:07:10 wiz Exp $
-
---- interface/scan_devices.c.orig	2005-05-31 16:02:48.000000000 +0200
-+++ interface/scan_devices.c
-@@ -51,7 +51,7 @@ static char *cdrom_devices[]={
-   "/dev/cm206cd",
-   "/dev/gscd",
-   "/dev/optcd",NULL};
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- static char *cdrom_devices[] = {
- 	"/dev/cd?c",
- 	"/dev/acd?c",
-@@ -62,7 +62,7 @@ static char *cdrom_devices[] = {
- /* Functions here look for a cdrom drive; full init of a drive type
-    happens in interface.c */
- 
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
- cdrom_drive *cdda_find_a_cdrom(int messagedest,char **messages){
-   /* Brute force... */
-   
-@@ -142,7 +142,7 @@ cdrom_drive *cdda_identify(const char *d
- #if defined(__linux__) || defined(__NetBSD__)
-   d=cdda_identify_cooked(device,messagedest,messages);
-   if(!d)d=cdda_identify_scsi(device,NULL,messagedest,messages);
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-   d = cdda_identify_scsi(device, NULL, messagedest, messages);
-   if (d == NULL)
- 	d = cdda_identify_cooked(device, messagedest, messages);
-@@ -305,7 +305,7 @@ cdrom_drive *cdda_identify_cooked(const 
- #elif defined(__NetBSD__)
-   /* no kernel support for CD-DA */
-   return NULL;
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 	cdrom_drive *d;
- 	struct stat st;
- 
-@@ -354,7 +354,7 @@ cdda_identify_cooked_fail:
- #endif
- }
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- struct  sg_id {
-   long    l1; /* target | lun << 8 | channel << 16 | low_ino << 24 */
-   long    l2; /* Unique id */
-@@ -778,7 +778,7 @@ cdda_identify_scsi_fail:
-   if(g_fd!=-1)close(g_fd);
-   return(NULL);
- }
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- cdrom_drive *cdda_identify_scsi(const char *device,
-     const char *dummy,
-     int messagedest,
diff --git a/audio/cdparanoia/patches/patch-dg b/audio/cdparanoia/patches/patch-dg
deleted file mode 100644
index d2663090286..00000000000
--- a/audio/cdparanoia/patches/patch-dg
+++ /dev/null
@@ -1,103 +0,0 @@
-$NetBSD: patch-dg,v 1.1 2005/07/13 09:07:10 wiz Exp $
-
---- interface/scsi_interface.c.orig	2005-05-31 16:02:45.000000000 +0200
-+++ interface/scsi_interface.c
-@@ -23,7 +23,7 @@ static void tweak_SG_buffer(cdrom_drive 
-   int table,reserved;
-   char buffer[256];
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- #ifdef __linux__
-   /* maximum transfer size? */
-   if(ioctl(d->cdda_fd,SG_GET_RESERVED_SIZE,&reserved)){
-@@ -66,7 +66,7 @@ static void tweak_SG_buffer(cdrom_drive 
-     cdmessage(d,"\tCouldn't disable command queue!  Continuing anyway...\n");
-   }
- #endif
--#else /* FreeBSD */
-+#else /* FreeBSD || DragonFly */
-   d->nsectors = 26;		/* FreeBSD only supports 64K I/O transfer size */
-   d->bigbuff = d->nsectors * CD_FRAMESIZE_RAW;
-   
-@@ -104,7 +104,7 @@ static void reset_scsi(cdrom_drive *d){
-   d->enable_cdda(d,1);
- }
- 
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- static void reset_scsi(cdrom_drive *d) {
- 	d->enable_cdda(d,0);
- 
-@@ -161,7 +161,7 @@ static void clear_garbage(cdrom_drive *d
- #endif
- 
- /* process a complete scsi command. */
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- static int handle_scsi_cmd(cdrom_drive *d,
- 			   unsigned int cmd_len, 
- 			   unsigned int in_size, 
-@@ -400,7 +400,7 @@ static int handle_scsi_cmd(cdrom_drive *
-   return(0);
- }
- 
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- static int handle_scsi_cmd(cdrom_drive *d,
- 			   unsigned int cmd_len, 
- 			   unsigned int out_size, 
-@@ -1060,7 +1060,7 @@ static long scsi_read_map (cdrom_drive *
- 		(int)(sg_hd->sense_buffer[2]&0xf),
- 		(int)(sg_hd->sense_buffer[12]),
- 		(int)(sg_hd->sense_buffer[13]));
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 		d->ccb->csio.sense_data.flags & SSD_KEY,
- 		d->ccb->csio.sense_data.add_sense_code,
- 		d->ccb->csio.sense_data.add_sense_code_qual);
-@@ -1078,7 +1078,7 @@ static long scsi_read_map (cdrom_drive *
- 	fputs(b, stderr);
- 	cdmessage(d,b);
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- 	fprintf(stderr,"scsi_read error: sector=%ld length=%ld retry=%d\n",
- 		begin,sectors,retry_count);
- 	fprintf(stderr,"                 Sense key: %x ASC: %x ASCQ: %x\n",
-@@ -1546,7 +1546,7 @@ static void check_fua_bit(cdrom_drive *d
-   return;
- }
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- static int check_atapi(cdrom_drive *d){
- #ifdef __linux__
-   int atapiret=-1;
-@@ -1594,7 +1594,7 @@ static int check_atapi(cdrom_drive *d){
-     return(d->is_atapi);
-   }
- }  
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- static int
- check_atapi(cdrom_drive *d)
- {
-@@ -1681,7 +1681,7 @@ static void check_exceptions(cdrom_drive
-   }
- }
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- /* request vendor brand and model */
- unsigned char *scsi_inquiry(cdrom_drive *d){
-   memcpy(d->sg_buffer,(char[]){ 0x12,0,0,0,56,0},6);
-@@ -1762,7 +1762,7 @@ int scsi_init_drive(cdrom_drive *d){
-   check_fua_bit(d);
- 
-   d->error_retry=1;
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
-   d->sg=realloc(d->sg,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
-   d->sg_buffer=d->sg+SG_OFF;
- #else
diff --git a/audio/cdparanoia/patches/patch-dh b/audio/cdparanoia/patches/patch-dh
deleted file mode 100644
index 4bd3c94ed2b..00000000000
--- a/audio/cdparanoia/patches/patch-dh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dh,v 1.1 2005/07/13 09:07:10 wiz Exp $
-
---- interface/utils.h.orig	2005-05-31 16:00:56.000000000 +0200
-+++ interface/utils.h
-@@ -10,7 +10,7 @@
- #include <machine/bswap.h>
- #endif
- #include <err.h>	/* XXX */
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- #include <machine/endian.h>
- #endif
- #include <stdio.h>
author	joerg <joerg>	2006-03-07 06:29:03 +0000
committer	joerg <joerg>	2006-03-07 06:29:03 +0000
commit	e76f98b7da037240ca24a15c139516dc37506695 (patch)
tree	beb433fa5a71a498a8a6b0f10b0088561f94a43c /audio
parent	9fcb3f0f4e65234ddd9394a9f24cf6a80b3a4892 (diff)
download	pkgsrc-e76f98b7da037240ca24a15c139516dc37506695.tar.gz