Rework broken thread detection:

- try libpthread
- fallback to ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
Run the check only once, to avoid the second run overwriting the results
of the first.

Add DragonFly support. Fix errno.

6 files changed, 346 insertions, 27 deletions

diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 3da229a3796..5c2ebfd55ca 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,16 +1,19 @@
-$NetBSD: distinfo,v 1.23 2005/12/11 11:20:51 markd Exp $
+$NetBSD: distinfo,v 1.24 2006/01/20 03:51:25 joerg Exp $
 
 SHA1 (kdemultimedia-3.5.0.tar.bz2) = 0d64a4d748dee95d7f7dbc03eb4f538f8c0a133d
 RMD160 (kdemultimedia-3.5.0.tar.bz2) = 1609307178bed9f46c19fb99743789d4799f1b54
 Size (kdemultimedia-3.5.0.tar.bz2) = 5519386 bytes
-SHA1 (patch-aa) = c722daaac3aa027eadeaeab8027003098d13486e
+SHA1 (patch-aa) = 42309f8b9b3c30f29af09d7f84255a02cd8cdf91
 SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70
 SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413
-SHA1 (patch-ad) = faf216d3b26c6dfed1b2fa919de69b14a92d0966
+SHA1 (patch-ad) = 4a84cd2246d61e521b1ce576328c755915304b10
 SHA1 (patch-ae) = 286ee08e2478bd9a417ae1270a0a851fb470570a
 SHA1 (patch-af) = 0336b3def99c649a635e6f5eb0cc962944e890b2
 SHA1 (patch-ag) = c9d1d9d3cf8f18ed9bc8c2054dc641af961d8fb1
 SHA1 (patch-ah) = e84b9dc302a5c8bb7259cd23343bfbc80c287cf2
+SHA1 (patch-ai) = 8f724e5e96996913906dfd2034f577fee66d0db2
+SHA1 (patch-aj) = 853651ba68cbd2dc8906a0753bb17a89b46153af
+SHA1 (patch-ak) = b55f0915a356949b00c588b25c0aa435aedc109d
 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
diff --git a/multimedia/kdemultimedia3/patches/patch-aa b/multimedia/kdemultimedia3/patches/patch-aa
index e77d8871d7b..2dc8363d9bc 100644
--- a/multimedia/kdemultimedia3/patches/patch-aa
+++ b/multimedia/kdemultimedia3/patches/patch-aa
@@ -1,8 +1,141 @@
-$NetBSD: patch-aa,v 1.7 2005/12/11 11:20:51 markd Exp $
+$NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
 
---- configure.orig	2005-11-26 20:14:02.000000000 +1300
+--- configure.orig	2005-11-26 07:14:02.000000000 +0000
 +++ configure
