Changes 1.2.9:

* Added support for direct color 8-bpp surfaces
* Altivec optimized blitters
* SDL.dll works on Windows 95 again
* Dropping a document onto an SDL app passes it as a command line parameter in MacOS X
* Fixed crash trying to allocate hardware surfaces on MacOS X
* Fixed short read problem with SDL_RWFromMem()
* Fixed gcc parse errors in SDL_audio.h on Windows
* Added support for Tru64 UNIX 4.X
* Improved RISC OS support
* Numerous improvements to the Atari port
* SDL_OPENGLBLIT is officially obsolete

15 files changed, 108 insertions, 169 deletions

diff --git a/audio/SDL-arts/Makefile b/audio/SDL-arts/Makefile
index a7c3846d0af..684399a11a5 100644
--- a/audio/SDL-arts/Makefile
+++ b/audio/SDL-arts/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:38 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.10 2005/09/07 10:16:16 adam Exp $
 
 .include "../../devel/SDL/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/SDL/SDL-arts/}
-PKGREVISION=	1
 
 CATEGORIES+=	audio kde
 
diff --git a/audio/SDL-esound/Makefile b/audio/SDL-esound/Makefile
index ea4630121f1..1afe49cdefe 100644
--- a/audio/SDL-esound/Makefile
+++ b/audio/SDL-esound/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:38 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.9 2005/09/07 10:16:40 adam Exp $
 
 .include "../../devel/SDL/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/SDL/SDL-esound/}
-PKGREVISION=	1
 
 CATEGORIES+=	audio gnome
 
diff --git a/audio/SDL-nas/Makefile b/audio/SDL-nas/Makefile
index 67d998225f8..a596fb4a0a0 100644
--- a/audio/SDL-nas/Makefile
+++ b/audio/SDL-nas/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:38 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.9 2005/09/07 10:16:27 adam Exp $
 
 .include "../../devel/SDL/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/SDL/SDL-nas/}
-PKGREVISION=	1
 
 CATEGORIES+=	audio
 
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index ce885d2173b..e5f3374be50 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2005/03/27 14:45:47 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2005/09/07 10:15:39 adam Exp $
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKGREVISION=1
 
 .include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/SDL/Makefile.common b/devel/SDL/Makefile.common
index 60cbe448aaa..6b3a20e88a1 100644
--- a/devel/SDL/Makefile.common
+++ b/devel/SDL/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.22 2005/06/01 18:02:42 jlam Exp $
+# $NetBSD: Makefile.common,v 1.23 2005/09/07 10:15:39 adam Exp $
 
-DISTNAME=	SDL-1.2.8
+DISTNAME=	SDL-1.2.9
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
@@ -11,13 +11,12 @@ COMMENT=	Simple DirectMedia Layer, a cross-platform multimedia library
 DISTINFO_FILE=		${.CURDIR}/../../devel/SDL/distinfo
 PATCHDIR=		${.CURDIR}/../../devel/SDL/patches
 
-GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake
+GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
 
-USE_LIBTOOL=		YES
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386"
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index af745837562..73a5ffc5283 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,24 +1,20 @@
-$NetBSD: distinfo,v 1.40 2005/05/31 17:37:50 wiz Exp $
+$NetBSD: distinfo,v 1.41 2005/09/07 10:15:39 adam 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 (SDL-1.2.9.tar.gz) = 8140de00e73ccdbdee196fa8fd9952ddb3cc75f1
+RMD160 (SDL-1.2.9.tar.gz) = 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7
+Size (SDL-1.2.9.tar.gz) = 2688179 bytes
 SHA1 (patch-aa) = f41d0de165d41826a6de2fdf9521d4f41f97221a
-SHA1 (patch-ab) = 6693545cafa5f5e73fb3f6f34d1a0b59a17872d2
 SHA1 (patch-ac) = 8471da99fcd2771e319556c95f6d1295dce002bb
 SHA1 (patch-ad) = 230544c0aa2f8d827a9d49c4962afe2e4936074e
-SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
-SHA1 (patch-aj) = 9b7bae7224129813a88bb9b5ae5364e167e0551a
+SHA1 (patch-aj) = 2f74ff477b743875e522ed752e2190a1c068e6b3
 SHA1 (patch-al) = d8b4ee9d33c4b34db87b098f4945018ae995ae99
-SHA1 (patch-am) = 0fd647ff90fbee55c8d10f7e29f3dbd1da8ad83b
+SHA1 (patch-am) = 957913466281b3ac3bba9dfbd7ba4faa09190dc1
 SHA1 (patch-ar) = 61e759bb3eb05890160573dfe63431792f1823bd
 SHA1 (patch-as) = f69ca8796afeda35e57c89aa7a161de2de7bf6d8
 SHA1 (patch-ba) = 4c87c3812c9f8bdabb974a6a17f6243cedcc887e
-SHA1 (patch-bb) = a3b7f5e161b4c497a1ad818e2607dfca21288b53
-SHA1 (patch-bc) = 8f34e6d914f9edda1ea494e3970d11b238e47bb8
-SHA1 (patch-bd) = 3d8b20cfe774280d1c8e96405ae26bc23444ee8d
-SHA1 (patch-be) = 5f4ba09788f3ca5410067c14b90426f2a831e92b
-SHA1 (patch-bf) = 0df8784f0e03ae3b1e63a06c2fc8255d3fdaf39f
+SHA1 (patch-bb) = ebf35acf99240be873c64fcac07570e61f50b83e
+SHA1 (patch-bc) = f1eb12c2f9049af6a65bba9fe215ef3dc165fd83
+SHA1 (patch-bd) = cbfd61c48f95094f54a098b9ee921dfe0da96589
 SHA1 (patch-da) = 9a38b1e2fcc0eb4c499c52402e70083f30e7ec96
 SHA1 (patch-db) = 4543d1fe47fa068bcda83eb53d495e0c6085b371
 SHA1 (patch-dc) = 7d0bc4a78ad1a589cb797094e39e3099e2414e99
diff --git a/devel/SDL/patches/patch-ab b/devel/SDL/patches/patch-ab
deleted file mode 100644
index 57b87a841a9..00000000000
--- a/devel/SDL/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/01/05 12:05:19 adam Exp $
-
---- include/SDL_syswm.h.orig	2004-12-13 07:54:31.000000000 +0000
-+++ include/SDL_syswm.h
-@@ -49,7 +49,7 @@ typedef struct SDL_SysWMinfo SDL_SysWMin
- #else
- 
- /* This is the structure for custom window manager events */
--#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__)) && \
-+#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__) || defined(__NetBSD__)) && \
-     (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
-      !defined(__QNXNTO__))
-  /* AIX is unix, of course, but the native compiler CSet doesn't define unix */
diff --git a/devel/SDL/patches/patch-af b/devel/SDL/patches/patch-af
deleted file mode 100644
index 62fb8fa6107..00000000000
--- a/devel/SDL/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.5 2001/09/24 14:28:55 rh Exp $
-
---- src/audio/SDL_audiodev.c.orig	Mon Sep 24 14:11:43 2001
-+++ src/audio/SDL_audiodev.c
-@@ -39,7 +39,7 @@
- #include "SDL_audiodev_c.h"
- 
- #ifndef _PATH_DEV_DSP
--#ifdef __OpenBSD__
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
- #define _PATH_DEV_DSP  "/dev/audio"
- #else
- #define _PATH_DEV_DSP  "/dev/dsp"
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
index 89b76781d4a..c79e2d49438 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.22 2005/05/31 17:37:50 wiz Exp $
+$NetBSD: patch-aj,v 1.23 2005/09/07 10:15:39 adam Exp $
 
---- configure.in.orig	2004-12-13 10:02:08.000000000 +0100
+--- configure.in.orig	2005-08-28 06:31:18.000000000 +0000
 +++ configure.in
 @@ -28,9 +28,9 @@ AC_SUBST(SDL_VERSION)
  
