Remove some chunks that should not be necessary any longer.

5 files changed, 55 insertions, 198 deletions

diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 73a5ffc5283..8db33be2a79 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2005/09/07 10:15:39 adam Exp $
+$NetBSD: distinfo,v 1.42 2006/02/07 18:15:50 wiz Exp $
 
 SHA1 (SDL-1.2.9.tar.gz) = 8140de00e73ccdbdee196fa8fd9952ddb3cc75f1
 RMD160 (SDL-1.2.9.tar.gz) = 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7
@@ -6,11 +6,11 @@ Size (SDL-1.2.9.tar.gz) = 2688179 bytes
 SHA1 (patch-aa) = f41d0de165d41826a6de2fdf9521d4f41f97221a
 SHA1 (patch-ac) = 8471da99fcd2771e319556c95f6d1295dce002bb
 SHA1 (patch-ad) = 230544c0aa2f8d827a9d49c4962afe2e4936074e
-SHA1 (patch-aj) = 2f74ff477b743875e522ed752e2190a1c068e6b3
-SHA1 (patch-al) = d8b4ee9d33c4b34db87b098f4945018ae995ae99
-SHA1 (patch-am) = 957913466281b3ac3bba9dfbd7ba4faa09190dc1
+SHA1 (patch-aj) = 53dad2397355cb0282e449f794f84f5b4a0c3f3d
+SHA1 (patch-al) = a427d5b5a4e18a37d241142df575a71db2483a1e
+SHA1 (patch-am) = a4732f0563fe9bcc3c5329cf794ddf4a717bd5e4
 SHA1 (patch-ar) = 61e759bb3eb05890160573dfe63431792f1823bd
-SHA1 (patch-as) = f69ca8796afeda35e57c89aa7a161de2de7bf6d8
+SHA1 (patch-as) = c099a77a9643621322fea1d5cf079abcab80a071
 SHA1 (patch-ba) = 4c87c3812c9f8bdabb974a6a17f6243cedcc887e
 SHA1 (patch-bb) = ebf35acf99240be873c64fcac07570e61f50b83e
 SHA1 (patch-bc) = f1eb12c2f9049af6a65bba9fe215ef3dc165fd83
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
index c79e2d49438..c5a3046fb35 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.23 2005/09/07 10:15:39 adam Exp $
+$NetBSD: patch-aj,v 1.24 2006/02/07 18:15:50 wiz Exp $
 
 --- configure.in.orig	2005-08-28 06:31:18.000000000 +0000
 +++ configure.in
@@ -45,31 +45,6 @@ $NetBSD: patch-aj,v 1.23 2005/09/07 10:15:39 adam Exp $
                    ;;
              esac
              AC_SUBST(NASMFLAGS)
-@@ -985,18 +987,18 @@ CheckAAlib()
- [  --enable-video-aalib    use AAlib video driver [default=no]],
-                   , enable_video_aalib=no)
-     if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
-+        AC_PATH_PROG(AALIB_CONFIG, aalib-config)
-         AC_MSG_CHECKING(for AAlib support)
-+        if test x$AALIB_CONFIG = x; then
-         video_aalib=no
--        AC_TRY_COMPILE([
--         #include <aalib.h>
--        ],[
--        ],[
-+	else
-+            AALIB_LIBS=`$AALIB_CONFIG --libs`
-         video_aalib=yes
--        ])
-+        fi
-         AC_MSG_RESULT($video_aalib)
-         if test x$video_aalib = xyes; then
-             CFLAGS="$CFLAGS -DENABLE_AALIB"
--            SYSTEM_LIBS="$SYSTEM_LIBS -laa"
-+            SYSTEM_LIBS="$SYSTEM_LIBS $AALIB_LIBS"
- 
-             VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
-             VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
 @@ -1202,12 +1204,13 @@ CheckPTH()
  [  --enable-pth            use GNU pth library for multi-threading [default=yes]],
                    , enable_pth=yes)
diff --git a/devel/SDL/patches/patch-al b/devel/SDL/patches/patch-al
index ecaa24381e4..ea47f126024 100644
--- a/devel/SDL/patches/patch-al
+++ b/devel/SDL/patches/patch-al
@@ -1,16 +1,8 @@
-$NetBSD: patch-al,v 1.6 2004/07/26 20:42:28 dillo Exp $
+$NetBSD: patch-al,v 1.7 2006/02/07 18:15:50 wiz Exp $
 
