Update to 1.2.12:

1.2.12:
	Added SDL_VIDEO_ALLOW_SCREENSAVER to override SDL's disabling
	of the screensaver on Mac OS X and X11.

Also, many pkgsrc patches were integrated.

7 files changed, 8 insertions, 133 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 4a2b51f463e..104fdb3ce9d 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2007/05/19 22:48:52 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2007/07/25 23:31:08 wiz Exp $
 
-DISTNAME=	SDL-1.2.11
-PKGREVISION=	2
+DISTNAME=	SDL-1.2.12
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
@@ -56,7 +55,7 @@ BUILDLINK_PASSTHRU_DIRS+=	${dir}
 .include "../../mk/oss.buildlink3.mk"
 
 AM_CFLAGS=		-D_PATH_DEV_DSP="\"${DEVOSSAUDIO}\""
-MAKE_ENV+=		AM_CFLAGS=${AM_CFLAGS:Q}
+MAKE_ENV+=		AM_CFLAGS=${AM_CFLAGS:M*:Q}
 
 # Irix comes with GL, which works fine for SDL
 .if ${OPSYS} != "IRIX" && ${OPSYS} != "Darwin"
diff --git a/devel/SDL/PLIST b/devel/SDL/PLIST
index b56c3e7a8ae..6dbaddde4e8 100644
--- a/devel/SDL/PLIST
+++ b/devel/SDL/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/07/03 21:49:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/07/25 23:31:08 wiz Exp $
 bin/sdl-config
 include/SDL/SDL.h
 include/SDL/SDL_active.h
@@ -6,14 +6,6 @@ include/SDL/SDL_audio.h
 include/SDL/SDL_byteorder.h
 include/SDL/SDL_cdrom.h
 include/SDL/SDL_config.h
-include/SDL/SDL_config_amiga.h
-include/SDL/SDL_config_dreamcast.h
-include/SDL/SDL_config_macos.h
-include/SDL/SDL_config_macosx.h
-include/SDL/SDL_config_minimal.h
-include/SDL/SDL_config_os2.h
-include/SDL/SDL_config_win32.h
-include/SDL/SDL_copying.h
 include/SDL/SDL_cpuinfo.h
 include/SDL/SDL_endian.h
 include/SDL/SDL_error.h
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 55c64b3d91d..9170923a96f 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.47 2006/10/08 18:40:23 ben Exp $
+$NetBSD: distinfo,v 1.48 2007/07/25 23:31:08 wiz Exp $
 
-SHA1 (SDL-1.2.11.tar.gz) = 2259134d714e35ab1469d513674a3cd02510d198
-RMD160 (SDL-1.2.11.tar.gz) = 91dc8877224415a4ba59e1de57c31861e550d644
-Size (SDL-1.2.11.tar.gz) = 2796407 bytes
+SHA1 (SDL-1.2.12.tar.gz) = 2c37ff1683368369c0f555d4a742f0544153610d
+RMD160 (SDL-1.2.12.tar.gz) = 3871023c63ea056eba43ce4f55ee8d3a73ff3022
+Size (SDL-1.2.12.tar.gz) = 2829456 bytes
 SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f