@@ -104,7 +104,7 @@ $NetBSD: patch-aj,v 1.22 2005/05/31 17:37:50 wiz Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -1724,29 +1731,31 @@ CheckUSBHID()
+@@ -1723,29 +1730,31 @@ CheckUSBHID()
          have_libusbhid=no
          have_libusb=no
          AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes)
@@ -145,7 +145,7 @@ $NetBSD: patch-aj,v 1.22 2005/05/31 17:37:50 wiz Exp $
          fi
  
          AC_MSG_CHECKING(for usbhid)
-@@ -1756,8 +1765,13 @@ CheckUSBHID()
+@@ -1755,8 +1764,13 @@ CheckUSBHID()
            #if defined(HAVE_USB_H)
            #include <usb.h>
            #endif
@@ -159,7 +159,7 @@ $NetBSD: patch-aj,v 1.22 2005/05/31 17:37:50 wiz Exp $
            #if defined(HAVE_USBHID_H)
            #include <usbhid.h>
            #elif defined(HAVE_LIBUSB_H)
-@@ -1782,8 +1796,13 @@ CheckUSBHID()
+@@ -1781,8 +1795,13 @@ CheckUSBHID()
                #if defined(HAVE_USB_H)
                #include <usb.h>
                #endif
@@ -173,7 +173,7 @@ $NetBSD: patch-aj,v 1.22 2005/05/31 17:37:50 wiz Exp $
                #if defined(HAVE_USBHID_H)
                #include <usbhid.h>
                #elif defined(HAVE_LIBUSB_H)
-@@ -1809,8 +1828,13 @@ CheckUSBHID()
+@@ -1808,8 +1827,13 @@ CheckUSBHID()
                #if defined(HAVE_USB_H)
                #include <usb.h>
                #endif
@@ -187,7 +187,7 @@ $NetBSD: patch-aj,v 1.22 2005/05/31 17:37:50 wiz Exp $
                #if defined(HAVE_USBHID_H)
                #include <usbhid.h>
                #elif defined(HAVE_LIBUSB_H)
-@@ -1835,6 +1859,26 @@ CheckUSBHID()
+@@ -1834,6 +1858,26 @@ CheckUSBHID()
      fi
  }
  
@@ -214,7 +214,7 @@ $NetBSD: patch-aj,v 1.22 2005/05/31 17:37:50 wiz Exp $
  dnl Check for altivec instruction support using gas syntax
  CheckAltivec()
  {
-@@ -1992,7 +2036,7 @@ case "$target" in
+@@ -2013,7 +2057,7 @@ case "$target" in
              COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c)
          fi
          ;;
@@ -223,17 +223,18 @@ $NetBSD: patch-aj,v 1.22 2005/05/31 17:37:50 wiz Exp $
          ARCH=freebsd
          CheckDummyVideo
          CheckDiskAudio
-@@ -2043,16 +2087,18 @@ case "$target" in
+@@ -2065,17 +2109,19 @@ case "$target" in
          CheckESD
          CheckNAS
          CheckX11
-+        CheckDGA
++	CheckDGA
          CheckAAlib
          CheckOpenGL
          CheckPTHREAD
          CheckSIGACTION
          CheckUSBHID
-+        CheckMachineJoystick
+         CheckRPATH
++	CheckMachineJoystick
          # Set up files for the audio library
          if test x$enable_audio = xyes; then
 -            CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
@@ -245,7 +246,7 @@ $NetBSD: patch-aj,v 1.22 2005/05/31 17:37:50 wiz Exp $
          fi
          # Set up files for the cdrom library
          if test x$enable_cdrom = xyes; then
-@@ -2061,9 +2107,6 @@ case "$target" in
+@@ -2084,9 +2130,6 @@ case "$target" in
          fi
          # Set up files for the thread library
          if test x$enable_threads = xyes; then
@@ -255,12 +256,12 @@ $NetBSD: patch-aj,v 1.22 2005/05/31 17:37:50 wiz Exp $
              CopyUnixThreadSource
          fi
          # Set up files for the timer library
-@@ -2724,7 +2767,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
- 
+@@ -2755,7 +2798,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
  # Set runtime shared library paths as needed
  