---- src/audio/openbsd/SDL_openbsdaudio.c.orig	2004-02-18 18:21:59.000000000 +0100
+--- src/audio/openbsd/SDL_openbsdaudio.c.orig	2004-01-04 17:49:15.000000000 +0100
 +++ src/audio/openbsd/SDL_openbsdaudio.c
-@@ -37,6 +37,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/audioio.h>
-+#include <pthread.h>
- 
- #include "SDL_audio.h"
- #include "SDL_error.h"
-@@ -46,8 +47,12 @@
+@@ -46,8 +46,12 @@
  #include "SDL_audiodev_c.h"
  #include "SDL_openbsdaudio.h"
  
@@ -24,7 +16,7 @@ $NetBSD: patch-al,v 1.6 2004/07/26 20:42:28 dillo Exp $
  
  /* Open the audio device for playback, and don't block if busy */
  /* #define USE_BLOCKING_WRITES */
-@@ -132,7 +137,11 @@
+@@ -132,7 +136,11 @@ static SDL_AudioDevice
  }
  
  AudioBootStrap OPENBSD_AUDIO_bootstrap = {
@@ -36,7 +28,7 @@ $NetBSD: patch-al,v 1.6 2004/07/26 20:42:28 dillo Exp $
  	Audio_Available, Audio_CreateDevice
  };
  
-@@ -140,6 +149,7 @@
+@@ -140,6 +148,7 @@ AudioBootStrap OPENBSD_AUDIO_bootstrap =
  static void
  OBSD_WaitAudio(_THIS)
  {
@@ -44,7 +36,7 @@ $NetBSD: patch-al,v 1.6 2004/07/26 20:42:28 dillo Exp $
  	/* Check to see if the thread-parent process is still alive */
  	{ static int cnt = 0;
  		/* Note that this only works with thread implementations 
-@@ -151,6 +161,7 @@
+@@ -151,6 +160,7 @@ OBSD_WaitAudio(_THIS)
  			}
  		}
  	}
@@ -52,7 +44,7 @@ $NetBSD: patch-al,v 1.6 2004/07/26 20:42:28 dillo Exp $
  
  #ifndef USE_BLOCKING_WRITES /* Not necessary when using blocking writes */
  	/* See if we need to use timed audio synchronization */
-@@ -262,20 +273,20 @@
+@@ -262,20 +272,20 @@ OBSD_Status(_THIS)
  	return;
      }
  
@@ -87,7 +79,7 @@ $NetBSD: patch-al,v 1.6 2004/07/26 20:42:28 dillo Exp $
  ",
      info.play.buffer_size,
      info.play.sample_rate,
-@@ -290,13 +301,13 @@
+@@ -290,13 +300,13 @@ active		:   %s
      info.play.waiting ? "yes" : "no",
      info.play.active ? "yes": "no");
  
@@ -108,7 +100,7 @@ $NetBSD: patch-al,v 1.6 2004/07/26 20:42:28 dillo Exp $
  ",  
      info.monitor_gain,
      info.blocksize,