-SHA1 (patch-aj) = 21b77004d782b5da7973e8ccb8bdd686efca1684
-SHA1 (patch-am) = 0a99757ca6dbed3f46c6ed2a04a3e65d81f92b3b
-SHA1 (patch-an) = 2bb3ca98579ce38e055f789664ed8d71881c1288
-SHA1 (patch-ao) = 1d65b32d91980fa1c8dbbfe7a071b5bf81bcfa18
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
deleted file mode 100644
index 3d49a969cd6..00000000000
--- a/devel/SDL/patches/patch-aj
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-aj,v 1.25 2006/06/12 16:20:44 wiz Exp $
-
---- configure.in.orig	2006-05-17 03:16:07.000000000 +0000
-+++ configure.in
-@@ -512,10 +512,10 @@ AC_HELP_STRING([--enable-nas], [support 
-     if test x$enable_audio = xyes -a x$enable_nas = xyes; then
-         AC_MSG_CHECKING(for NAS audio support)
-         have_nas=no
--        if test -r /usr/X11R6/include/audio/audiolib.h; then
-+        if true; then
-             have_nas=yes
--            NAS_CFLAGS="-I/usr/X11R6/include/"
--            NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt"
-+            NAS_CFLAGS=""
-+            NAS_LIBS="-laudio -lXt"
- 
-         dnl On IRIX, the NAS includes are in a different directory,
-         dnl and libnas must be explicitly linked in
-@@ -1642,7 +1642,7 @@ AC_HELP_STRING([--enable-pthread-sem], [
-             ;;
-         *-*-netbsd*)
-             pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
--            pthread_lib="-L/usr/lib -lpthread"
-+            pthread_lib="-lpthread"
-             ;;
-         *-*-openbsd*)
-             pthread_cflags="-D_REENTRANT"
-@@ -1985,8 +1985,13 @@ CheckUSBHID()
-               #if defined(HAVE_USB_H)
-               #include <usb.h>
-               #endif
-+	      #ifdef __DragonFly__
-+              #include <bus/usb/usb.h>
-+              #include <bus/usb/usbhid.h>
-+	      #else
-               #include <dev/usb/usb.h>
-               #include <dev/usb/usbhid.h>
-+	      #endif
-               #if defined(HAVE_USBHID_H)
-               #include <usbhid.h>
-               #elif defined(HAVE_LIBUSB_H)
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
deleted file mode 100644
index 77cf299caef..00000000000
--- a/devel/SDL/patches/patch-am
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-am,v 1.20 2006/06/12 16:20:44 wiz Exp $
-
---- configure.orig	2006-05-17 06:53:45.000000000 +0000
-+++ configure
-@@ -24747,10 +24747,10 @@ 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
--        if test -r /usr/X11R6/include/audio/audiolib.h; then
-+        if true; then
-             have_nas=yes
--            NAS_CFLAGS="-I/usr/X11R6/include/"
--            NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt"
-+            NAS_CFLAGS=""
-+            NAS_LIBS="-laudio -lXt"
- 
- 
-         elif test -r /usr/freeware/include/nas/audiolib.h; then
-@@ -29638,7 +29638,7 @@ fi;
-             ;;
-         *-*-netbsd*)
-             pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
--            pthread_lib="-L/usr/lib -lpthread"
-+            pthread_lib="-lpthread"
-             ;;
-         *-*-openbsd*)
-             pthread_cflags="-D_REENTRANT"
-@@ -31986,8 +31986,13 @@ cat >>conftest.$ac_ext <<_ACEOF
-               #if defined(HAVE_USB_H)
-               #include <usb.h>
-               #endif
-+	      #ifdef __DragonFly__
-+              #include <bus/usb/usb.h>
-+              #include <bus/usb/usbhid.h>
-+	      #else
-               #include <dev/usb/usb.h>
-               #include <dev/usb/usbhid.h>
-+	      #endif
-               #if defined(HAVE_USBHID_H)
-               #include <usbhid.h>
-               #elif defined(HAVE_LIBUSB_H)
diff --git a/devel/SDL/patches/patch-an b/devel/SDL/patches/patch-an
deleted file mode 100644
index fd503e33cdb..00000000000
--- a/devel/SDL/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.4 2006/08/03 20:21:20 rillig Exp $
-
-For Solaris 8.
-
---- src/video/dga/SDL_dgaevents.c.orig	2006-05-01 10:02:44.000000000 +0200
-+++ src/video/dga/SDL_dgaevents.c	2006-08-03 22:02:23.969158093 +0200
-@@ -24,6 +24,8 @@
- /* Handle the event stream, converting DGA events into SDL events */
- 
- #include <stdio.h>
-+#define NEED_EVENTS
-+#define NEED_REPLIES
- #include <X11/Xlib.h>
- #include "../Xext/extensions/xf86dga.h"
- 
diff --git a/devel/SDL/patches/patch-ao b/devel/SDL/patches/patch-ao
deleted file mode 100644
index 62c021d4c00..00000000000
--- a/devel/SDL/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2006/08/03 20:21:20 rillig Exp $
-
-For Solaris 8.
-
---- src/video/dga/SDL_dgavideo.c.orig	2006-05-12 05:02:30.000000000 +0200
-+++ src/video/dga/SDL_dgavideo.c	2006-08-03 22:02:35.629237082 +0200
-@@ -26,6 +26,8 @@
- 
- #include <stdio.h>
- 
-+#define NEED_EVENTS
-+#define NEED_REPLIES
- #include <X11/Xlib.h>
- #include "../Xext/extensions/xf86dga.h"
-