--if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
-+if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi -o $ARCH = netbsd; then
-   SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
- fi
- if test $ARCH = solaris; then
+ if test "x$enable_rpath" = "xyes"; then
+-  if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
++  if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi -o $ARCH = netbsd; then
+     SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
+   fi
+   if test $ARCH = solaris; then
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
index c8f7b1d131a..2014dacb6ec 100644
--- a/devel/SDL/patches/patch-am
+++ b/devel/SDL/patches/patch-am
@@ -1,17 +1,18 @@
-$NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
+$NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
 
---- configure.orig	2004-12-13 10:04:51.000000000 +0100
+--- configure.orig	2005-08-28 06:32:11.000000000 +0000
 +++ configure
-@@ -463,7 +463,7 @@ ac_includes_default="\
+@@ -463,7 +463,8 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ALSA_CFLAGS ALSA_LIBS alsa_lib ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS OSMESA_CONFIG PTH_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE HAVE_NASM_TRUE HAVE_NASM_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_STATIC_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ALSA_CFLAGS ALSA_LIBS alsa_lib ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS AALIB_CONFIG OSMESA_CONFIG PTHREAD_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE HAVE_NASM_TRUE HAVE_NASM_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_STATIC_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ALSA_CFLAGS ALSA_LIBS alsa_lib ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS OSMESA_CONFIG PTH_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE HAVE_NASM_TRUE HAVE_NASM_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_STATIC_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS'
++# add AALIB_CONFIG
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ALSA_CFLAGS ALSA_LIBS alsa_lib ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS OSMESA_CONFIG PTH_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE HAVE_NASM_TRUE HAVE_NASM_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_STATIC_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS AALIB_CONFIG'
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -1592,9 +1592,9 @@ SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINO
+@@ -1593,9 +1594,9 @@ SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINO
  
  # libtool versioning
  LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -24,7 +25,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
  
  
  
-@@ -21907,6 +21907,8 @@ rm -f conftest.err conftest.$ac_objext c
+@@ -21948,6 +21949,8 @@ rm -f conftest.err conftest.$ac_objext c
  echo "${ECHO_T}$have_oss" >&6
          if test x$have_oss = xyes; then
              CFLAGS="$CFLAGS -DOSS_SUPPORT"
@@ -33,7 +34,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
              AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp"
              AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la"
              AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma"
-@@ -22844,9 +22846,9 @@ fi;
+@@ -22885,9 +22888,9 @@ fi;
          echo "$as_me:$LINENO: checking for NAS audio support" >&5
  echo $ECHO_N "checking for NAS audio support... $ECHO_C" >&6
          have_nas=no
@@ -45,7 +46,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
              SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
              AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
              AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
-@@ -23112,7 +23114,7 @@ fi
+@@ -23153,7 +23156,7 @@ fi
                    NASMFLAGS="-f aoutb"
                    ;;
                *)
@@ -54,7 +55,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
                    ;;
              esac
  
-@@ -25643,63 +25645,58 @@ else
+@@ -25684,63 +25687,58 @@ else
    enable_video_aalib=no
  fi;
      if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
@@ -162,7 +163,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
  
              VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
              VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
-@@ -26714,16 +26711,17 @@ else
+@@ -26755,16 +26753,17 @@ else
    enable_pth=yes
  fi;
      if test x$enable_threads = xyes -a x$enable_pth = xyes; then
@@ -185,7 +186,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -26733,32 +26731,32 @@ do
+@@ -26774,32 +26773,32 @@ do
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -227,7 +228,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
              SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
              SDL_LIBS="$SDL_LIBS $PTH_LIBS"
              CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -26806,9 +26804,13 @@ fi;
+@@ -26847,9 +26846,13 @@ fi;
              pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
              pthread_lib="-pthread"
              ;;
@@ -243,7 +244,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -28637,93 +28639,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes
+@@ -28677,93 +28680,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes
    have_libusbhid=yes
  fi
  
