Bug#542639: kdemultimedia: FTBFS on GNU/kFreeBSD (tiny fixup)

[Petr Salinger <Petr.Salinger@seznam.cz>]

Package: kdemultimedia
Version: 4:4.3.0-1
Severity: important
Tags: patch
User: debian-bsd@lists.debian.org
Usertags: kfreebsd

Hi,

the current version fails to build on GNU/kFreeBSD.

It needs some "|| defined(__FreeBSD_kernel__)".
Please find attached patch with them.

It would also be nice if you can ask upstream
to include this changes.

Thanks in advance

                        Petr

only in patch2:
unchanged:
--- kdemultimedia-4.3.0.orig/libkcompactdisc/wmlib/plat_freebsd.c
+++ kdemultimedia-4.3.0/libkcompactdisc/wmlib/plat_freebsd.c
@@ -26,7 +26,7 @@
  *
  */
 
-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD)
+#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD) || defined(__FreeBSD_kernel__)
 
 #include <errno.h>
 #include <stdio.h>
@@ -70,7 +70,7 @@
 
 # define LEFT_PORT 0
 # define RIGHT_PORT 1
-# if __FreeBSD_version < 300000
+# if (__FreeBSD_version < 300000) && (__FreeBSD_kernel_version < 300000)
 #  include <scsi.h>
 # endif
 
only in patch2:
unchanged:
--- kdemultimedia-4.3.0.orig/libkcompactdisc/wmlib/include/wm_config.h
+++ kdemultimedia-4.3.0/libkcompactdisc/wmlib/include/wm_config.h
@@ -106,9 +106,9 @@
  ***  ******  **  **  ******  ******  **  ******  **  *  **********
  ***  ******  **  **      **      **     ****    ***    ***********
  ******************************************************************/
-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__DragonFly__)
+#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
 
-#if (defined(__FreeBSD_version) && __FreeBSD_version >= 500100) || defined(__DragonFly__)
+#if (defined(__FreeBSD_version) && __FreeBSD_version >= 500100) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
 #define DEFAULT_CD_DEVICE	"/dev/acd0"
 #else
 #define DEFAULT_CD_DEVICE	"/dev/acd0c"