-@@ -388,6 +399,9 @@
+@@ -388,6 +398,9 @@ OBSD_OpenAudio(_THIS, SDL_AudioSpec *spe
      	spec->channels = 1;
      AUDIO_INITINFO(&info);
      info.play.sample_rate = spec->freq;
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
index 2014dacb6ec..b0bca6f3f65 100644
--- a/devel/SDL/patches/patch-am
+++ b/devel/SDL/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
+$NetBSD: patch-am,v 1.19 2006/02/07 18:15:50 wiz Exp $
 
---- configure.orig	2005-08-28 06:32:11.000000000 +0000
+--- configure.orig	2005-08-28 08:32:11.000000000 +0200
 +++ configure
 @@ -463,7 +463,8 @@ ac_includes_default="\
  # include <unistd.h>
@@ -55,115 +55,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
                    ;;
              esac
  
-@@ -25684,63 +25687,58 @@ else
-   enable_video_aalib=no
- fi;
-     if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
--        echo "$as_me:$LINENO: checking for AAlib support" >&5
--echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6
--        video_aalib=no
--        cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--         #include <aalib.h>
--
--int
--main ()
--{
--
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+        # Extract the first word of "aalib-config", so it can be a program name with args.
-+set dummy aalib-config; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_AALIB_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $AALIB_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_AALIB_CONFIG="$AALIB_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  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
-+    ac_cv_path_AALIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
- 
--        video_aalib=yes
-+  ;;
-+esac
-+fi
-+AALIB_CONFIG=$ac_cv_path_AALIB_CONFIG
- 
-+if test -n "$AALIB_CONFIG"; then
-+  echo "$as_me:$LINENO: result: $AALIB_CONFIG" >&5
-+echo "${ECHO_T}$AALIB_CONFIG" >&6
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+        echo "$as_me:$LINENO: checking for AAlib support" >&5
-+echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6
-+        if test x$AALIB_CONFIG = x; then
-+        video_aalib=no
-+	else
-+            AALIB_LIBS=`$AALIB_CONFIG --libs`
-+        video_aalib=yes
-+        fi
-         echo "$as_me:$LINENO: result: $video_aalib" >&5
- echo "${ECHO_T}$video_aalib" >&6
-         if test x$video_aalib = xyes; then
-             CFLAGS="$CFLAGS -DENABLE_AALIB"
--            SYSTEM_LIBS="$SYSTEM_LIBS -laa"
-+            SYSTEM_LIBS="$SYSTEM_LIBS $AALIB_LIBS"
- 
-             VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
-             VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
-@@ -26755,16 +26753,17 @@ else
+@@ -26755,16 +26758,17 @@ else
    enable_pth=yes
  fi;
      if test x$enable_threads = xyes -a x$enable_pth = xyes; then
@@ -186,7 +78,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -26774,32 +26773,32 @@ do
+@@ -26774,32 +26778,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
@@ -228,7 +120,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
              SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
              SDL_LIBS="$SDL_LIBS $PTH_LIBS"
              CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -26847,9 +26846,13 @@ fi;
+@@ -26847,9 +26851,13 @@ fi;
              pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
              pthread_lib="-pthread"
              ;;
@@ -244,7 +136,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -28677,93 +28680,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes
+@@ -28677,93 +28685,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes
    have_libusbhid=yes
  fi
  
@@ -346,7 +238,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28771,7 +28702,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -28771,7 +28707,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -355,7 +247,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28807,15 +28738,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -28807,15 +28743,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -374,7 +266,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -28849,25 +28780,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -28849,25 +28785,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: )
@@ -416,7 +308,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -28878,34 +28809,34 @@ _ASBOX
+@@ -28878,34 +28814,34 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -467,7 +359,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28913,7 +28844,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -28913,7 +28849,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -476,7 +368,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28949,15 +28880,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -28949,15 +28885,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -495,7 +387,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -28991,25 +28922,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -28991,25 +28927,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: )
@@ -537,7 +429,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -29020,34 +28951,112 @@ _ASBOX
+@@ -29020,34 +28956,112 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -579,7 +471,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam 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"
@@ -633,9 +525,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +ac_cv_lib_usb_hid_init=no
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5
--echo "${ECHO_T}$ac_cv_header_libusb_h" >&6
++fi
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
@@ -653,8 +543,10 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam 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 $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 "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
 +echo "${ECHO_T}$ac_cv_header_usb_h" >&6
  else
@@ -666,7 +558,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -29055,7 +29064,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -29055,7 +29069,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -675,7 +567,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -29091,15 +29100,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -29091,15 +29105,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -694,7 +586,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -29133,25 +29142,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -29133,25 +29147,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: )
@@ -736,7 +628,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -29162,34 +29171,34 @@ _ASBOX
+@@ -29162,34 +29176,34 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -787,7 +679,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -29197,7 +29206,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -29197,7 +29211,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -796,7 +688,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -29233,15 +29242,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -29233,15 +29247,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -815,7 +707,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -29275,25 +29284,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -29275,25 +29289,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: )
@@ -857,7 +749,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -29304,33 +29313,29 @@ _ASBOX
+@@ -29304,33 +29318,29 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -900,7 +792,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
          fi
  
          echo "$as_me:$LINENO: checking for usbhid" >&5
-@@ -29347,8 +29352,13 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -29347,8 +29357,13 @@ cat >>conftest.$ac_ext <<_ACEOF
            #if defined(HAVE_USB_H)
            #include <usb.h>
            #endif
@@ -914,7 +806,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
            #if defined(HAVE_USBHID_H)
            #include <usbhid.h>
            #elif defined(HAVE_LIBUSB_H)
-@@ -29418,8 +29428,13 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -29418,8 +29433,13 @@ cat >>conftest.$ac_ext <<_ACEOF
                #if defined(HAVE_USB_H)
                #include <usb.h>
                #endif
@@ -928,7 +820,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
                #if defined(HAVE_USBHID_H)
                #include <usbhid.h>
                #elif defined(HAVE_LIBUSB_H)
-@@ -29490,8 +29505,13 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -29490,8 +29510,13 @@ cat >>conftest.$ac_ext <<_ACEOF
                #if defined(HAVE_USB_H)
                #include <usb.h>
                #endif
@@ -942,7 +834,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
                #if defined(HAVE_USBHID_H)
                #include <usbhid.h>
                #elif defined(HAVE_LIBUSB_H)
-@@ -29554,6 +29574,70 @@ echo "${ECHO_T}$have_usbhid_new" >&6
+@@ -29554,6 +29579,70 @@ echo "${ECHO_T}$have_usbhid_new" >&6
      fi
  }
  
@@ -1013,7 +905,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
  CheckAltivec()
  {
      echo "$as_me:$LINENO: checking for GCC Altivec instruction support" >&5
-@@ -29948,7 +30032,7 @@ __EOF__
+@@ -29948,7 +30037,7 @@ __EOF__
  
          fi
          ;;
@@ -1022,7 +914,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
          ARCH=freebsd
          CheckDummyVideo
          CheckDiskAudio
-@@ -30014,17 +30098,19 @@ __EOF__
+@@ -30014,17 +30103,19 @@ __EOF__
          CheckESD
          CheckNAS
          CheckX11
@@ -1045,7 +937,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
          fi
          # Set up files for the cdrom library
          if test x$enable_cdrom = xyes; then
-@@ -30033,9 +30119,6 @@ __EOF__
+@@ -30033,9 +30124,6 @@ __EOF__
          fi
          # Set up files for the thread library
          if test x$enable_threads = xyes; then
@@ -1055,7 +947,7 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
              CopyUnixThreadSource
          fi
          # Set up files for the timer library
-@@ -31670,7 +31753,7 @@ fi
+@@ -31670,7 +31758,7 @@ fi
  # Set runtime shared library paths as needed
  
  if test "x$enable_rpath" = "xyes"; then
@@ -1064,11 +956,9 @@ $NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
      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
+@@ -32818,7 +32906,7 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
  s,@DIRECTFB_CFLAGS@,$DIRECTFB_CFLAGS,;t t
  s,@DIRECTFB_LIBS@,$DIRECTFB_LIBS,;t t
-+s,@AALIB_CONFIG@,$AALIB_CONFIG,;t t
  s,@OSMESA_CONFIG@,$OSMESA_CONFIG,;t t
 -s,@PTH_CONFIG@,$PTH_CONFIG,;t t
 +s,@PTHREAD_CONFIG@,$PTHREAD_CONFIG,;t t
diff --git a/devel/SDL/patches/patch-as b/devel/SDL/patches/patch-as
index 38a411aea4b..856fa2dd387 100644
--- a/devel/SDL/patches/patch-as
+++ b/devel/SDL/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.4 2005/01/05 12:05:19 adam Exp $
+$NetBSD: patch-as,v 1.5 2006/02/07 18:15:50 wiz Exp $
 
---- src/Makefile.in.orig	2004-12-13 09:03:05.000000000 +0000
+--- src/Makefile.in.orig	2005-08-28 08:31:37.000000000 +0200
 +++ src/Makefile.in
-@@ -304,7 +304,6 @@ lib_LTLIBRARIES = libSDL.la
+@@ -306,7 +306,6 @@ lib_LTLIBRARIES = libSDL.la
  libSDL_la_SOURCES = $(GENERAL_SRCS)
  libSDL_la_LDFLAGS = \
  	-no-undefined		\