7 files changed, 21 insertions, 10 deletions

diff --git a/audio/xcdplayer/files/cdrom_freebsd.c b/audio/xcdplayer/files/cdrom_freebsd.c
index f7cfa87a9409..29c1af204792 100644
--- a/audio/xcdplayer/files/cdrom_freebsd.c
+++ b/audio/xcdplayer/files/cdrom_freebsd.c
@@ -1,4 +1,5 @@
 /* $FreeBSD$ */
+/* $NetBSD: pkgsrc/audio/xcdplayer/files/cdrom_freebsd.c,v 1.6 2005/12/11 20:48:46 joerg Exp $ */
 /*
  * Copyright (C) 1990 Regents of the University of California.
  *
@@ -22,10 +23,6 @@ static int c;
 # include <sys/param.h>
 # include <sys/stat.h>
 # include <string.h>
-# if __FreeBSD_version >= 500003
-# include <sys/bio.h>
-# endif
-# include <sys/buf.h>
 # include <sys/time.h>
 
 #include <sys/ioctl.h>
@@ -36,8 +33,13 @@ static int c;
 # include "cdrom_freebsd.h"
 # include "app.h"
 
+#ifdef __NetBSD__
+static char     cdrom[] =       "/dev/rcd0d";
+static char     cdrom1[] =      "/dev/rmcd0d";
+#else
 static char     cdrom[] =       "/dev/cd0c";
 static char     cdrom1[] =      "/dev/mcd0c";
+#endif
 
 cdrom_info	cdi;
 char		info_filename[256];
diff --git a/audio/xcdplayer/files/patch-button__setup.c b/audio/xcdplayer/files/patch-button__setup.c
index b00d12201e3d..0c7f0d9ccabf 100644
--- a/audio/xcdplayer/files/patch-button__setup.c
+++ b/audio/xcdplayer/files/patch-button__setup.c
@@ -1,5 +1,6 @@
 
 $FreeBSD$
+$NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ad,v 1.4 2005/12/11 20:48:46 joerg Exp $
 
 --- button_setup.c.orig	Tue Jan 12 19:59:47 1993
 +++ button_setup.c	Mon Aug 25 00:38:35 2003
@@ -7,7 +8,7 @@ $FreeBSD$
  # include <X11/Xaw/Toggle.h>
  
  # include "cdrom_globs.h"
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +# include "cdrom_freebsd.h"
 +#endif
  #ifdef sun
diff --git a/audio/xcdplayer/files/patch-cdrom__callb.c b/audio/xcdplayer/files/patch-cdrom__callb.c
index 7ccfe9477416..bcafee76e7d5 100644
--- a/audio/xcdplayer/files/patch-cdrom__callb.c
+++ b/audio/xcdplayer/files/patch-cdrom__callb.c
@@ -1,5 +1,6 @@
 
 $FreeBSD$
+$NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ae,v 1.4 2005/12/11 20:48:46 joerg Exp $
 
 --- cdrom_callb.c.orig	Tue Jan 12 19:59:48 1993
 +++ cdrom_callb.c	Mon Aug 25 00:38:35 2003
@@ -7,7 +8,7 @@ $FreeBSD$
  
  # include "debug.h"
  # include "cdrom_globs.h"
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +# include "cdrom_freebsd.h"
 +#endif
  #ifdef sun
diff --git a/audio/xcdplayer/files/patch-internals.c b/audio/xcdplayer/files/patch-internals.c
index 618a26fc496c..3b5bd6b58cb0 100644
--- a/audio/xcdplayer/files/patch-internals.c
+++ b/audio/xcdplayer/files/patch-internals.c
@@ -1,10 +1,14 @@
+
+$FreeBSD$
+$NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ah,v 1.4 2005/12/11 20:48:46 joerg Exp $
+
 --- internals.c.orig	Tue Jan 12 19:59:45 1993
 +++ internals.c	Wed May 30 19:20:48 2007
 @@ -22,6 +22,9 @@
  
  # include "debug.h"
  # include "cdrom_globs.h"
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +# include "cdrom_freebsd.h"
 +#endif
  #ifdef sun
diff --git a/audio/xcdplayer/files/patch-logo__setup.c b/audio/xcdplayer/files/patch-logo__setup.c
index 5231b0c79852..0e1cc5aae755 100644
--- a/audio/xcdplayer/files/patch-logo__setup.c
+++ b/audio/xcdplayer/files/patch-logo__setup.c
@@ -1,5 +1,6 @@
 
 $FreeBSD$
+$NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ai,v 1.4 2005/12/11 20:48:46 joerg Exp $
 
 --- logo_setup.c.orig	Tue Jan 12 19:59:46 1993
 +++ logo_setup.c	Mon Aug 25 00:38:35 2003
@@ -7,7 +8,7 @@ $FreeBSD$
  # include <stdio.h>
  
  # include "cdrom_globs.h"
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +# include "cdrom_freebsd.h"
 +#endif
  #ifdef sun
diff --git a/audio/xcdplayer/files/patch-program.c b/audio/xcdplayer/files/patch-program.c
index bbe12975818d..c5b8d68cf40f 100644
--- a/audio/xcdplayer/files/patch-program.c
+++ b/audio/xcdplayer/files/patch-program.c
@@ -1,5 +1,6 @@
 
 $FreeBSD$
+$NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ak,v 1.4 2005/12/11 20:48:46 joerg Exp $
 
 --- program.c.orig	Tue Jan 12 19:59:49 1993
 +++ program.c	Mon Aug 25 00:38:35 2003
@@ -12,7 +13,7 @@ $FreeBSD$
  
  # include "debug.h"
  # include "cdrom_globs.h"
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +# include "cdrom_freebsd.h"
 +#endif
  #ifdef sun
diff --git a/audio/xcdplayer/files/patch-shuffle.c b/audio/xcdplayer/files/patch-shuffle.c
index eea01d2c4361..29a117b47971 100644
--- a/audio/xcdplayer/files/patch-shuffle.c
+++ b/audio/xcdplayer/files/patch-shuffle.c
@@ -1,5 +1,6 @@
 
 $FreeBSD$
+$NetBSD: pkgsrc/audio/xcdplayer/patches/patch-al,v 1.4 2005/12/11 20:48:46 joerg Exp $
 
 --- shuffle.c.orig	Tue Jan 12 19:59:38 1993
 +++ shuffle.c	Mon Aug 25 00:38:35 2003
@@ -7,7 +8,7 @@ $FreeBSD$
  
  # include "debug.h"
  # include "cdrom_globs.h"
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +# include "cdrom_freebsd.h"
 +#endif
  #ifdef sun