Support for DragonFlyBSD, based on patches from Joerg Sonnenberger.

8 files changed, 176 insertions, 48 deletions

diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index f5ac7fa9e28..c5b44c4e1e8 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.38 2005/02/23 22:24:08 agc Exp $
+$NetBSD: distinfo,v 1.39 2005/05/20 20:08:40 wiz Exp $
 
 SHA1 (SDL-1.2.8.tar.gz) = 26f2104a60a28914b809d3cb77d5790bfdfd024c
 RMD160 (SDL-1.2.8.tar.gz) = 91aa02f6b52792b3ec7f5478bcaebda1542980dc
 Size (SDL-1.2.8.tar.gz) = 2602449 bytes
-SHA1 (patch-aa) = d96902d3de2eb1f0c4edaa8b174f09ae1a654625
+SHA1 (patch-aa) = 0853dfa9d64d0848de0d084541b6ffd38ffdedad
 SHA1 (patch-ab) = 6693545cafa5f5e73fb3f6f34d1a0b59a17872d2
 SHA1 (patch-ac) = 8471da99fcd2771e319556c95f6d1295dce002bb
 SHA1 (patch-ad) = 230544c0aa2f8d827a9d49c4962afe2e4936074e
 SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
-SHA1 (patch-aj) = bf5173f8a510cfb86a5d48b7afbbaee6c501f3a0
+SHA1 (patch-aj) = f857e5dba94ff6d3893f6218cbc0c9e011f02cf7
 SHA1 (patch-al) = d8b4ee9d33c4b34db87b098f4945018ae995ae99
-SHA1 (patch-am) = 8ed1ce2ef11210e0fe865ba8f1b315853900f2e4
+SHA1 (patch-am) = 54ddcc39e8e23bbff09ffc0d56b783ec7404eea3
 SHA1 (patch-ar) = 61e759bb3eb05890160573dfe63431792f1823bd
 SHA1 (patch-as) = f69ca8796afeda35e57c89aa7a161de2de7bf6d8
 SHA1 (patch-ba) = 4c87c3812c9f8bdabb974a6a17f6243cedcc887e
@@ -19,3 +19,7 @@ SHA1 (patch-bc) = 8f34e6d914f9edda1ea494e3970d11b238e47bb8
 SHA1 (patch-bd) = 3d8b20cfe774280d1c8e96405ae26bc23444ee8d
 SHA1 (patch-be) = 5f4ba09788f3ca5410067c14b90426f2a831e92b
 SHA1 (patch-bf) = 0df8784f0e03ae3b1e63a06c2fc8255d3fdaf39f
+SHA1 (patch-da) = 9a38b1e2fcc0eb4c499c52402e70083f30e7ec96
+SHA1 (patch-db) = 4543d1fe47fa068bcda83eb53d495e0c6085b371
+SHA1 (patch-dc) = 7d0bc4a78ad1a589cb797094e39e3099e2414e99
+SHA1 (patch-dd) = a80c43d5cab4cc83c98dae7449219f68e1dbea88
diff --git a/devel/SDL/patches/patch-aa b/devel/SDL/patches/patch-aa
index 52b2987dbb1..bceff4b28ac 100644
--- a/devel/SDL/patches/patch-aa
+++ b/devel/SDL/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.9 2005/01/05 12:05:19 adam Exp $
+$NetBSD: patch-aa,v 1.10 2005/05/20 20:08:40 wiz Exp $
 
---- src/joystick/bsd/SDL_sysjoystick.c.orig	2004-12-13 07:54:32.000000000 +0000
+--- src/joystick/bsd/SDL_sysjoystick.c.orig	2004-12-13 08:54:32.000000000 +0100
 +++ src/joystick/bsd/SDL_sysjoystick.c
-@@ -60,7 +60,7 @@ static char rcsid =
+@@ -55,12 +55,14 @@ static char rcsid =
+ #include <libusbhid.h>
+ #endif
+ 
+-#ifdef __FreeBSD__
++#ifdef __DragonFly__
++#include <sys/joystick.h>
++#elif defined(__FreeBSD__)
+ #include <osreldate.h>
  #include <sys/joystick.h>
  #endif
  