@@ -345,7 +346,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28731,7 +28661,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -28771,7 +28702,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -354,7 +355,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28767,15 +28697,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -28807,15 +28738,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -373,7 +374,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz 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 +28739,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -28849,25 +28780,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: )
@@ -415,7 +416,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -28838,34 +28768,34 @@ _ASBOX
+@@ -28878,34 +28809,34 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -466,7 +467,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28873,7 +28803,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -28913,7 +28844,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -475,7 +476,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28909,15 +28839,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -28949,15 +28880,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -494,7 +495,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz 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 +28881,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -28991,25 +28922,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: )
@@ -536,7 +537,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -28980,34 +28910,112 @@ _ASBOX
+@@ -29020,34 +28951,112 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -578,7 +579,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
 +            echo "$as_me:$LINENO: checking for hid_init in -lusb" >&5
 +echo $ECHO_N "checking for hid_init in -lusb... $ECHO_C" >&6
 +if test "${ac_cv_lib_usb_hid_init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lusb  $LIBS"
@@ -632,7 +633,9 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +ac_cv_lib_usb_hid_init=no
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libusb_h" >&6
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
@@ -650,10 +653,8 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
 +  echo "$as_me:$LINENO: checking for usb.h" >&5
 +echo $ECHO_N "checking for usb.h... $ECHO_C" >&6
 +if test "${ac_cv_header_usb_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5
--echo "${ECHO_T}$ac_cv_header_libusb_h" >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
 +echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
 +echo "${ECHO_T}$ac_cv_header_usb_h" >&6
  else
@@ -665,7 +666,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -29015,7 +29023,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -29055,7 +29064,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -674,7 +675,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -29051,15 +29059,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -29091,15 +29100,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -693,7 +694,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz 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 +29101,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -29133,25 +29142,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: )
@@ -735,7 +736,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -29122,34 +29130,34 @@ _ASBOX
+@@ -29162,34 +29171,34 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -786,7 +787,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -29157,7 +29165,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -29197,7 +29206,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -795,7 +796,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -29193,15 +29201,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -29233,15 +29242,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -814,7 +815,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz 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 +29243,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -29275,25 +29284,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: )
@@ -856,7 +857,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -29264,33 +29272,29 @@ _ASBOX
+@@ -29304,33 +29313,29 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -899,7 +900,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
          fi
  
          echo "$as_me:$LINENO: checking for usbhid" >&5
-@@ -29307,8 +29311,13 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -29347,8 +29352,13 @@ cat >>conftest.$ac_ext <<_ACEOF
            #if defined(HAVE_USB_H)
            #include <usb.h>
            #endif
@@ -913,7 +914,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
            #if defined(HAVE_USBHID_H)
            #include <usbhid.h>
            #elif defined(HAVE_LIBUSB_H)
-@@ -29378,8 +29387,13 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -29418,8 +29428,13 @@ cat >>conftest.$ac_ext <<_ACEOF
                #if defined(HAVE_USB_H)
                #include <usb.h>
                #endif
@@ -927,7 +928,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
                #if defined(HAVE_USBHID_H)
                #include <usbhid.h>
                #elif defined(HAVE_LIBUSB_H)
-@@ -29450,8 +29464,13 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -29490,8 +29505,13 @@ cat >>conftest.$ac_ext <<_ACEOF
                #if defined(HAVE_USB_H)
                #include <usb.h>
                #endif
@@ -941,7 +942,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
                #if defined(HAVE_USBHID_H)
                #include <usbhid.h>
                #elif defined(HAVE_LIBUSB_H)
-@@ -29514,6 +29533,70 @@ echo "${ECHO_T}$have_usbhid_new" >&6
+@@ -29554,6 +29574,70 @@ echo "${ECHO_T}$have_usbhid_new" >&6
      fi
  }
  
