regen (for patch-aj change)

2 files changed, 54 insertions, 42 deletions

diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 7ddc5e1e78b..5d044b5340f 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2003/09/04 07:31:50 wiz Exp $
+$NetBSD: distinfo,v 1.23 2003/09/04 09:57:41 wiz Exp $
 
 SHA1 (SDL-1.2.6.tar.gz) = 6f64b79427ea279e5ae18ea07d9fe353fd138422
 Size (SDL-1.2.6.tar.gz) = 2042700 bytes
@@ -6,9 +6,9 @@ SHA1 (patch-aa) = 4511f3af35b824d8e1425b571a8c12e44e8ef46c
 SHA1 (patch-ab) = 7effcc7f7f1856372692c147521888843810fed5
 SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
 SHA1 (patch-ag) = cd2fd8958b86e12c9d2786fe200c6ab44d8d40e1
-SHA1 (patch-aj) = be3e6fdfc6b0f22df85b41445b980c60f5ceab5e
+SHA1 (patch-aj) = 7bcfe591659e60dcdbd6c966f4347270ed3f14f5
 SHA1 (patch-al) = 852877c85dd43782dfcf855d43ed6250449aa9fd
-SHA1 (patch-am) = 8f48a0d7603426116d84aa23ee758204dd3c4eab
+SHA1 (patch-am) = 6e72e1c4c3894cc9ffad5ba61aab07de0d9f3fea
 SHA1 (patch-ap) = c477500c2540719c40253b30de1f389c8ed50334
 SHA1 (patch-ar) = 1a78f0bcb6a8f65f71af23accb2a9780331f275b
 SHA1 (patch-as) = a53286d5e0a2cab7e0a1d80baf3b76681f996b7a
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
index 6b79fe6351c..859445d1559 100644
--- a/devel/SDL/patches/patch-am
+++ b/devel/SDL/patches/patch-am
@@ -1,17 +1,29 @@
-$NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
+$NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $
 
 --- configure.orig	Sat Aug 30 21:13:23 2003
 +++ configure
-@@ -3669,7 +3669,7 @@ fi
+@@ -3132,6 +3132,8 @@ rm -f conftest*
+         echo "$ac_t""$have_oss" 1>&6
+         if test x$have_oss = xyes; then
+             CFLAGS="$CFLAGS -DOSS_SUPPORT"
++	    LDFLAGS="$LDFLAGS $LIBOSSAUDIO"
++	    SDL_LIBS="$SDL_LIBS $LIBOSSAUDIO"
+             AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp"
+             AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la"
+             AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma"
+@@ -3667,9 +3669,9 @@ fi
+ 
+     if test x$enable_audio = xyes -a x$enable_nas = xyes; then
          echo $ac_n "checking for NAS audio support""... $ac_c" 1>&6
- echo "configure:3671: checking for NAS audio support" >&5
+-echo "configure:3671: checking for NAS audio support" >&5
++echo "configure:3673: checking for NAS audio support" >&5
          have_nas=no
 -        if test -r /usr/X11R6/include/audio/audiolib.h; then
 +        if true; then
              have_nas=yes
              CFLAGS="$CFLAGS -DNAS_SUPPORT"
              SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
-@@ -3826,7 +3826,7 @@ fi
+@@ -3826,7 +3828,7 @@ fi
                    NASMFLAGS="-f aoutb"
                    ;;
                *)
@@ -20,7 +32,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
                    ;;
              esac
              
-@@ -5429,34 +5429,53 @@ else
+@@ -5429,34 +5431,53 @@ else
  fi
  
      if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
@@ -46,7 +58,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
 +        # Extract the first word of "aalib-config", so it can be a program name with args.
 +set dummy aalib-config; ac_word=$2
 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:5436: checking for $ac_word" >&5
++echo "configure:5438: checking for $ac_word" >&5
 +if eval "test \"`echo '$''{'ac_cv_path_AALIB_CONFIG'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -82,7 +94,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
 +fi
 +
 +        echo $ac_n "checking for AAlib support""... $ac_c" 1>&6
-+echo "configure:5469: checking for AAlib support" >&5
++echo "configure:5471: checking for AAlib support" >&5
 +        if test x$AALIB_CONFIG = x; then
 +            video_aalib=no
 +	else
@@ -97,7 +109,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
  
              VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
              VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
-@@ -5881,19 +5900,20 @@ else
+@@ -5881,19 +5902,20 @@ else
  fi
  
      if test x$enable_threads = xyes -a x$enable_pth = xyes; then
@@ -109,7 +121,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:5888: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_path_PTH_CONFIG'+set}'`\" = set"; then
-+echo "configure:5908: checking for $ac_word" >&5
++echo "configure:5910: checking for $ac_word" >&5
 +if eval "test \"`echo '$''{'ac_cv_path_PTHREAD_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -125,7 +137,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
    ;;
    *)
    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-@@ -5901,27 +5921,27 @@ else
+@@ -5901,27 +5923,27 @@ else
    for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
@@ -161,7 +173,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
              SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
              SDL_LIBS="$SDL_LIBS $PTH_LIBS"
              CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -5970,8 +5990,8 @@ fi
+@@ -5970,8 +5992,8 @@ fi
              pthread_lib="-pthread"
              ;;
          *-*-netbsd*)
@@ -172,7 +184,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -7045,56 +7065,45 @@ else
+@@ -7045,56 +7067,45 @@ else
    echo "$ac_t""no" 1>&6
  fi
  
@@ -185,7 +197,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
 +
 +            ac_safe=`echo "usbhid.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for usbhid.h""... $ac_c" 1>&6
-+echo "configure:7074: checking for usbhid.h" >&5
++echo "configure:7076: checking for usbhid.h" >&5
 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -194,7 +206,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
 -cat > conftest.$ac_ext <<EOF
 -#line 7058 "configure"
 +  cat > conftest.$ac_ext <<EOF
-+#line 7079 "configure"
++#line 7081 "configure"
  #include "confdefs.h"
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -/* We use char because int might match the return type of a gcc2
@@ -208,7 +220,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
  EOF
 -if { (eval echo configure:7069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:7084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 +if test -z "$ac_err"; then
    rm -rf conftest*
@@ -247,27 +259,27 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
 -echo "configure:7098: checking for usb.h" >&5
 +            ac_safe=`echo "libusbhid.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for libusbhid.h""... $ac_c" 1>&6
-+echo "configure:7107: checking for libusbhid.h" >&5
++echo "configure:7109: checking for libusbhid.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -7099,12 +7108,12 @@ if eval "test \"`echo '$''{'ac_cv_header
+@@ -7099,12 +7110,12 @@ if eval "test \"`echo '$''{'ac_cv_header
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 7103 "configure"
-+#line 7112 "configure"
++#line 7114 "configure"
  #include "confdefs.h"
 -#include <usb.h>
 +#include <libusbhid.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:7108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -7120,47 +7129,64 @@ rm -f conftest*
+@@ -7120,47 +7131,64 @@ rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -289,7 +301,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
 +        fi
 +	else
 +            echo $ac_n "checking for hid_init in -lusb""... $ac_c" 1>&6
-+echo "configure:7146: checking for hid_init in -lusb" >&5
++echo "configure:7148: checking for hid_init in -lusb" >&5
 +ac_lib_var=`echo usb'_'hid_init | sed 'y%./+-%__p_%'`
 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -299,7 +311,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lusb  $LIBS"
 +cat > conftest.$ac_ext <<EOF
-+#line 7154 "configure"
++#line 7156 "configure"
  #include "confdefs.h"
 -#include <usbhid.h>
 +/* Override any gcc2 internal prototype to avoid an error.  */
@@ -315,7 +327,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
 -{ (eval echo configure:7141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 -if test -z "$ac_err"; then
-+if { (eval echo configure:7165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
 -  eval "ac_cv_header_$ac_safe=yes"
 +  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -348,27 +360,27 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
 +
 +        ac_safe=`echo "usb.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for usb.h""... $ac_c" 1>&6
-+echo "configure:7190: checking for usb.h" >&5
++echo "configure:7192: checking for usb.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -7165,12 +7191,12 @@ if eval "test \"`echo '$''{'ac_cv_header
+@@ -7165,12 +7193,12 @@ if eval "test \"`echo '$''{'ac_cv_header
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 7169 "configure"
-+#line 7195 "configure"
++#line 7197 "configure"
  #include "confdefs.h"
 -#include <libusb.h>
 +#include <usb.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:7174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -7186,14 +7212,14 @@ rm -f conftest*
+@@ -7186,14 +7214,14 @@ rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -383,27 +395,27 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
 -echo "configure:7197: checking for libusbhid.h" >&5
 +        ac_safe=`echo "libusb.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for libusb.h""... $ac_c" 1>&6
-+echo "configure:7223: checking for libusb.h" >&5
++echo "configure:7225: checking for libusb.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -7198,12 +7224,12 @@ if eval "test \"`echo '$''{'ac_cv_header
+@@ -7198,12 +7226,12 @@ if eval "test \"`echo '$''{'ac_cv_header
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 7202 "configure"
-+#line 7228 "configure"
++#line 7230 "configure"
  #include "confdefs.h"
 -#include <libusbhid.h>
 +#include <libusb.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:7207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -7219,7 +7245,7 @@ rm -f conftest*
+@@ -7219,7 +7247,7 @@ rm -f conftest*
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -412,7 +424,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -7227,14 +7253,10 @@ fi
+@@ -7227,14 +7255,10 @@ fi
          if test x$have_usb_h = xyes; then
              CFLAGS="$CFLAGS -DHAVE_USB_H"
          fi
@@ -428,7 +440,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
          fi
  
          echo $ac_n "checking for usbhid""... $ac_c" 1>&6
-@@ -7598,6 +7620,7 @@ __EOF__
+@@ -7598,6 +7622,7 @@ __EOF__
          CheckESD
          CheckNAS
          CheckX11
@@ -436,7 +448,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
          CheckAAlib
          CheckOpenGL
          CheckPTHREAD
-@@ -7616,9 +7639,9 @@ __EOF__
+@@ -7616,9 +7641,9 @@ __EOF__
  
          # Set up files for the audio library
          if test x$enable_audio = xyes; then
@@ -449,7 +461,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
          fi
          # Set up files for the cdrom library
          if test x$enable_cdrom = xyes; then
-@@ -7627,9 +7650,6 @@ __EOF__
+@@ -7627,9 +7652,6 @@ __EOF__
          fi
          # Set up files for the thread library
          if test x$enable_threads = xyes; then
@@ -459,7 +471,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
              CopyUnixThreadSource
          fi
          # Set up files for the timer library
-@@ -9105,7 +9125,7 @@ fi
+@@ -9105,7 +9127,7 @@ fi
  
  # Set runtime shared library paths as needed
  
@@ -468,7 +480,7 @@ $NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
    SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
  fi
  if test $ARCH = solaris; then
-@@ -9504,7 +9524,8 @@ s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
+@@ -9504,7 +9526,8 @@ s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
  s%@PKG_CONFIG@%$PKG_CONFIG%g
  s%@DIRECTFB_CFLAGS@%$DIRECTFB_CFLAGS%g
  s%@DIRECTFB_LIBS@%$DIRECTFB_LIBS%g