Build and install kscd. Doesn't let me play CDs on my laptop, but I think

that's a problem elsewhere.

4 files changed, 100 insertions, 15 deletions

diff --git a/audio/kdemultimedia2/patches/patch-aa b/audio/kdemultimedia2/patches/patch-aa
index 6fa6dc685ab..834ceaa9365 100644
--- a/audio/kdemultimedia2/patches/patch-aa
+++ b/audio/kdemultimedia2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/03/15 15:35:56 skrll Exp $
+$NetBSD: patch-aa,v 1.3 2001/04/17 16:03:19 skrll Exp $
 
 --- configure.orig	Wed Feb 21 11:01:31 2001
 +++ configure
@@ -11,7 +11,15 @@ $NetBSD: patch-aa,v 1.2 2001/03/15 15:35:56 skrll Exp $
        ;;
      *)
        echo "configure: warning: No --enable-audio=default audio for $target" 1>&2
-@@ -11339,7 +11339,7 @@
+@@ -11216,6 +11216,7 @@
+ case "$host" in
+   *-*-linux*) kscd_compile=yes;;
+   *-*-*bsdi*) kscd_compile=yes;; 
++  *-*-*netbsd*) kscd_compile=yes;; 
+   *-*-*bsd*) kscd_compile=no;;
+   *) kscd_compile=yes;;
+ esac
+@@ -11339,7 +11340,7 @@
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
@@ -20,7 +28,7 @@ $NetBSD: patch-aa,v 1.2 2001/03/15 15:35:56 skrll Exp $
  { (eval echo configure:11344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
-@@ -11366,7 +11366,7 @@
+@@ -11366,7 +11367,7 @@
  fi
  done
  
@@ -29,7 +37,7 @@ $NetBSD: patch-aa,v 1.2 2001/03/15 15:35:56 skrll Exp $
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -11879,13 +11879,16 @@
+@@ -11879,13 +11880,16 @@
  
  
  case "$ARCH_TYPE" in
@@ -53,7 +61,7 @@ $NetBSD: patch-aa,v 1.2 2001/03/15 15:35:56 skrll Exp $
  
    *)
      echo "$ac_t""Non Intel." 1>&6
-@@ -11897,6 +11900,9 @@
+@@ -11897,6 +11901,9 @@
  kde_mpeglib_compiles=no
  
  case "$OS_TYPE" in
@@ -63,7 +71,7 @@ $NetBSD: patch-aa,v 1.2 2001/03/15 15:35:56 skrll Exp $
    Linux)
      kde_mpeglib_compiles=yes
      ;;
-@@ -12105,6 +12111,7 @@
+@@ -12105,6 +12112,7 @@
    NetBSD)
      echo "$ac_t""NetBSD :Unknown hardware. You will have problems!!" 1>&6
      OS_TYPE="BSD"
diff --git a/audio/kdemultimedia2/patches/patch-af b/audio/kdemultimedia2/patches/patch-af
index 39ba3459422..2f2104eb53d 100644
--- a/audio/kdemultimedia2/patches/patch-af
+++ b/audio/kdemultimedia2/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/03/14 16:14:08 skrll Exp $
+$NetBSD: patch-af,v 1.2 2001/04/17 16:03:19 skrll Exp $
 
 --- kscd/libwm/plat_freebsd.c.orig	Sun Feb 18 15:30:03 2001
 +++ kscd/libwm/plat_freebsd.c
@@ -12,11 +12,13 @@ $NetBSD: patch-af,v 1.1.1.1 2001/03/14 16:14:08 skrll Exp $
 -#if defined(__NetBSD__) || defined(__OpenBSD__) 
 +#if defined(__OpenBSD__) 
  # define MSF_MINUTES 1
-@@ -65,3 +65,2 @@
- # endif
--#endif
- 
-@@ -232,7 +231,2 @@
+@@ -59,2 +59,5 @@
+ # include "/sys/scsi/scsi_cd.h"
++#elif defined(__NetBSD__)
++#include <sys/scsiio.h>
++#include <dev/scsipi/scsipi_cd.h>
+ #else
+@@ -232,7 +235,2 @@
      dopos:
 -#ifdef __NetBSD__
 -      *pos = scd.what.position.absaddr[MSF_MINUTES] * 60 * 75 +