-@@ -34500,7 +34500,7 @@ fi
+@@ -28679,34 +28679,15 @@ if test $kde_qtver = 1; then
+    kde_qt_dirs="$QTDIR /usr/lib/qt"
+ fi
+ 
++  LIBPTHREAD=""
+ 
+-                LIBPTHREAD=""
+-
+-  if test -n "$PTHREAD_LIBS"; then
+-    if test "x$PTHREAD_LIBS" = "x-pthread" ; then
+-      LIBPTHREAD="PTHREAD"
+-    else
+-      PTHREAD_LIBS_save="$PTHREAD_LIBS"
+-      PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
+-      echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
+-
+-     kde_save_LDFLAGS="$LDFLAGS"
+-          kde_save_LIBS="$LIBS"
+-     LDFLAGS="$LDFLAGS $all_libraries"
+-     case $host_os in
+-      aix*) LDFLAGS="-brtl $LDFLAGS"
+-	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+-	;;
+-     esac
+-     as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l$PTHREAD_LIBS  $LIBS"
++LIBS="-lpthread  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -28751,38 +28732,26 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  eval "$as_ac_Lib=yes"
++  ac_cv_lib_pthread_pthread_create=yes
++  LIBPTHREAD="-lpthread"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_Lib=no"
++ac_cv_lib_pthread_pthread_create=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+-  LIBPTHREAD="$PTHREAD_LIBS_save"
+-fi
+-
+-     LDFLAGS="$kde_save_LDFLAGS"
+-     LIBS="$kde_save_LIBS"
+-
+-      PTHREAD_LIBS="$PTHREAD_LIBS_save"
+-    fi
+-  fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+ 
+-    if test -z "$LIBPTHREAD"; then
+-    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
++  if test -z "$LIBPTHREAD"; then
++    echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -28828,6 +28797,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_pthread_pthread_create=yes
++  LIBPTHREAD="$PTHREAD_LDFLAGS $PTHREAD_LIBS"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -28837,13 +28807,9 @@ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+-fi
++
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+-if test $ac_cv_lib_pthread_pthread_create = yes; then
+-  LIBPTHREAD="-lpthread"
+-fi
+-
+   fi
+ 
+     if test -z "$LIBPTHREAD" ; then
+@@ -28905,12 +28871,6 @@ rm -f conftest.err conftest.$ac_objext \
+     LIBS=$kde_safe_libs
+   fi
+ 
+-    if test "x$LIBPTHREAD" = "xPTHREAD" ; then
+-    LIBPTHREAD=""
+-  fi
+-
+-
+-
+ 
+       USE_THREADS=""
+       if test -z "$LIBPTHREAD"; then
+@@ -34433,7 +34393,7 @@ if test "${ac_cv_lib_ossaudio__oss_ioctl
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lossaudio  $LIBS"
++LIBS="${LIBOSSAUDIO}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34500,7 +34460,7 @@ fi
  
    if test "x$have_ossaudio" = xyes; then
      # for kmix/ and akode/
@@ -11,7 +144,7 @@ $NetBSD: patch-aa,v 1.7 2005/12/11 11:20:51 markd Exp $
    fi
  
  
-@@ -35097,7 +35097,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -35097,7 +35057,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -20,7 +153,7 @@ $NetBSD: patch-aa,v 1.7 2005/12/11 11:20:51 markd Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -35141,7 +35141,7 @@ _ACEOF
+@@ -35141,7 +35101,7 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -29,7 +162,7 @@ $NetBSD: patch-aa,v 1.7 2005/12/11 11:20:51 markd Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -37888,7 +37888,7 @@ if test "${ac_cv_lib_FLAC_FLAC__seekable
+@@ -37888,7 +37848,7 @@ if test "${ac_cv_lib_FLAC_FLAC__seekable
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -38,7 +171,7 @@ $NetBSD: patch-aa,v 1.7 2005/12/11 11:20:51 markd Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -40058,8 +40058,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -40058,8 +40018,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -64,7 +197,7 @@ $NetBSD: patch-aa,v 1.7 2005/12/11 11:20:51 markd Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -40122,7 +40137,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -40122,7 +40097,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -87,7 +220,7 @@ $NetBSD: patch-aa,v 1.7 2005/12/11 11:20:51 markd Exp $
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -40186,7 +40216,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -40186,7 +40176,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -110,18 +243,141 @@ $NetBSD: patch-aa,v 1.7 2005/12/11 11:20:51 markd Exp $
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -40536,10 +40581,10 @@ _ACEOF
+@@ -40258,6 +40263,9 @@ case "$OS_TYPE" in
+   SunOS)
+     kde_mpeglib_compiles=yes
      ;;
++  DragonFly)
++    kde_mpeglib_compiles=yes
++    ;;
+   *)
+     echo "$as_me:$LINENO: result: *** We disable mpeglib for this platform ***" >&5
+ echo "${ECHO_T}*** We disable mpeglib for this platform ***" >&6
+@@ -40267,33 +40275,14 @@ esac
+ 
+ 
+ 
+-                LIBPTHREAD=""
+ 
+-  if test -n "$PTHREAD_LIBS"; then
+-    if test "x$PTHREAD_LIBS" = "x-pthread" ; then
+-      LIBPTHREAD="PTHREAD"
+-    else
+-      PTHREAD_LIBS_save="$PTHREAD_LIBS"
+-      PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
+-      echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
+-
+-     kde_save_LDFLAGS="$LDFLAGS"
+-          kde_save_LIBS="$LIBS"
+-     LDFLAGS="$LDFLAGS $all_libraries"
+-     case $host_os in
+-      aix*) LDFLAGS="-brtl $LDFLAGS"
+-	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+-	;;
+-     esac
+-     as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l$PTHREAD_LIBS  $LIBS"
++LIBS="-lpthread  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -40338,31 +40327,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  eval "$as_ac_Lib=yes"
++  ac_cv_lib_pthread_pthread_create=yes
++  LIBPTHREAD="-lpthread"
++
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_Lib=no"
++ac_cv_lib_pthread_pthread_create=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+-  LIBPTHREAD="$PTHREAD_LIBS_save"
+-fi
+-
+-     LDFLAGS="$kde_save_LDFLAGS"
+-     LIBS="$kde_save_LIBS"
+-
+-      PTHREAD_LIBS="$PTHREAD_LIBS_save"
+-    fi
+-  fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+ 
+-    if test -z "$LIBPTHREAD"; then
++  if test -z "$LIBPTHREAD"; then
+     echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+ echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+@@ -40415,6 +40396,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_pthread_pthread_create=yes
++  LIBPTHREAD="$PTHREAD_LDFLAGS $PTHREAD_LIBS"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -40427,10 +40409,6 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+-if test $ac_cv_lib_pthread_pthread_create = yes; then
+-  LIBPTHREAD="-lpthread"
+-fi
+-
+   fi
  
-   NetBSD)
--    echo "$as_me:$LINENO: result: NetBSD :Unknown hardware. You will have problems!!" >&5
--echo "${ECHO_T}NetBSD :Unknown hardware. You will have problems!!" >&6
--    OS_TYPE="BSD"
+     if test -z "$LIBPTHREAD" ; then
+@@ -40492,10 +40470,6 @@ rm -f conftest.err conftest.$ac_objext \
+     LIBS=$kde_safe_libs
+   fi
+ 
+-    if test "x$LIBPTHREAD" = "xPTHREAD" ; then
+-    LIBPTHREAD=""
+-  fi
 -
-+     echo "$as_me:$LINENO: result: using -lpthread" >&5
-+     echo $ECHO_N "using -lpthread... $ECHO_C" >&6
-+     OS_TYPE="BSD"
-+     LIBPTHREAD="-lpthread"
+ 
+ 
+ case "$OS_TYPE" in
+@@ -40517,7 +40491,7 @@ _ACEOF
+ 
+     ;;
+ 
+-  FreeBSD)
++  FreeBSD | DragonFly)
+     OS_TYPE="BSD"
+ 
  cat >>confdefs.h <<\_ACEOF
- #define OS_BSD 1
+@@ -44966,11 +44940,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ { (exit 0); exit 0; }
  _ACEOF
+-if test "x$with_fast_perl" = "xyes"; then    
+-  perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS    \
+-    || mv $CONFIG_STATUS.bak $CONFIG_STATUS    
+-  rm -f $CONFIG_STATUS.bak
+-fi    
+ chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+ 
diff --git a/multimedia/kdemultimedia3/patches/patch-ad b/multimedia/kdemultimedia3/patches/patch-ad
index c0052bee910..dfeb4fbeebb 100644
--- a/multimedia/kdemultimedia3/patches/patch-ad
+++ b/multimedia/kdemultimedia3/patches/patch-ad
@@ -1,8 +1,26 @@
-$NetBSD: patch-ad,v 1.2 2005/09/06 08:10:59 abs Exp $
+$NetBSD: patch-ad,v 1.3 2006/01/20 03:51:25 joerg Exp $
 
---- kscd/libwm/plat_freebsd.c.orig	2003-05-05 22:19:39.000000000 +1000
-+++ kscd/libwm/plat_freebsd.c	2004-05-04 19:17:17.000000000 +1000
-@@ -380,6 +380,14 @@
+--- kscd/libwm/plat_freebsd.c.orig	2005-10-05 13:22:14.000000000 +0000
++++ kscd/libwm/plat_freebsd.c
+@@ -30,7 +30,7 @@
+  *
+  */
+ 
+-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD)
++#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD) || defined(__DragonFly__)
+ 
+ #include <errno.h>
+ #include <stdio.h>
+@@ -61,7 +61,7 @@
+ #else
+ # define LEFT_PORT 0
+ # define RIGHT_PORT 1
+-# if __FreeBSD_version < 300000
++# if defined(__FreeBSD_version) && __FreeBSD_version < 300000
+ #  include <scsi.h>
+ # endif
+ #endif
+@@ -378,6 +378,14 @@ gen_stop( struct wm_drive *d)
    return (ioctl(d->fd, CDIOCSTOP));
  } /* gen_stop() */
  
@@ -17,7 +35,7 @@ $NetBSD: patch-ad,v 1.2 2005/09/06 08:10:59 abs Exp $
  /*----------------------------------------*
   * Eject the current CD, if there is one.
   *----------------------------------------*/
-@@ -388,14 +396,22 @@
+@@ -386,14 +394,22 @@ gen_eject( struct wm_drive *d )
  {
    /* On some systems, we can check to see if the CD is mounted. */
    struct stat	stbuf;
diff --git a/multimedia/kdemultimedia3/patches/patch-ai b/multimedia/kdemultimedia3/patches/patch-ai
new file mode 100644
index 00000000000..ca9dc0a1949
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-ai
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.1 2006/01/20 03:51:25 joerg Exp $
+
+--- mpg123_artsplugin/mpg123/httpget.c.orig	2005-11-15 11:21:01.000000000 +0000
++++ mpg123_artsplugin/mpg123/httpget.c
+@@ -18,11 +18,9 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <ctype.h>
+ 
+-extern int errno;
+-
+ #include "mpg123.h"
+ 
+ #ifndef INADDR_NONE
diff --git a/multimedia/kdemultimedia3/patches/patch-aj b/multimedia/kdemultimedia3/patches/patch-aj
new file mode 100644
index 00000000000..f7f341406c5
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-aj
@@ -0,0 +1,9 @@
+$NetBSD: patch-aj,v 1.3 2006/01/20 03:51:25 joerg Exp $
+
+--- oggvorbis_artsplugin/oggPlayObject_impl.h.orig	2005-11-15 11:27:27.000000000 +0000
++++ oggvorbis_artsplugin/oggPlayObject_impl.h
+@@ -3,3 +3,3 @@
+ 
+-#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
++#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) || defined(__DragonFly__)
+ /* union semun is defined by including <sys/sem.h> */
diff --git a/multimedia/kdemultimedia3/patches/patch-ak b/multimedia/kdemultimedia3/patches/patch-ak
new file mode 100644
index 00000000000..16f56a8df6a
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-ak
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.3 2006/01/20 03:51:25 joerg Exp $
+
+--- kscd/libwm/include/wm_config.h.orig	2005-11-15 11:59:33.000000000 +0000
++++ kscd/libwm/include/wm_config.h
+@@ -139,6 +139,11 @@
+ 
+ #endif /* freebsd */
+ 
++/* DragonFly */
++#if defined(__DragonFly__)
++#define	DEFAULT_CD_DEVICE	"/dev/acd0c"
++#endif
++
+ /******************************************************************
+  * NetBSD
+  ******************************************************************