@@ -11,7 +19,7 @@ $NetBSD: patch-aa,v 1.9 2005/01/05 12:05:19 adam Exp $
  #include <machine/joystick.h>
  #endif
  
-@@ -239,6 +239,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
+@@ -239,6 +241,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
  	struct hid_data *hdata;
  	struct report *rep;
  	int fd;
@@ -19,7 +27,7 @@ $NetBSD: patch-aa,v 1.9 2005/01/05 12:05:19 adam Exp $
  
  	fd = open(path, O_RDONLY);
  	if (fd == -1) {
-@@ -303,6 +304,8 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
+@@ -303,6 +306,8 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
  	joy->nbuttons = 0;
  	joy->nhats = 0;
  	joy->nballs = 0;
@@ -28,7 +36,7 @@ $NetBSD: patch-aa,v 1.9 2005/01/05 12:05:19 adam Exp $
  
  	while (hid_get_item(hdata, &hitem) > 0) {
  		char *sp;
-@@ -329,8 +332,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
+@@ -329,8 +334,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
  			    unsigned usage = HID_USAGE(hitem.usage);
  			    int joyaxe = usage_to_joyaxe(usage);
  			    if (joyaxe >= 0) {
@@ -38,7 +46,7 @@ $NetBSD: patch-aa,v 1.9 2005/01/05 12:05:19 adam Exp $
  			    } else if (usage == HUG_HAT_SWITCH) {
  				joy->nhats++;
  			    }
-@@ -348,6 +350,9 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
+@@ -348,6 +352,9 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
  		}
  	}
  	hid_end_parse(hdata);
@@ -48,16 +56,25 @@ $NetBSD: patch-aa,v 1.9 2005/01/05 12:05:19 adam Exp $
  
  usbend:
  	/* The poll blocks the event thread. */
-@@ -370,7 +375,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
+@@ -370,7 +377,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
  	int nbutton, naxe = -1;
  	Sint32 v;
  
 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(HAVE_MACHINE_JOYSTICK) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(HAVE_MACHINE_JOYSTICK) || defined(__OpenBSD__) || defined(__DragonFly__)
  	struct joystick gameport;
  	static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
   
-@@ -457,7 +462,8 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
+@@ -419,7 +426,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
+ 		}
+ 		return;
+ 	}
+-#endif /* defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) */
++#endif /* defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)*/
+ 	
+ 	rep = &joy->hwdata->inreport;
+ 
+@@ -457,7 +464,8 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
  			    } else if (usage == HUG_HAT_SWITCH) {
  				v = (Sint32)hid_get_data(REP_BUF_DATA(rep),
  							 &hitem);
@@ -67,7 +84,7 @@ $NetBSD: patch-aa,v 1.9 2005/01/05 12:05:19 adam Exp $
  			    }
  			    break;
  			}
-@@ -530,9 +536,9 @@ report_alloc(struct report *r, struct re
+@@ -530,9 +538,9 @@ report_alloc(struct report *r, struct re
  #endif
  #else
  # ifdef USBHID_NEW
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
index 78c2aedcdea..2eea3e95080 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.20 2005/01/05 12:05:19 adam Exp $
+$NetBSD: patch-aj,v 1.21 2005/05/20 20:08:40 wiz Exp $
 
---- configure.in.orig	2004-12-13 09:02:08.000000000 +0000
+--- configure.in.orig	2004-12-13 10:02:08.000000000 +0100
 +++ configure.in
 @@ -28,9 +28,9 @@ AC_SUBST(SDL_VERSION)
  
@@ -88,9 +88,14 @@ $NetBSD: patch-aj,v 1.20 2005/01/05 12:05:19 adam Exp $
              SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
              SDL_LIBS="$SDL_LIBS $PTH_LIBS"
              CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -1248,8 +1251,8 @@ CheckPTHREAD()
+@@ -1247,9 +1250,13 @@ CheckPTHREAD()
+             pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
              pthread_lib="-pthread"
              ;;
++        *-*-dragonfly*)
++            pthread_cflags="-D_REENTRANT"
++            pthread_lib="-pthread"
++            ;;
          *-*-netbsd*)
 -            pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
 -            pthread_lib="-L/usr/pkg/lib -lpthread -lsem"