@@ -1012,7 +1013,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
  CheckAltivec()
  {
      echo "$as_me:$LINENO: checking for GCC Altivec instruction support" >&5
-@@ -29743,7 +29826,7 @@ __EOF__
+@@ -29948,7 +30032,7 @@ __EOF__
  
          fi
          ;;
@@ -1021,17 +1022,18 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
          ARCH=freebsd
          CheckDummyVideo
          CheckDiskAudio
-@@ -29808,16 +29891,18 @@ __EOF__
+@@ -30014,17 +30098,19 @@ __EOF__
          CheckESD
          CheckNAS
          CheckX11
-+        CheckDGA
++	CheckDGA
          CheckAAlib
          CheckOpenGL
          CheckPTHREAD
          CheckSIGACTION
          CheckUSBHID
-+        CheckMachineJoystick
+         CheckRPATH
++	CheckMachineJoystick
          # Set up files for the audio library
          if test x$enable_audio = xyes; then
 -            CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
@@ -1043,7 +1045,7 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
          fi
          # Set up files for the cdrom library
          if test x$enable_cdrom = xyes; then
-@@ -29826,9 +29911,6 @@ __EOF__
+@@ -30033,9 +30119,6 @@ __EOF__
          fi
          # Set up files for the thread library
          if test x$enable_threads = xyes; then
@@ -1053,16 +1055,16 @@ $NetBSD: patch-am,v 1.17 2005/05/31 17:37:50 wiz Exp $
              CopyUnixThreadSource
          fi
          # Set up files for the timer library
-@@ -31455,7 +31537,7 @@ fi
- 
+@@ -31670,7 +31753,7 @@ fi
  # Set runtime shared library paths as needed
  
--if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
-+if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi -o $ARCH = netbsd; then
-   SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
- fi
- if test $ARCH = solaris; then
-@@ -32598,8 +32680,9 @@ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+ if test "x$enable_rpath" = "xyes"; then
+-  if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
++  if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi -o $ARCH = netbsd; then
+     SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
+   fi
+   if test $ARCH = solaris; then
+@@ -32817,8 +32900,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-bb b/devel/SDL/patches/patch-bb
index db3e9799f7c..e1d84e90b19 100644
--- a/devel/SDL/patches/patch-bb
+++ b/devel/SDL/patches/patch-bb
@@ -1,16 +1,16 @@
-$NetBSD: patch-bb,v 1.3 2005/01/05 12:05:19 adam Exp $
+$NetBSD: patch-bb,v 1.4 2005/09/07 10:15:39 adam Exp $
 
---- src/audio/esd/Makefile.in.orig	2004-12-13 09:03:15.000000000 +0000
+--- src/audio/esd/Makefile.in.orig	2005-08-28 06:31:40.000000000 +0000
 +++ src/audio/esd/Makefile.in
-@@ -49,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_de
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -47,6 +47,7 @@ am__configure_deps = $(am__aclocal_m4_de
+ mkinstalldirs = $(install_sh) -d
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
 +libaudio_esd_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(ESD_LIBS)
  libaudio_esd_la_LIBADD =
  am__objects_1 = SDL_esdaudio.lo
  am_libaudio_esd_la_OBJECTS = $(am__objects_1)
-@@ -321,7 +322,7 @@ clean-noinstLTLIBRARIES:
+@@ -320,7 +321,7 @@ clean-noinstLTLIBRARIES:
  	  rm -f "$${dir}/so_locations"; \
  	done
  libaudio_esd.la: $(libaudio_esd_la_OBJECTS) $(libaudio_esd_la_DEPENDENCIES) 
diff --git a/devel/SDL/patches/patch-bc b/devel/SDL/patches/patch-bc
index d8e6d01ea02..76055b9c857 100644
--- a/devel/SDL/patches/patch-bc
+++ b/devel/SDL/patches/patch-bc
@@ -1,16 +1,16 @@
-$NetBSD: patch-bc,v 1.3 2005/01/05 12:05:19 adam Exp $
+$NetBSD: patch-bc,v 1.4 2005/09/07 10:15:39 adam Exp $
 
---- src/audio/arts/Makefile.in.orig	2004-12-13 09:03:08.000000000 +0000
+--- src/audio/arts/Makefile.in.orig	2005-08-28 06:31:38.000000000 +0000
 +++ src/audio/arts/Makefile.in
-@@ -49,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_de
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -47,6 +47,7 @@ am__configure_deps = $(am__aclocal_m4_de
+ mkinstalldirs = $(install_sh) -d
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
 +libaudio_arts_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) `$(ARTSCONFIG) --libs`
  libaudio_arts_la_LIBADD =
  am__objects_1 = SDL_artsaudio.lo
  am_libaudio_arts_la_OBJECTS = $(am__objects_1)
-@@ -321,7 +322,7 @@ clean-noinstLTLIBRARIES:
+@@ -320,7 +321,7 @@ clean-noinstLTLIBRARIES:
  	  rm -f "$${dir}/so_locations"; \
  	done
  libaudio_arts.la: $(libaudio_arts_la_OBJECTS) $(libaudio_arts_la_DEPENDENCIES) 
diff --git a/devel/SDL/patches/patch-bd b/devel/SDL/patches/patch-bd
index 9c20b33ad27..d13aee795dd 100644
--- a/devel/SDL/patches/patch-bd
+++ b/devel/SDL/patches/patch-bd
@@ -1,16 +1,16 @@
-$NetBSD: patch-bd,v 1.3 2005/01/05 12:05:19 adam Exp $
+$NetBSD: patch-bd,v 1.4 2005/09/07 10:15:39 adam Exp $
 
---- src/audio/nas/Makefile.in.orig	2004-12-13 09:03:21.000000000 +0000
+--- src/audio/nas/Makefile.in.orig	2005-08-28 06:31:42.000000000 +0000
 +++ src/audio/nas/Makefile.in
-@@ -49,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_de
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -47,6 +47,7 @@ am__configure_deps = $(am__aclocal_m4_de
+ mkinstalldirs = $(install_sh) -d
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
 +libaudio_nas_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(SHARED_SYSTEM_LIBS)
  libaudio_nas_la_LIBADD =
  am__objects_1 = SDL_nasaudio.lo
  am_libaudio_nas_la_OBJECTS = $(am__objects_1)
-@@ -321,7 +322,7 @@ clean-noinstLTLIBRARIES:
+@@ -320,7 +321,7 @@ clean-noinstLTLIBRARIES:
  	  rm -f "$${dir}/so_locations"; \
  	done
  libaudio_nas.la: $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_DEPENDENCIES) 
diff --git a/devel/SDL/patches/patch-be b/devel/SDL/patches/patch-be
deleted file mode 100644
index 2f69d4af77d..00000000000
--- a/devel/SDL/patches/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.1 2003/09/16 17:03:44 drochner Exp $
-
---- src/cdrom/openbsd/SDL_syscdrom.c.orig	2003-09-16 18:36:59.000000000 +0200
-+++ src/cdrom/openbsd/SDL_syscdrom.c
-@@ -143,6 +143,8 @@ int  SDL_SYS_CDInit(void)
- 	static char *checklist[] = {
- #ifdef __OpenBSD__
- 		"?0 cd?c", "cdrom", NULL
-+#elif defined(__NetBSD__)
-+		"?0 cd?d", "?0 cd?c", "cdrom", NULL
- #else
- 		"?0 cd?c", "?0 acd?c", "cdrom", NULL
- #endif
diff --git a/devel/SDL/patches/patch-bf b/devel/SDL/patches/patch-bf
deleted file mode 100644
index 5152d93aa09..00000000000
--- a/devel/SDL/patches/patch-bf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bf,v 1.2 2005/01/06 16:32:01 drochner Exp $
-
---- include/SDL_endian.h.orig	2005-01-06 13:10:43.000000000 +0100
-+++ include/SDL_endian.h
-@@ -68,7 +68,7 @@ static __inline__ Uint16 SDL_Swap16(Uint
- #elif defined(__GNUC__) && defined(__x86_64__)
- static __inline__ Uint16 SDL_Swap16(Uint16 x)
- {
--	__asm__("xchgb %b0,%h0" : "=q" (x) :  "0" (x));
-+	__asm__("xchgb %b0,%h0" : "=Q" (x) :  "0" (x));
- 	return x;
- }
- #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))