3 files changed, 46 insertions, 84 deletions
diff --git a/sysutils/cdrdao/files/patch-ac b/sysutils/cdrdao/files/patch-ac
deleted file mode 100644
index d7f69061adf8..000000000000
--- a/sysutils/cdrdao/files/patch-ac
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -rc ../old/cdrdao-1.1.4/configure ./configure
-*** ../old/cdrdao-1.1.4/configure	Sun Aug 27 13:37:08 2000
---- ./configure	Fri Oct 20 10:32:47 2000
-***************
-*** 3234,3239 ****
---- 3234,3240 ----
-    
-    
-  
-+ xdao=no
-  
-  if test $xdao != xdao; then
-    xdao=
-***************
-*** 3263,3269 ****
-    scsi_if_src=ScsiIf-lib.cc
-    
-    case "$host" in
-!     *-freebsd3* | *-freebsd4*)
-  			       scsilib_libs="$scsilib_libs -lcam"
-  			       ;;
-    esac
---- 3264,3270 ----
-    scsi_if_src=ScsiIf-lib.cc
-    
-    case "$host" in
-!     *-freebsd3* | *-freebsd4* | *-freebsd5*)
-  			       scsilib_libs="$scsilib_libs -lcam"
-  			       ;;
-    esac
-***************
-*** 3279,3285 ****
-  	       scsi_if_src="ScsiIf-linux.cc sg_err.cc"
-  	       ;;
-      
-!     *-freebsd3* | *-freebsd4*)
-  			       scsi_if_src="ScsiIf-freebsd-cam.cc"
-  			       scsilib_libs="-lcam"
-  			       ;;
---- 3280,3286 ----
-  	       scsi_if_src="ScsiIf-linux.cc sg_err.cc"
-  	       ;;
-      
-!     *-freebsd3* | *-freebsd4* | *-freebsd5*)
-  			       scsi_if_src="ScsiIf-freebsd-cam.cc"
-  			       scsilib_libs="-lcam"
-  			       ;;
-***************
-*** 3311,3317 ****
-  esac
-  
-  case "$host" in
-!   *-linux-*)
-  	     sound_if_src=SoundIF-linux.cc
-  	     ;;
-  
---- 3312,3318 ----
-  esac
-  
-  case "$host" in
-!   *-linux-* | *-freebsd*)
-  	     sound_if_src=SoundIF-linux.cc
-  	     ;;
-  
-diff -rc ../old/cdrdao-1.1.4/xdao/SoundIF-linux.cc ./xdao/SoundIF-linux.cc
-*** ../old/cdrdao-1.1.4/xdao/SoundIF-linux.cc	Sun Aug 27 13:37:11 2000
---- ./xdao/SoundIF-linux.cc	Fri Oct 20 10:32:22 2000
-***************
-*** 34,40 ****
---- 34,47 ----
-   *
-   */
-  
-+ # if defined(__FreeBSD__)
-+ #include <machine/soundcard.h>
-+ # if !defined(SNDCTL_DSP_CHANNELS)
-+ #   define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO
-+ # endif
-+ # else 
-  #include <linux/soundcard.h>
-+ # endif
-  
-  #include <stdio.h>
-  #include <assert.h>
diff --git a/sysutils/cdrdao/files/patch-configure b/sysutils/cdrdao/files/patch-configure
new file mode 100644
index 000000000000..100da928fe04
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-configure
@@ -0,0 +1,29 @@
+--- configure.orig	Mon Oct  7 03:53:55 2002
++++ configure	Sat Oct 12 18:06:18 2002
+@@ -6107,7 +6107,7 @@
+   scsi_if_src=ScsiIf-lib.cc
+ 
+   case "$host" in
+-    *-freebsd3* | *-freebsd4*)
++    *-freebsd3* | *-freebsd4* | *-freebsd5* )
+ 			       scsilib_libs="$scsilib_libs -lcam"
+ 			       ;;
+   esac
+@@ -6123,7 +6123,7 @@
+ 	       scsi_if_src="ScsiIf-linux.cc sg_err.cc"
+ 	       ;;
+ 
+-    *-freebsd3* | *-freebsd4*)
++    *-freebsd3* | *-freebsd4* | *-freebsd5* )
+ 			       scsi_if_src="ScsiIf-freebsd-cam.cc"
+ 			       scsilib_libs="-lcam"
+ 			       ;;
+@@ -6164,7 +6164,7 @@
+ esac
+ 
+ case "$host" in
+-  *-linux-*)
++  *-linux-* | *-freebsd* )
+ 	     sound_if_src=SoundIF-linux.cc
+ 	     ;;
+ 
diff --git a/sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc b/sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc
new file mode 100644
index 000000000000..ab7b04f65292
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc
@@ -0,0 +1,17 @@
+--- xdao/SoundIF-linux.cc.orig	Mon Oct  7 03:53:56 2002
++++ xdao/SoundIF-linux.cc	Sat Oct 12 17:32:10 2002
+@@ -34,7 +34,14 @@
+  *
+  */
+ 
++# if defined(__FreeBSD__)
++#include <sys/soundcard.h>
++# if !defined(SNDCTL_DSP_CHANNELS)
++#   define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO
++# endif
++# else 
+ #include <linux/soundcard.h>
++# endif
+ 
+ #include <stdio.h>
+ #include <assert.h>