@@ -99,7 +104,7 @@ $NetBSD: patch-aj,v 1.20 2005/01/05 12:05:19 adam Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -1724,29 +1727,31 @@ CheckUSBHID()
+@@ -1724,29 +1731,31 @@ CheckUSBHID()
          have_libusbhid=no
          have_libusb=no
          AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes)
@@ -140,7 +145,7 @@ $NetBSD: patch-aj,v 1.20 2005/01/05 12:05:19 adam Exp $
          fi
  
          AC_MSG_CHECKING(for usbhid)
-@@ -1835,6 +1840,26 @@ CheckUSBHID()
+@@ -1835,6 +1844,26 @@ CheckUSBHID()
      fi
  }
  
@@ -167,7 +172,16 @@ $NetBSD: patch-aj,v 1.20 2005/01/05 12:05:19 adam Exp $
  dnl Check for altivec instruction support using gas syntax
  CheckAltivec()
  {
-@@ -2043,16 +2068,18 @@ case "$target" in
+@@ -1992,7 +2021,7 @@ case "$target" in
+             COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c)
+         fi
+         ;;
+-    *-*-freebsd*)
++    *-*-freebsd* | *-*-dragonfly*)
+         ARCH=freebsd
+         CheckDummyVideo
+         CheckDiskAudio
+@@ -2043,16 +2072,18 @@ case "$target" in
          CheckESD
          CheckNAS
          CheckX11
@@ -189,7 +203,7 @@ $NetBSD: patch-aj,v 1.20 2005/01/05 12:05:19 adam Exp $
          fi
          # Set up files for the cdrom library
          if test x$enable_cdrom = xyes; then
-@@ -2061,9 +2088,6 @@ case "$target" in
+@@ -2061,9 +2092,6 @@ case "$target" in
          fi
          # Set up files for the thread library
          if test x$enable_threads = xyes; then
@@ -199,7 +213,7 @@ $NetBSD: patch-aj,v 1.20 2005/01/05 12:05:19 adam Exp $
              CopyUnixThreadSource
          fi
          # Set up files for the timer library
-@@ -2724,7 +2748,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
+@@ -2724,7 +2752,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
  
  # Set runtime shared library paths as needed
  
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
index 75e510be5ff..3872a57ff17 100644
--- a/devel/SDL/patches/patch-am
+++ b/devel/SDL/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
+$NetBSD: patch-am,v 1.16 2005/05/20 20:08:40 wiz Exp $
 
---- configure.orig	2004-12-13 09:04:51.000000000 +0000
+--- configure.orig	2004-12-13 10:04:51.000000000 +0100
 +++ configure
 @@ -463,7 +463,7 @@ ac_includes_default="\
  # include <unistd.h>
@@ -227,9 +227,14 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
              SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
              SDL_LIBS="$SDL_LIBS $PTH_LIBS"
              CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -26807,8 +26805,8 @@ fi;
+@@ -26806,9 +26804,13 @@ fi;
+             pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
              pthread_lib="-pthread"
              ;;
++	*-*-dragonfly*)
++            pthread_cflags="-D_REENTRANT"
++            pthread_lib="-pthread"
++            ;;
          *-*-netbsd*)
 -            pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
 -            pthread_lib="-L/usr/pkg/lib -lpthread -lsem"
@@ -238,7 +243,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -28637,93 +28635,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes
+@@ -28637,93 +28639,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes
    have_libusbhid=yes
  fi
  
@@ -340,7 +345,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28731,7 +28657,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -28731,7 +28661,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -349,7 +354,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28767,15 +28693,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -28767,15 +28697,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -368,7 +373,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -28809,25 +28735,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -28809,25 +28739,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -410,7 +415,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -28838,34 +28764,34 @@ _ASBOX
+@@ -28838,34 +28768,34 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -461,7 +466,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28873,7 +28799,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -28873,7 +28803,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -470,7 +475,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28909,15 +28835,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -28909,15 +28839,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -489,7 +494,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -28951,25 +28877,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -28951,25 +28881,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -531,7 +536,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -28980,34 +28906,112 @@ _ASBOX
+@@ -28980,34 +28910,112 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -660,7 +665,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -29015,7 +29019,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -29015,7 +29023,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -669,7 +674,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -29051,15 +29055,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -29051,15 +29059,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -688,7 +693,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -29093,25 +29097,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -29093,25 +29101,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -730,7 +735,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -29122,34 +29126,34 @@ _ASBOX
+@@ -29122,34 +29130,34 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -781,7 +786,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -29157,7 +29161,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -29157,7 +29165,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -790,7 +795,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -29193,15 +29197,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -29193,15 +29201,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -809,7 +814,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -29235,25 +29239,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -29235,25 +29243,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -851,7 +856,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -29264,33 +29268,29 @@ _ASBOX
+@@ -29264,33 +29272,29 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -894,7 +899,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
          fi
  
          echo "$as_me:$LINENO: checking for usbhid" >&5
-@@ -29514,6 +29514,70 @@ echo "${ECHO_T}$have_usbhid_new" >&6
+@@ -29514,6 +29518,70 @@ echo "${ECHO_T}$have_usbhid_new" >&6
      fi
  }
  
@@ -965,7 +970,16 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
  CheckAltivec()
  {
      echo "$as_me:$LINENO: checking for GCC Altivec instruction support" >&5
-@@ -29808,16 +29872,18 @@ __EOF__
+@@ -29743,7 +29811,7 @@ __EOF__
+ 
+         fi
+         ;;
+-    *-*-freebsd*)
++    *-*-freebsd* | *-*-dragonfly*)
+         ARCH=freebsd
+         CheckDummyVideo
+         CheckDiskAudio
+@@ -29808,16 +29876,18 @@ __EOF__
          CheckESD
          CheckNAS
          CheckX11
@@ -987,7 +1001,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
          fi
          # Set up files for the cdrom library
          if test x$enable_cdrom = xyes; then
-@@ -29826,9 +29892,6 @@ __EOF__
+@@ -29826,9 +29896,6 @@ __EOF__
          fi
          # Set up files for the thread library
          if test x$enable_threads = xyes; then
@@ -997,7 +1011,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
              CopyUnixThreadSource
          fi
          # Set up files for the timer library
-@@ -31455,7 +31518,7 @@ fi
+@@ -31455,7 +31522,7 @@ fi
  
  # Set runtime shared library paths as needed
  
@@ -1006,7 +1020,7 @@ $NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
    SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
  fi
  if test $ARCH = solaris; then
-@@ -32598,8 +32661,9 @@ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+@@ -32598,8 +32665,9 @@ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
  s,@PKG_CONFIG@,$PKG_CONFIG,;t t
  s,@DIRECTFB_CFLAGS@,$DIRECTFB_CFLAGS,;t t
  s,@DIRECTFB_LIBS@,$DIRECTFB_LIBS,;t t