@@ -24,11 +26,11 @@ $NetBSD: patch-af,v 1.1.1.1 2001/03/14 16:14:08 skrll Exp $
 -	scd.what.position.absaddr[MSF_FRAMES];
 -#else
        *pos = scd.what.position.absaddr.msf.minute * 60 * 75 +
-@@ -240,3 +234,2 @@
+@@ -240,3 +238,2 @@
  	scd.what.position.absaddr.msf.frame;
 -#endif
        *track = scd.what.position.track_number;
-@@ -307,7 +300,2 @@
+@@ -307,7 +304,2 @@
    
 -#ifdef __NetBSD__
 -  *startframe = toc_buffer.addr[MSF_MINUTES]*60*75 +
@@ -36,7 +38,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/03/14 16:14:08 skrll Exp $
 -    toc_buffer.addr[MSF_FRAMES];
 -#else
    *startframe = toc_buffer.addr.msf.minute*60*75 +
-@@ -315,3 +303,2 @@
+@@ -315,3 +307,2 @@
      toc_buffer.addr.msf.frame;
 -#endif
    
diff --git a/audio/kdemultimedia2/patches/patch-ap b/audio/kdemultimedia2/patches/patch-ap
new file mode 100644
index 00000000000..5f82fb7cb6d
--- /dev/null
+++ b/audio/kdemultimedia2/patches/patch-ap
@@ -0,0 +1,32 @@
+$NetBSD: patch-ap,v 1.1 2001/04/17 16:03:20 skrll Exp $
+
+--- kscd/libwm/include/wm_config.h.orig	Mon Jan 22 12:14:45 2001
++++ kscd/libwm/include/wm_config.h
+@@ -128,9 +128,26 @@
+  ***  ******  **  **  ******  ******  **  ******  **  *  **********
+  ***  ******  **  **      **      **     ****    ***    ***********
+  ******************************************************************/
+-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined(__NetBSD)
++#if defined(__FreeBSD__) || defined(__FreeBSD)
+ 
+ #define DEFAULT_CD_DEVICE	"/dev/rmatcd0c"
++
++
++#endif /* freebsd */
++
++/******************************************************************
++ * NetBSD
++ ******************************************************************
++ ***   ***  **      **      **     ****    ***    *****************
++ ***    **  **  ********  ****  **  **  ******  *  ****************
++ ***  *  *  **    ******  ****    ******  ****  **  ***************
++ ***  **    **  ********  ****  **  ******  **  *  ****************
++ ***  ***   **      ****  ****     ****    ***    *****************
++ ******************************************************************/
++*******************************/
++#if defined(__NetBSD__) || defined(__NetBSD)
++
++#define DEFAULT_CD_DEVICE	"/dev/rcd0d"
+ 
+ #endif /* freebsd */
+ 
diff --git a/audio/kdemultimedia2/patches/patch-aq b/audio/kdemultimedia2/patches/patch-aq
new file mode 100644
index 00000000000..d5752d39fd7
--- /dev/null
+++ b/audio/kdemultimedia2/patches/patch-aq
@@ -0,0 +1,43 @@
+$NetBSD: patch-aq,v 1.1 2001/04/17 16:03:20 skrll Exp $
+
+--- kscd/config.h.std.orig	Wed Aug 23 06:31:58 2000
++++ kscd/config.h.std
+@@ -120,18 +120,24 @@
+ 
+ /*************************************************************************
+  *
+- *	FreeBSD/NetBSD
++ *	NetBSD
+  *
+  *************************************************************************/
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
+-
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__)
+ 
+ /* Is this the most commonly used cd device on FreeBSD ? */
+ #define DEFAULT_CD_DEVICE       "/dev/rmatcd0c"
+ 
+-#else /* __NetBSD__ */
++#endif
++
++/*************************************************************************
++ *
++ *	NetBSD
++ *
++ *************************************************************************/
++
++#if defined(__NetBSD__)
+ 
+ /* The raw partition on disk device is *d on i386, *c on everything else */
+ #ifdef __i386__
+@@ -140,7 +146,7 @@
+ #define DEFAULT_CD_DEVICE       "/dev/rcd0c"
+ #endif
+ 
+-#endif /* __FreeBSD__ */
++#endif /* __NetBSD__ */
+ 
+ /* Please have a look at void KSCD::playClicked() in kscd.cpp. You will find
+    there the following code: