diff --git a/devel/sdl/Makefile b/devel/sdl/Makefile
index 6f9f17e01d7..2528ad903e8 100644
--- a/devel/sdl/Makefile
+++ b/devel/sdl/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.13 2001/07/20 03:10:10 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.14 2001/07/25 07:58:32 pvalchev Exp $
 
 COMMENT=	"cross-platform multimedia library"
 
-VERSION=	1.2.1
+VERSION=	1.2.2
 DISTNAME=	SDL-${VERSION}
-PKGNAME=	${DISTNAME:L}p1
+PKGNAME=	${DISTNAME:L}
 CATEGORIES=	devel
-NEED_VERSION=	1.422
+NEED_VERSION=	1.427
 
 HOMEPAGE=	http://www.libsdl.org
 
diff --git a/devel/sdl/files/md5 b/devel/sdl/files/md5
index ee2db0175be..ddc863726c0 100644
--- a/devel/sdl/files/md5
+++ b/devel/sdl/files/md5
@@ -1,3 +1,3 @@
-MD5 (SDL-1.2.1.tar.gz) = 72c9058de7a9277693585660cc1876ae
-RMD160 (SDL-1.2.1.tar.gz) = 9a92c21180b0f8e0ddd9e9339e73910add1e5b08
-SHA1 (SDL-1.2.1.tar.gz) = c2968bfd3dc4f5b3c8a2b0f541796390ce90d0a5
+MD5 (SDL-1.2.2.tar.gz) = d27e0cd39388e2ff927823577f6c935f
+RMD160 (SDL-1.2.2.tar.gz) = a0a8c742f827bdefd35b3ebf64bbb5972cf53865
+SHA1 (SDL-1.2.2.tar.gz) = 1699bd6094847d5465035ac5c4211e182a4a9dd9
diff --git a/devel/sdl/patches/patch-configure b/devel/sdl/patches/patch-configure
index 6a60a2d15b8..5b6dc212cbd 100644
--- a/devel/sdl/patches/patch-configure
+++ b/devel/sdl/patches/patch-configure
@@ -1,1083 +1,40 @@
-$OpenBSD: patch-configure,v 1.10 2001/07/20 03:07:07 pvalchev Exp $
---- configure.orig	Mon Jun 18 09:21:53 2001
-+++ configure	Thu Jul 19 20:38:04 2001
-@@ -638,9 +638,9 @@ fi
+$OpenBSD: patch-configure,v 1.11 2001/07/25 07:58:32 pvalchev Exp $
+--- configure.orig	Mon Jul 23 13:54:08 2001
++++ configure	Tue Jul 24 23:05:58 2001
+@@ -639,10 +639,10 @@ fi
+ # set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0.
  #
  SDL_MAJOR_VERSION=1
- SDL_MINOR_VERSION=2
--SDL_MICRO_VERSION=1
--SDL_INTERFACE_AGE=1
--SDL_BINARY_AGE=1
-+SDL_MICRO_VERSION=2
-+SDL_INTERFACE_AGE=2
-+SDL_BINARY_AGE=2
+-SDL_MINOR_VERSION=2
+-SDL_MICRO_VERSION=2
+-SDL_INTERFACE_AGE=2
+-SDL_BINARY_AGE=2
++SDL_MINOR_VERSION=3
++SDL_MICRO_VERSION=3
++SDL_INTERFACE_AGE=3
++SDL_BINARY_AGE=3
  SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
  
  
-@@ -3318,7 +3318,11 @@ echo "configure:3316: checking for OSS a
- #line 3319 "configure"
- #include "confdefs.h"
- 
-+          #ifdef __OpenBSD__
-+          #include <soundcard.h>
-+          #else
-           #include <sys/soundcard.h>
-+          #endif
-         
- int main() {
- 
-@@ -3326,7 +3330,7 @@ int main() {
-         
- ; return 0; }
- EOF
--if { (eval echo configure:3330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-         have_oss=yes
-@@ -3361,17 +3365,17 @@ fi
-         have_alsa=no
-         ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
--echo "configure:3365: checking for sys/asoundlib.h" >&5
-+echo "configure:3369: checking for sys/asoundlib.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3370 "configure"
-+#line 3374 "configure"
- #include "confdefs.h"
- #include <sys/asoundlib.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3379: \"$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*
-@@ -3393,7 +3397,7 @@ else
- fi
- 
-         echo $ac_n "checking for snd_pcm_open in -lasound""... $ac_c" 1>&6
--echo "configure:3397: checking for snd_pcm_open in -lasound" >&5
-+echo "configure:3401: checking for snd_pcm_open in -lasound" >&5
- ac_lib_var=`echo asound'_'snd_pcm_open | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3401,7 +3405,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lasound  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3405 "configure"
-+#line 3409 "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
-@@ -3412,7 +3416,7 @@ int main() {
- snd_pcm_open()
- ; return 0; }
- EOF
--if { (eval echo configure:3416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3452,6 +3456,7 @@ else
- fi
- 
-     if test x$enable_audio = xyes -a x$enable_openbsdaudio = xyes; then
-+	CFLAGS="$CFLAGS -DOPENBSD_SUPPORT"
-         SYSTEM_LIBS="$SYSTEM_LIBS $ESD_LIBS"
-         AUDIO_SUBDIRS="$AUDIO_SUBDIRS openbsd"
-         AUDIO_DRIVERS="$AUDIO_DRIVERS openbsd/libaudio_openbsd.la"
-@@ -3510,7 +3515,7 @@ fi
-   # Extract the first word of "esd-config", so it can be a program name with args.
- set dummy esd-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3514: checking for $ac_word" >&5
-+echo "configure:3519: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3545,7 +3550,7 @@ fi
- 
-   min_esd_version=0.2.8
-   echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
--echo "configure:3549: checking for ESD - version >= $min_esd_version" >&5
-+echo "configure:3554: checking for ESD - version >= $min_esd_version" >&5
-   no_esd=""
-   if test "$ESD_CONFIG" = "no" ; then
-     no_esd=yes
-@@ -3569,7 +3574,7 @@ echo "configure:3549: checking for ESD -
-   echo $ac_n "cross compiling; assumed OK... $ac_c"
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3573 "configure"
-+#line 3578 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -3627,7 +3632,7 @@ int main ()
- 
- 
- EOF
--if { (eval echo configure:3631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -3666,7 +3671,7 @@ fi
-           CFLAGS="$CFLAGS $ESD_CFLAGS"
-           LIBS="$LIBS $ESD_LIBS"
-           cat > conftest.$ac_ext <<EOF
--#line 3670 "configure"
-+#line 3675 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -3676,7 +3681,7 @@ int main() {
-  return 0; 
- ; return 0; }
- EOF
--if { (eval echo configure:3680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-    echo "*** The test program compiled, but did not run. This usually means"
-           echo "*** that the run-time linker is not finding ESD or finding the wrong"
-@@ -3726,7 +3731,7 @@ fi
-         # Extract the first word of "artsc-config", so it can be a program name with args.
- set dummy artsc-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3730: checking for $ac_word" >&5
-+echo "configure:3735: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_ARTSCCONFIG'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3764,12 +3769,12 @@ fi
-             ARTSC_CFLAGS=`$ARTSCCONFIG --cflags`
-             ARTSC_LIBS=`$ARTSCCONFIG --libs`
-             echo $ac_n "checking for aRts development environment""... $ac_c" 1>&6
--echo "configure:3768: checking for aRts development environment" >&5
-+echo "configure:3773: checking for aRts development environment" >&5
-             audio_arts=no
-             save_CFLAGS="$CFLAGS"
-             CFLAGS="$CFLAGS $ARTSC_CFLAGS"
-             cat > conftest.$ac_ext <<EOF
--#line 3773 "configure"
-+#line 3778 "configure"
- #include "confdefs.h"
- 
-              #include <artsc.h>
-@@ -3780,7 +3785,7 @@ int main() {
-             
- ; return 0; }
- EOF
--if { (eval echo configure:3784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-             audio_arts=yes
-@@ -3814,7 +3819,7 @@ 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:3818: checking for NAS audio support" >&5
-+echo "configure:3823: checking for NAS audio support" >&5
-         have_nas=no
-         if test -r /usr/X11R6/include/audio/audiolib.h; then
-             have_nas=yes
-@@ -3870,7 +3875,7 @@ fi
-         # Extract the first word of "nasm", so it can be a program name with args.
- set dummy nasm; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3874: checking for $ac_word" >&5
-+echo "configure:3879: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_NASM'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3999,7 +4004,7 @@ fi
- # Uses ac_ vars as temps to allow command line to override cache and checks.
- # --without-x overrides everything else, but does not touch the cache.
- echo $ac_n "checking for X""... $ac_c" 1>&6
--echo "configure:4003: checking for X" >&5
-+echo "configure:4008: checking for X" >&5
- 
- # Check whether --with-x or --without-x was given.
- if test "${with_x+set}" = set; then
-@@ -4061,12 +4066,12 @@ if test "$ac_x_includes" = NO; then
- 
-   # First, try using that file with no special directory specified.
- cat > conftest.$ac_ext <<EOF
--#line 4065 "configure"
-+#line 4070 "configure"
- #include "confdefs.h"
- #include <$x_direct_test_include>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4075: \"$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*
-@@ -4135,14 +4140,14 @@ if test "$ac_x_libraries" = NO; then
-   ac_save_LIBS="$LIBS"
-   LIBS="-l$x_direct_test_library $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4139 "configure"
-+#line 4144 "configure"
- #include "confdefs.h"
- 
- int main() {
- ${x_direct_test_function}()
- ; return 0; }
- EOF
--if { (eval echo configure:4146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   LIBS="$ac_save_LIBS"
- # We can link X programs with no special library path.
-@@ -4248,17 +4253,17 @@ else
-     case "`(uname -sr) 2>/dev/null`" in
-     "SunOS 5"*)
-       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
--echo "configure:4252: checking whether -R must be followed by a space" >&5
-+echo "configure:4257: checking whether -R must be followed by a space" >&5
-       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-       cat > conftest.$ac_ext <<EOF
--#line 4255 "configure"
-+#line 4260 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_R_nospace=yes
- else
-@@ -4274,14 +4279,14 @@ rm -f conftest*
-       else
- 	LIBS="$ac_xsave_LIBS -R $x_libraries"
- 	cat > conftest.$ac_ext <<EOF
--#line 4278 "configure"
-+#line 4283 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_R_space=yes
- else
-@@ -4313,7 +4318,7 @@ rm -f conftest*
-     # libraries were built with DECnet support.  And karl@cs.umb.edu says
-     # the Alpha needs dnet_stub (dnet does not exist).
-     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
--echo "configure:4317: checking for dnet_ntoa in -ldnet" >&5
-+echo "configure:4322: checking for dnet_ntoa in -ldnet" >&5
- ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4321,7 +4326,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-ldnet  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4325 "configure"
-+#line 4330 "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
-@@ -4332,7 +4337,7 @@ int main() {
- dnet_ntoa()
- ; return 0; }
- EOF
--if { (eval echo configure:4336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4354,7 +4359,7 @@ fi
- 
-     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
--echo "configure:4358: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo "configure:4363: checking for dnet_ntoa in -ldnet_stub" >&5
- ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4362,7 +4367,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-ldnet_stub  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4366 "configure"
-+#line 4371 "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
-@@ -4373,7 +4378,7 @@ int main() {
- dnet_ntoa()
- ; return 0; }
- EOF
--if { (eval echo configure:4377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4402,12 +4407,12 @@ fi
-     # The nsl library prevents programs from opening the X display
-     # on Irix 5.2, according to dickey@clark.net.
-     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:4406: checking for gethostbyname" >&5
-+echo "configure:4411: checking for gethostbyname" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4411 "configure"
-+#line 4416 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gethostbyname(); below.  */
-@@ -4430,7 +4435,7 @@ gethostbyname();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_gethostbyname=yes"
- else
-@@ -4451,7 +4456,7 @@ fi
- 
-     if test $ac_cv_func_gethostbyname = no; then
-       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:4455: checking for gethostbyname in -lnsl" >&5
-+echo "configure:4460: checking for gethostbyname in -lnsl" >&5
- ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4459,7 +4464,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4463 "configure"
-+#line 4468 "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
-@@ -4470,7 +4475,7 @@ int main() {
- gethostbyname()
- ; return 0; }
- EOF
--if { (eval echo configure:4474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4500,12 +4505,12 @@ fi
-     # -lsocket must be given before -lnsl if both are needed.
-     # We assume that if connect needs -lnsl, so does gethostbyname.
-     echo $ac_n "checking for connect""... $ac_c" 1>&6
--echo "configure:4504: checking for connect" >&5
-+echo "configure:4509: checking for connect" >&5
- if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4509 "configure"
-+#line 4514 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char connect(); below.  */
-@@ -4528,7 +4533,7 @@ connect();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_connect=yes"
- else
-@@ -4549,7 +4554,7 @@ fi
- 
-     if test $ac_cv_func_connect = no; then
-       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
--echo "configure:4553: checking for connect in -lsocket" >&5
-+echo "configure:4558: checking for connect in -lsocket" >&5
- ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4557,7 +4562,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4561 "configure"
-+#line 4566 "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
-@@ -4568,7 +4573,7 @@ int main() {
- connect()
- ; return 0; }
- EOF
--if { (eval echo configure:4572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4592,12 +4597,12 @@ fi
- 
-     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
-     echo $ac_n "checking for remove""... $ac_c" 1>&6
--echo "configure:4596: checking for remove" >&5
-+echo "configure:4601: checking for remove" >&5
- if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4601 "configure"
-+#line 4606 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char remove(); below.  */
-@@ -4620,7 +4625,7 @@ remove();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_remove=yes"
- else
-@@ -4641,7 +4646,7 @@ fi
- 
-     if test $ac_cv_func_remove = no; then
-       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
--echo "configure:4645: checking for remove in -lposix" >&5
-+echo "configure:4650: checking for remove in -lposix" >&5
- ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4649,7 +4654,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lposix  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4653 "configure"
-+#line 4658 "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
-@@ -4660,7 +4665,7 @@ int main() {
- remove()
- ; return 0; }
- EOF
--if { (eval echo configure:4664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4684,12 +4689,12 @@ fi
- 
-     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-     echo $ac_n "checking for shmat""... $ac_c" 1>&6
--echo "configure:4688: checking for shmat" >&5
-+echo "configure:4693: checking for shmat" >&5
- if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4693 "configure"
-+#line 4698 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shmat(); below.  */
-@@ -4712,7 +4717,7 @@ shmat();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_shmat=yes"
- else
-@@ -4733,7 +4738,7 @@ fi
- 
-     if test $ac_cv_func_shmat = no; then
-       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
--echo "configure:4737: checking for shmat in -lipc" >&5
-+echo "configure:4742: checking for shmat in -lipc" >&5
- ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4741,7 +4746,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lipc  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4745 "configure"
-+#line 4750 "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
-@@ -4752,7 +4757,7 @@ int main() {
- shmat()
- ; return 0; }
- EOF
--if { (eval echo configure:4756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4785,7 +4790,7 @@ fi
-   # libraries we check for below, so use a different variable.
-   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
--echo "configure:4789: checking for IceConnectionNumber in -lICE" >&5
-+echo "configure:4794: checking for IceConnectionNumber in -lICE" >&5
- ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4793,7 +4798,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4797 "configure"
-+#line 4802 "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
-@@ -4804,7 +4809,7 @@ int main() {
- IceConnectionNumber()
- ; return 0; }
- EOF
--if { (eval echo configure:4808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4847,10 +4852,10 @@ fi
- 
-             if test x$enable_video_x11_vm = xyes; then
-                 echo $ac_n "checking for XFree86 VidMode 1.0 support""... $ac_c" 1>&6
--echo "configure:4851: checking for XFree86 VidMode 1.0 support" >&5
-+echo "configure:4856: checking for XFree86 VidMode 1.0 support" >&5
-                 video_x11_vm=no
-                 cat > conftest.$ac_ext <<EOF
--#line 4854 "configure"
-+#line 4859 "configure"
- #include "confdefs.h"
- 
-                  #include <X11/Xlib.h>
-@@ -4861,7 +4866,7 @@ int main() {
-                 
- ; return 0; }
- EOF
--if { (eval echo configure:4865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-                 video_x11_vm=yes
-@@ -4888,7 +4893,7 @@ fi
-                         LIBS="$LIBS $X_LIBS -lX11 -lXext"
-                         if test x$xfree86_glidehack = x; then
-                             echo $ac_n "checking for XF40VidModeQueryExtension in -lXxf86vm""... $ac_c" 1>&6
--echo "configure:4892: checking for XF40VidModeQueryExtension in -lXxf86vm" >&5
-+echo "configure:4897: checking for XF40VidModeQueryExtension in -lXxf86vm" >&5
- ac_lib_var=`echo Xxf86vm'_'XF40VidModeQueryExtension | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4896,7 +4901,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lXxf86vm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4900 "configure"
-+#line 4905 "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
-@@ -4907,7 +4912,7 @@ int main() {
- XF40VidModeQueryExtension()
- ; return 0; }
- EOF
--if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4930,7 +4935,7 @@ fi
-                         fi
-                         if test x$xfree86_glidehack = x; then
-                             echo $ac_n "checking for XF40VidModeQueryExtension in -lXxf86vm40""... $ac_c" 1>&6
--echo "configure:4934: checking for XF40VidModeQueryExtension in -lXxf86vm40" >&5
-+echo "configure:4939: checking for XF40VidModeQueryExtension in -lXxf86vm40" >&5
- ac_lib_var=`echo Xxf86vm40'_'XF40VidModeQueryExtension | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4938,7 +4943,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lXxf86vm40  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4942 "configure"
-+#line 4947 "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
-@@ -4949,7 +4954,7 @@ int main() {
- XF40VidModeQueryExtension()
- ; return 0; }
- EOF
--if { (eval echo configure:4953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4979,10 +4984,10 @@ fi
-                         SYSTEM_LIBS="$SYSTEM_LIBS -lXxf86vm"
-                     fi
-                     echo $ac_n "checking for XFree86 VidMode gamma support""... $ac_c" 1>&6
--echo "configure:4983: checking for XFree86 VidMode gamma support" >&5
-+echo "configure:4988: checking for XFree86 VidMode gamma support" >&5
-                     video_x11_vmgamma=no
-                     cat > conftest.$ac_ext <<EOF
--#line 4986 "configure"
-+#line 4991 "configure"
- #include "confdefs.h"
- 
-                      #include <X11/Xlib.h>
-@@ -4994,7 +4999,7 @@ int main() {
-                     
- ; return 0; }
- EOF
--if { (eval echo configure:4998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-                     video_x11_vmgamma=yes
-@@ -5028,10 +5033,10 @@ fi
- 
-             if test x$enable_dga = xyes; then
-                 echo $ac_n "checking for XFree86 DGA 1.0 support""... $ac_c" 1>&6
--echo "configure:5032: checking for XFree86 DGA 1.0 support" >&5
-+echo "configure:5037: checking for XFree86 DGA 1.0 support" >&5
-                 video_x11_dga=no
-                 cat > conftest.$ac_ext <<EOF
--#line 5035 "configure"
-+#line 5040 "configure"
- #include "confdefs.h"
- 
-                  #include <X11/Xlib.h>
-@@ -5042,7 +5047,7 @@ int main() {
-                 
- ; return 0; }
- EOF
--if { (eval echo configure:5046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-                 video_x11_dga=yes
-@@ -5071,10 +5076,10 @@ fi
- 
-             if test x$enable_video_x11_xv = xyes; then
-                 echo $ac_n "checking for XFree86 XvImage support""... $ac_c" 1>&6
--echo "configure:5075: checking for XFree86 XvImage support" >&5
-+echo "configure:5080: checking for XFree86 XvImage support" >&5
-                 video_x11_xv=no
-                 cat > conftest.$ac_ext <<EOF
--#line 5078 "configure"
-+#line 5083 "configure"
- #include "confdefs.h"
- 
-                  #include <X11/Xlib.h>
-@@ -5089,7 +5094,7 @@ int main() {
-                 
- ; return 0; }
- EOF
--if { (eval echo configure:5093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-                 video_x11_xv=yes
-@@ -5120,10 +5125,10 @@ fi
- 
-     if test x$enable_video = xyes -a x$enable_video_photon = xyes; then
-         echo $ac_n "checking for QNX Photon support""... $ac_c" 1>&6
--echo "configure:5124: checking for QNX Photon support" >&5
-+echo "configure:5129: checking for QNX Photon support" >&5
-         video_photon=no
-         cat > conftest.$ac_ext <<EOF
--#line 5127 "configure"
-+#line 5132 "configure"
- #include "confdefs.h"
- 
-           #include <Ph.h>
-@@ -5137,7 +5142,7 @@ int main() {
-         
- ; return 0; }
- EOF
--if { (eval echo configure:5141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-         video_photon=yes
-@@ -5169,10 +5174,10 @@ fi
- 
-     if test x$video_x11_dga = xyes -a x$enable_video_dga = xyes; then
-         echo $ac_n "checking for XFree86 DGA 2.0 support""... $ac_c" 1>&6
--echo "configure:5173: checking for XFree86 DGA 2.0 support" >&5
-+echo "configure:5178: checking for XFree86 DGA 2.0 support" >&5
-         video_x11_dga2=no
-         cat > conftest.$ac_ext <<EOF
--#line 5176 "configure"
-+#line 5181 "configure"
- #include "confdefs.h"
- 
-          #include <X11/Xlib.h>
-@@ -5184,7 +5189,7 @@ int main() {
-         
- ; return 0; }
- EOF
--if { (eval echo configure:5188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-         video_x11_dga2=yes
-@@ -5215,10 +5220,10 @@ fi
- 
-     if test x$enable_video = xyes -a x$enable_video_fbcon = xyes; then
-         echo $ac_n "checking for framebuffer console support""... $ac_c" 1>&6
--echo "configure:5219: checking for framebuffer console support" >&5
-+echo "configure:5224: checking for framebuffer console support" >&5
-         video_fbcon=no
-         cat > conftest.$ac_ext <<EOF
--#line 5222 "configure"
-+#line 5227 "configure"
- #include "confdefs.h"
- 
-          #include <linux/fb.h>
-@@ -5230,7 +5235,7 @@ int main() {
-         
- ; return 0; }
- EOF
--if { (eval echo configure:5234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-         video_fbcon=yes
-@@ -5261,10 +5266,10 @@ fi
- 
-     if test x$enable_video = xyes -a x$enable_video_ps2gs = xyes; then
-         echo $ac_n "checking for PlayStation 2 GS support""... $ac_c" 1>&6
--echo "configure:5265: checking for PlayStation 2 GS support" >&5
-+echo "configure:5270: checking for PlayStation 2 GS support" >&5
-         video_ps2gs=no
-         cat > conftest.$ac_ext <<EOF
--#line 5268 "configure"
-+#line 5273 "configure"
- #include "confdefs.h"
- 
-          #include <linux/ps2/dev.h>
-@@ -5275,7 +5280,7 @@ int main() {
-         
- ; return 0; }
- EOF
--if { (eval echo configure:5279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-         video_ps2gs=yes
-@@ -5306,10 +5311,10 @@ fi
- 
-     if test x$enable_video = xyes -a x$enable_video_ggi = xyes; then
-         echo $ac_n "checking for GGI support""... $ac_c" 1>&6
--echo "configure:5310: checking for GGI support" >&5
-+echo "configure:5315: checking for GGI support" >&5
-         video_ggi=no
-         cat > conftest.$ac_ext <<EOF
--#line 5313 "configure"
-+#line 5318 "configure"
- #include "confdefs.h"
- 
-          #include <ggi/ggi.h>
-@@ -5320,7 +5325,7 @@ int main() {
-         
- ; return 0; }
- EOF
--if { (eval echo configure:5324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-         video_ggi=yes
-@@ -5353,10 +5358,10 @@ fi
- 
-     if test x$enable_video = xyes -a x$enable_video_svga = xyes; then
-         echo $ac_n "checking for SVGAlib (1.4.0+) support""... $ac_c" 1>&6
--echo "configure:5357: checking for SVGAlib (1.4.0+) support" >&5
-+echo "configure:5362: checking for SVGAlib (1.4.0+) support" >&5
-         video_svga=no
-         cat > conftest.$ac_ext <<EOF
--#line 5360 "configure"
-+#line 5365 "configure"
- #include "confdefs.h"
- 
-          #include <vga.h>
-@@ -5371,7 +5376,7 @@ int main() {
-         
- ; return 0; }
- EOF
--if { (eval echo configure:5375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-         video_svga=yes
-@@ -5404,10 +5409,10 @@ fi
- 
-     if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
-         echo $ac_n "checking for AAlib support""... $ac_c" 1>&6
--echo "configure:5408: checking for AAlib support" >&5
-+echo "configure:5413: checking for AAlib support" >&5
-         video_aalib=no
-         cat > conftest.$ac_ext <<EOF
--#line 5411 "configure"
-+#line 5416 "configure"
- #include "confdefs.h"
- 
-          #include <aalib.h>
-@@ -5417,7 +5422,7 @@ int main() {
-         
- ; return 0; }
- EOF
--if { (eval echo configure:5421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-         video_aalib=yes
-@@ -5468,10 +5473,10 @@ CheckOpenGL()
- {
-     if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
-         echo $ac_n "checking for OpenGL (GLX) support""... $ac_c" 1>&6
--echo "configure:5472: checking for OpenGL (GLX) support" >&5
-+echo "configure:5477: checking for OpenGL (GLX) support" >&5
-         video_opengl=no
-         cat > conftest.$ac_ext <<EOF
--#line 5475 "configure"
-+#line 5480 "configure"
- #include "confdefs.h"
- 
-          #include <GL/gl.h>
-@@ -5483,7 +5488,7 @@ int main() {
-         
- ; return 0; }
- EOF
--if { (eval echo configure:5487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-         video_opengl=yes
-@@ -5497,7 +5502,7 @@ rm -f conftest*
-         if test x$video_opengl = xyes; then
-             CFLAGS="$CFLAGS -DHAVE_OPENGL"
-             echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:5501: checking for dlopen in -ldl" >&5
-+echo "configure:5506: checking for dlopen in -ldl" >&5
- ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5505,7 +5510,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-ldl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5509 "configure"
-+#line 5514 "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
-@@ -5516,7 +5521,7 @@ int main() {
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:5520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5571,10 +5576,10 @@ fi
- 
-     if test x$enable_input_events = xyes; then
-         echo $ac_n "checking for Linux 2.4 unified input interface""... $ac_c" 1>&6
--echo "configure:5575: checking for Linux 2.4 unified input interface" >&5
-+echo "configure:5580: checking for Linux 2.4 unified input interface" >&5
-         use_input_events=no
-         cat > conftest.$ac_ext <<EOF
--#line 5578 "configure"
-+#line 5583 "configure"
- #include "confdefs.h"
- 
-           #include <linux/input.h>
-@@ -5587,7 +5592,7 @@ int main() {
-         
- ; return 0; }
- EOF
--if { (eval echo configure:5591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-         use_input_events=yes
-@@ -5673,10 +5678,10 @@ fi
-     LIBS="$LIBS $pthread_lib"
-     if test x$enable_threads = xyes -a x$enable_pthreads = xyes; then
-         echo $ac_n "checking for pthreads""... $ac_c" 1>&6
--echo "configure:5677: checking for pthreads" >&5
-+echo "configure:5682: checking for pthreads" >&5
-         use_pthreads=no
-         cat > conftest.$ac_ext <<EOF
--#line 5680 "configure"
-+#line 5685 "configure"
- #include "confdefs.h"
- 
-          #include <pthread.h>
-@@ -5688,7 +5693,7 @@ int main() {
-         
- ; return 0; }
- EOF
--if { (eval echo configure:5692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   
-         use_pthreads=yes
-@@ -5706,10 +5711,10 @@ rm -f conftest*
- 
-             # Check to see if recursive mutexes are available
-             echo $ac_n "checking for recursive mutexes""... $ac_c" 1>&6
--echo "configure:5710: checking for recursive mutexes" >&5
-+echo "configure:5715: checking for recursive mutexes" >&5
-             has_recursive_mutexes=no
-             cat > conftest.$ac_ext <<EOF
--#line 5713 "configure"
-+#line 5718 "configure"
- #include "confdefs.h"
- 
-               #include <pthread.h>
-@@ -5725,7 +5730,7 @@ int main() {
-             
- ; return 0; }
- EOF
--if { (eval echo configure:5729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   
-             has_recursive_mutexes=yes
-@@ -5750,10 +5755,10 @@ rm -f conftest*
-             case "$target" in
-                 *-*-linux*)
-                     echo $ac_n "checking for broken glibc 2.0 pthreads""... $ac_c" 1>&6
--echo "configure:5754: checking for broken glibc 2.0 pthreads" >&5
-+echo "configure:5759: checking for broken glibc 2.0 pthreads" >&5
-                     glibc20_pthreads=no
-                     cat > conftest.$ac_ext <<EOF
--#line 5757 "configure"
-+#line 5762 "configure"
- #include "confdefs.h"
- 
-                       #include <features.h>
-@@ -5768,7 +5773,7 @@ int main() {
-                     
- ; return 0; }
- EOF
--if { (eval echo configure:5772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-                     glibc20_pthreads=yes
-@@ -5785,10 +5790,10 @@ rm -f conftest*
-     LIBS="$ac_save_libs"
- 
-     echo $ac_n "checking whether semun is defined in /usr/include/sys/sem.h""... $ac_c" 1>&6
--echo "configure:5789: checking whether semun is defined in /usr/include/sys/sem.h" >&5
-+echo "configure:5794: checking whether semun is defined in /usr/include/sys/sem.h" >&5
-     have_semun=no
-     cat > conftest.$ac_ext <<EOF
--#line 5792 "configure"
-+#line 5797 "configure"
- #include "confdefs.h"
- 
-       #include <sys/types.h>
-@@ -5800,7 +5805,7 @@ int main() {
-     
- ; return 0; }
- EOF
--if { (eval echo configure:5804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-     have_semun=yes
-@@ -5841,10 +5846,10 @@ fi
- CheckWIN32()
- {
-     echo $ac_n "checking Win32 compiler""... $ac_c" 1>&6
--echo "configure:5845: checking Win32 compiler" >&5
-+echo "configure:5850: checking Win32 compiler" >&5
-     have_win32_gcc=no
-     cat > conftest.$ac_ext <<EOF
--#line 5848 "configure"
-+#line 5853 "configure"
- #include "confdefs.h"
- 
-      #include <windows.h>
-@@ -5854,7 +5859,7 @@ int main() {
-     
- ; return 0; }
- EOF
--if { (eval echo configure:5858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-     have_win32_gcc=yes
-@@ -5896,10 +5901,10 @@ fi
- 
-     if test x$enable_directx = xyes; then
-         echo $ac_n "checking for DirectX headers and libraries""... $ac_c" 1>&6
--echo "configure:5900: checking for DirectX headers and libraries" >&5
-+echo "configure:5905: checking for DirectX headers and libraries" >&5
-         use_directx=no
-         cat > conftest.$ac_ext <<EOF
--#line 5903 "configure"
-+#line 5908 "configure"
- #include "confdefs.h"
- 
-          #include "src/video/windx5/directx.h"
-@@ -5909,7 +5914,7 @@ int main() {
-         
- ; return 0; }
- EOF
--if { (eval echo configure:5913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
-         use_directx=yes
-@@ -6889,8 +6894,10 @@ __EOF__
+@@ -7007,8 +7007,6 @@ __EOF__
    cat >>$new <$old
  
          fi
 -        # OpenBSD does not define "unix"
 -        CFLAGS="$CFLAGS -Dunix"
-+	# OpenBSD needs linking with ossaudio emulation library
-+	if test x$enable_oss = xyes; then
-+	    LIBS="$LIBS -lossaudio"
-+	fi
          ;;
      *-*-sysv5*)
          ARCH=sysv5
-@@ -8897,7 +8904,7 @@ if test $ARCH = solaris; then
+@@ -9015,7 +9013,11 @@ if test $ARCH = solaris; then
  fi
  
  if test $ARCH = openbsd; then
--  SDL_RLD_FLAGS="-L${X11BASE}/lib -Wl,-rpath,\${exec_prefix}/lib -Wl,-rpath,${X11BASE}/lib"
-+  SDL_RLD_FLAGS="-Wl,-rpath,${X11BASE}/lib"
+-  SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib $SYSTEM_LIBS"
++	if test x$have_x = xyes; then
++	    SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib -Wl,-rpath,${X11BASE}/lib $SYSTEM_LIBS"
++	else
++	    SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib $SYSTEM_LIBS"
++	fi
  fi
  
  if test x$enable_video = xtrue; then
diff --git a/devel/sdl/patches/patch-configure_in b/devel/sdl/patches/patch-configure_in
index 37ebb6e7486..80f20feb9fc 100644
--- a/devel/sdl/patches/patch-configure_in
+++ b/devel/sdl/patches/patch-configure_in
@@ -1,58 +1,40 @@
-$OpenBSD: patch-configure_in,v 1.10 2001/07/20 03:07:07 pvalchev Exp $
---- configure.in.orig	Mon Jun 18 09:21:38 2001
-+++ configure.in	Thu Jul 19 20:38:01 2001
-@@ -14,9 +14,9 @@ dnl Set various version strings - taken 
+$OpenBSD: patch-configure_in,v 1.11 2001/07/25 07:58:32 pvalchev Exp $
+--- configure.in.orig	Mon Jul 23 13:54:03 2001
++++ configure.in	Tue Jul 24 23:05:55 2001
+@@ -13,10 +13,10 @@ dnl Set various version strings - taken 
+ # set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0.
  #
  SDL_MAJOR_VERSION=1
- SDL_MINOR_VERSION=2
--SDL_MICRO_VERSION=1
--SDL_INTERFACE_AGE=1
--SDL_BINARY_AGE=1
-+SDL_MICRO_VERSION=2
-+SDL_INTERFACE_AGE=2
-+SDL_BINARY_AGE=2
+-SDL_MINOR_VERSION=2
+-SDL_MICRO_VERSION=2
+-SDL_INTERFACE_AGE=2
+-SDL_BINARY_AGE=2
++SDL_MINOR_VERSION=3
++SDL_MICRO_VERSION=3
++SDL_INTERFACE_AGE=3
++SDL_BINARY_AGE=3
  SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
  
  AC_SUBST(SDL_MAJOR_VERSION)
-@@ -246,7 +246,11 @@ CheckOSS()
-         AC_MSG_CHECKING(for OSS audio support)
-         have_oss=no
-         AC_TRY_COMPILE([
-+          #ifdef __OpenBSD__
-+          #include <soundcard.h>
-+          #else
-           #include <sys/soundcard.h>
-+          #endif
-         ],[
-           int arg = SNDCTL_DSP_SETFRAGMENT;
-         ],[
-@@ -289,6 +293,7 @@ CheckOPENBSDAUDIO()
- [  --enable-openbsdaudio   OpenBSD native audio support [default=no]],
-                   , enable_openbsdaudio=no)
-     if test x$enable_audio = xyes -a x$enable_openbsdaudio = xyes; then
-+	CFLAGS="$CFLAGS -DOPENBSD_SUPPORT"
-         SYSTEM_LIBS="$SYSTEM_LIBS $ESD_LIBS"
-         AUDIO_SUBDIRS="$AUDIO_SUBDIRS openbsd"
-         AUDIO_DRIVERS="$AUDIO_DRIVERS openbsd/libaudio_openbsd.la"
-@@ -1385,8 +1390,10 @@ case "$target" in
+@@ -1450,8 +1450,6 @@ case "$target" in
          if test x$enable_timers = xyes; then
              COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c)
          fi
 -        # OpenBSD does not define "unix"
 -        CFLAGS="$CFLAGS -Dunix"
-+	# OpenBSD needs linking with ossaudio emulation library
-+	if test x$enable_oss = xyes; then
-+	    LIBS="$LIBS -lossaudio"
-+	fi
          ;;
      *-*-sysv5*)
          ARCH=sysv5
-@@ -1959,7 +1966,7 @@ if test $ARCH = solaris; then
+@@ -2024,7 +2022,11 @@ if test $ARCH = solaris; then
  fi
  
  if test $ARCH = openbsd; then
--  SDL_RLD_FLAGS="-L${X11BASE}/lib -Wl,-rpath,\${exec_prefix}/lib -Wl,-rpath,${X11BASE}/lib"
-+  SDL_RLD_FLAGS="-Wl,-rpath,${X11BASE}/lib"
+-  SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib $SYSTEM_LIBS"
++	if test x$have_x = xyes; then
++	    SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib -Wl,-rpath,${X11BASE}/lib $SYSTEM_LIBS"
++	else
++	    SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib $SYSTEM_LIBS"
++	fi
  fi
  
  dnl Output the video drivers we use
diff --git a/devel/sdl/patches/patch-sdl-config_in b/devel/sdl/patches/patch-sdl-config_in
deleted file mode 100644
index d5860b4e4e5..00000000000
--- a/devel/sdl/patches/patch-sdl-config_in
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-sdl-config_in,v 1.1 2001/06/23 19:05:37 pvalchev Exp $
---- sdl-config.in.orig	Thu Jun 21 22:28:44 2001
-+++ sdl-config.in	Thu Jun 21 22:29:29 2001
-@@ -48,8 +48,8 @@ while test $# -gt 0; do
-       echo $includes -I@includedir@/SDL @SDL_CFLAGS@
-       ;;
- @ENABLE_SHARED_TRUE@    --libs)
--@ENABLE_SHARED_TRUE@      libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
--@ENABLE_SHARED_TRUE@      echo $libdirs @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@      libdirs="-L@libdir@ -Wl,-R@libdir@ @SDL_RLD_FLAGS@"
-+@ENABLE_SHARED_TRUE@      echo $libdirs @SDL_LIBS@ @SYSTEM_LIBS@
- @ENABLE_SHARED_TRUE@      ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
diff --git a/devel/sdl/patches/patch-src_audio_SDL_audio_c b/devel/sdl/patches/patch-src_audio_SDL_audio_c
deleted file mode 100644
index 4483186a9e3..00000000000
--- a/devel/sdl/patches/patch-src_audio_SDL_audio_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_audio_SDL_audio_c,v 1.7 2001/07/20 03:07:07 pvalchev Exp $
---- src/audio/SDL_audio.c.orig	Fri Jun 15 19:51:42 2001
-+++ src/audio/SDL_audio.c	Thu Jul 19 20:38:34 2001
-@@ -47,7 +47,7 @@ static AudioBootStrap *bootstrap[] = {
- #ifdef ALSA_SUPPORT
- 	&ALSA_bootstrap,
- #endif
--#ifdef __OpenBSD__
-+#ifdef OPENBSD_SUPPORT
- 	&OBSD_bootstrap,
- #endif
- #if (defined(unix) && !defined(__CYGWIN32__)) && \
diff --git a/devel/sdl/patches/patch-src_audio_SDL_audiodev_c b/devel/sdl/patches/patch-src_audio_SDL_audiodev_c
deleted file mode 100644
index 852a8caea6a..00000000000
--- a/devel/sdl/patches/patch-src_audio_SDL_audiodev_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_audio_SDL_audiodev_c,v 1.1 2001/06/23 19:05:38 pvalchev Exp $
---- src/audio/SDL_audiodev.c.orig	Fri Jun 22 14:13:36 2001
-+++ src/audio/SDL_audiodev.c	Fri Jun 22 14:14:04 2001
-@@ -39,7 +39,11 @@ static char rcsid =
- #include "SDL_audiodev_c.h"
- 
- #ifndef _PATH_DEV_DSP
-+#ifdef __OpenBSD__
-+#define _PATH_DEV_DSP	"/dev/audio"
-+#else
- #define _PATH_DEV_DSP	"/dev/dsp"
-+#endif
- #endif
- #ifndef _PATH_DEV_DSP24
- #define _PATH_DEV_DSP24	"/dev/sound/dsp"
diff --git a/devel/sdl/patches/patch-src_audio_dma_SDL_dmaaudio_c b/devel/sdl/patches/patch-src_audio_dma_SDL_dmaaudio_c
deleted file mode 100644
index 7f132a7beef..00000000000
--- a/devel/sdl/patches/patch-src_audio_dma_SDL_dmaaudio_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_audio_dma_SDL_dmaaudio_c,v 1.2 2001/06/23 19:05:39 pvalchev Exp $
---- src/audio/dma/SDL_dmaaudio.c.orig	Fri Jun 22 15:48:59 2001
-+++ src/audio/dma/SDL_dmaaudio.c	Fri Jun 22 15:49:16 2001
-@@ -39,7 +39,11 @@ static char rcsid =
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
-+#ifdef __OpenBSD__
-+#include <soundcard.h>
-+#else
- #include <sys/soundcard.h>
-+#endif
- 
- #ifndef MAP_FAILED
- #define MAP_FAILED	((Uint8 *)-1)
diff --git a/devel/sdl/patches/patch-src_audio_dsp_SDL_dspaudio_c b/devel/sdl/patches/patch-src_audio_dsp_SDL_dspaudio_c
deleted file mode 100644
index 84325260bab..00000000000
--- a/devel/sdl/patches/patch-src_audio_dsp_SDL_dspaudio_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_audio_dsp_SDL_dspaudio_c,v 1.2 2001/06/23 19:05:39 pvalchev Exp $
---- src/audio/dsp/SDL_dspaudio.c.orig	Fri Jun 22 15:48:03 2001
-+++ src/audio/dsp/SDL_dspaudio.c	Fri Jun 22 15:48:21 2001
-@@ -37,7 +37,11 @@ static char rcsid =
- #include <sys/time.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#ifdef __OpenBSD__
-+#include <soundcard.h>
-+#else
- #include <sys/soundcard.h>
-+#endif
- 
- #include "SDL_audio.h"
- #include "SDL_error.h"
diff --git a/devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c b/devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c
deleted file mode 100644
index cad476ad0f1..00000000000
--- a/devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c
+++ /dev/null
@@ -1,31 +0,0 @@
-$OpenBSD: patch-src_video_x11_SDL_x11gl_c,v 1.3 2001/07/13 21:36:00 pvalchev Exp $
---- src/video/x11/SDL_x11gl.c.orig	Thu May 10 18:35:31 2001
-+++ src/video/x11/SDL_x11gl.c	Fri Jul 13 15:19:15 2001
-@@ -393,7 +393,9 @@ int X11_GL_LoadLibrary(_THIS, const char
- 
- void *X11_GL_GetProcAddress(_THIS, const char* proc)
- {
-+	static char procname[1024];
- 	void* handle;
-+	void* retval;
- 	
- 	handle = this->gl_config.dll_handle;
- #if 0 /* This doesn't work correctly yet */
-@@ -407,7 +409,16 @@ fprintf(stderr, "glXGetProcAddress retur
-         return this->gl_data->glXGetProcAddress(proc);
- 	}
- #endif
--	return dlsym(handle, proc);
-+#if defined(__OpenBSD__) && !defined(__ELF__)
-+#undef dlsym(x,y);
-+#endif
-+	retval = dlsym(handle, proc);
-+	if (!retval && strlen(proc) <= 1022) {
-+		procname[0] = "_";
-+		strcpy(procname + 1, proc);
-+		retval = dlsym(handle, procname);
-+	}
-+	return retval;
- }
- 
- #endif /* HAVE_OPENGL */
diff --git a/devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c_h b/devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c_h
deleted file mode 100644
index 8e2a4fd0fa9..00000000000
--- a/devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c_h
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_video_x11_SDL_x11gl_c_h,v 1.1 2001/07/13 21:36:01 pvalchev Exp $
---- src/video/x11/SDL_x11gl_c.h.orig	Fri Jul 13 13:53:44 2001
-+++ src/video/x11/SDL_x11gl_c.h	Fri Jul 13 13:54:39 2001
-@@ -28,6 +28,9 @@ static char rcsid =
- #ifdef HAVE_OPENGL
- #include <GL/glx.h>
- #include <dlfcn.h>
-+#if defined(__OpenBSD__) && !defined(__ELF__)
-+#define dlsym(x,y) dlsym(x, "_" y)
-+#endif
- #endif
- #include "SDL_sysvideo.h"
- 
diff --git a/devel/sdl/pkg/PFRAG.shared b/devel/sdl/pkg/PFRAG.shared
index 6e3976a730f..46b3ac429d2 100644
--- a/devel/sdl/pkg/PFRAG.shared
+++ b/devel/sdl/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2001/07/11 16:45:45 pvalchev Exp $
-lib/libSDL.so.0.2
+@comment $OpenBSD: PFRAG.shared,v 1.4 2001/07/25 07:58:32 pvalchev Exp $
+lib/libSDL.so.0.3
 DYNLIBDIR(%B)