diff --git a/devel/SDL/patches/patch-da b/devel/SDL/patches/patch-da
new file mode 100644
index 00000000000..18b6f004cc3
--- /dev/null
+++ b/devel/SDL/patches/patch-da
@@ -0,0 +1,13 @@
+$NetBSD: patch-da,v 1.1 2005/05/20 20:08:40 wiz Exp $
+
+--- src/video/vgl/SDL_vglvideo.c.orig	2002-03-06 12:23:08.000000000 +0100
++++ src/video/vgl/SDL_vglvideo.c
+@@ -557,7 +557,7 @@ VGLListModes(int depth, int mem_model)
+     case V_INFO_MM_VGAX:
+       vminfop->Type = VIDBUF8X;
+       break;
+-#if defined(__FreeBSD_version) && __FreeBSD_version >= 500000
++#if defined(__DragonFly__) || (defined(__FreeBSD_version) && __FreeBSD_version >= 500000)
+     case V_INFO_MM_DIRECT:
+       vminfop->PixelBytes = minfo.vi_pixel_size;
+       switch (vminfop->PixelBytes) {
diff --git a/devel/SDL/patches/patch-db b/devel/SDL/patches/patch-db
new file mode 100644
index 00000000000..d78ae529d08
--- /dev/null
+++ b/devel/SDL/patches/patch-db
@@ -0,0 +1,13 @@
+$NetBSD: patch-db,v 1.1 2005/05/20 20:08:40 wiz Exp $
+
+--- src/video/svga/SDL_svgavideo.c.orig	2004-02-18 18:22:09.000000000 +0100
++++ src/video/svga/SDL_svgavideo.c
+@@ -38,7 +38,7 @@ static char rcsid =
+ 
+ #if defined(linux)
+ #include <linux/vt.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/consio.h>
+ #else
+ #error You must choose your operating system here
diff --git a/devel/SDL/patches/patch-dc b/devel/SDL/patches/patch-dc
new file mode 100644
index 00000000000..1c5fc933880
--- /dev/null
+++ b/devel/SDL/patches/patch-dc
@@ -0,0 +1,40 @@
+$NetBSD: patch-dc,v 1.1 2005/05/20 20:08:40 wiz Exp $
+
+--- src/video/svga/SDL_svgaevents.c.orig	2004-02-18 18:22:09.000000000 +0100
++++ src/video/svga/SDL_svgaevents.c
+@@ -36,7 +36,7 @@ static char rcsid =
+ #if defined(linux)
+ #include <linux/kd.h>
+ #include <linux/keyboard.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/kbio.h>
+ #else
+ #error You must choose your operating system here
+@@ -52,7 +52,7 @@ static char rcsid =
+ #if defined(linux)
+ #define NUM_VGAKEYMAPS	(1<<KG_CAPSSHIFT)
+ static Uint16 vga_keymap[NUM_VGAKEYMAPS][NR_KEYS];
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ /* FIXME: Free the keymap when we shut down the video mode */
+ static keymap_t *vga_keymap = NULL;
+ #else
+@@ -135,7 +135,7 @@ int SVGA_initkeymaps(int fd)
+ 	}
+ 	return(0);
+ }
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ int SVGA_initkeymaps(int fd)
+ {
+ 	vga_keymap = malloc(sizeof(keymap_t));
+@@ -383,7 +383,7 @@ static SDL_keysym *TranslateKey(int scan
+ 	}
+ 	return(keysym);
+ }
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym)
+ {
+ 	/* Set the keysym information */
diff --git a/devel/SDL/patches/patch-dd b/devel/SDL/patches/patch-dd
new file mode 100644
index 00000000000..8cbf26e4a86
--- /dev/null
+++ b/devel/SDL/patches/patch-dd
@@ -0,0 +1,13 @@
+$NetBSD: patch-dd,v 1.1 2005/05/20 20:08:40 wiz Exp $
+
+--- src/timer/linux/SDL_systimer.c.orig	2004-02-18 18:22:03.000000000 +0100
++++ src/timer/linux/SDL_systimer.c
+@@ -55,7 +55,7 @@ static char rcsid =
+ /* Linux select() changes its timeout parameter upon return to contain
+    the remaining time. Most other unixen leave it unchanged or undefined. */
+ #define SELECT_SETS_REMAINING
+-#elif defined(__bsdi__) || defined(__FreeBSD__) || defined(__sun)
++#elif defined(__bsdi__) || defined(__FreeBSD__) || defined(__sun) || defined(__DragonFly__)
+ #define USE_NANOSLEEP
+ #endif
+