Update to 1.1.6. Changes are bugfixes only.

5 files changed, 28 insertions, 22 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index b614ce82e94..b1ed1bcfea6 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2000/10/22 16:55:19 rh Exp $
+# $NetBSD: Makefile,v 1.5 2000/12/03 04:33:10 wiz Exp $
 #
 
-DISTNAME=	SDL-1.1.5
-PKGNAME=	${DISTNAME}nb1
+DISTNAME=	SDL-1.1.6
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
diff --git a/devel/SDL/files/md5 b/devel/SDL/files/md5
index 01b0aad84f2..9641a07185e 100644
--- a/devel/SDL/files/md5
+++ b/devel/SDL/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/10/15 07:39:44 wulf Exp $
+$NetBSD: md5,v 1.3 2000/12/03 04:33:10 wiz Exp $
 
-MD5 (SDL-1.1.5.tar.gz) = f3e32edb188674ded00eb0b88ddd32bf
+MD5 (SDL-1.1.6.tar.gz) = e41b349360395feac648bfa6f50a1e77
diff --git a/devel/SDL/files/patch-sum b/devel/SDL/files/patch-sum
index 482afc89e79..81f73e5e823 100644
--- a/devel/SDL/files/patch-sum
+++ b/devel/SDL/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/10/22 16:55:20 rh Exp $
+$NetBSD: patch-sum,v 1.5 2000/12/03 04:33:10 wiz Exp $
 
 MD5 (patch-aa) = 9f1f063534b7a1687ee160a02ba55957
 MD5 (patch-ab) = 9b3e6e48901394b9af2146c9e3d23bad
@@ -15,6 +15,6 @@ MD5 (patch-al) = 1d1ce08c9ec803e011386cacb33c7fa8
 MD5 (patch-am) = 5d49c17ae9fc9ff82a1a747c6778712a
 MD5 (patch-an) = 7c663d0be5b3f1a9545af4443103c6c2
 MD5 (patch-ao) = dcb932729d2cea06df4788d4ba9d628c
-MD5 (patch-ap) = 5d5c4b7ff8c5b3ce1b41b6ece6b71608
+MD5 (patch-ap) = f499aa70dc9a96453af2fc4ec015440e
 MD5 (patch-aq) = baf921367a68a6fa0fe505bf54ea78be
 MD5 (patch-ar) = 36429d971ad89b611e135851d4ff6612
diff --git a/devel/SDL/patches/patch-ap b/devel/SDL/patches/patch-ap
index b756b15bf25..355b93920de 100644
--- a/devel/SDL/patches/patch-ap
+++ b/devel/SDL/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.1 2000/10/22 16:55:21 rh Exp $
+$NetBSD: patch-ap,v 1.2 2000/12/03 04:33:11 wiz Exp $
 
---- src/timer/linux/SDL_systimer.c.orig	Fri May 19 23:59:30 2000
+--- src/timer/linux/SDL_systimer.c.orig	Sun Oct 22 22:35:19 2000
 +++ src/timer/linux/SDL_systimer.c
-@@ -36,8 +36,13 @@
+@@ -36,6 +36,10 @@
  #include "SDL_timer.h"
  #include "SDL_timer_c.h"
  
@@ -12,17 +12,14 @@ $NetBSD: patch-ap,v 1.1 2000/10/22 16:55:21 rh Exp $
 +
  #if defined(DISABLE_THREADS) || defined(FORK_HACK)
  #define USE_ITIMER
-+#else
- #endif
- 
- /* The first ticks value of the application */
-@@ -75,6 +80,9 @@
- 	then = SDL_GetTicks();
  #endif
+@@ -96,6 +100,9 @@
  	do {
+ 		errno = 0;
+ 
 +#if _POSIX_THREAD_SYSCALL_SOFT
 +		pthread_yield_np();
 +#endif
- 		errno = 0;
- #ifndef linux
- 		/* Calculate the time interval left (in case of interrupt) */
+ #ifdef USE_NANOSLEEP
+ 		tv.tv_sec = elapsed.tv_sec;
+ 		tv.tv_nsec = elapsed.tv_nsec;
diff --git a/devel/SDL/pkg/PLIST b/devel/SDL/pkg/PLIST
index 48023b969e0..bc581ed5e36 100644
--- a/devel/SDL/pkg/PLIST
+++ b/devel/SDL/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/10/22 16:55:21 rh Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/12/03 04:33:11 wiz Exp $
 bin/sdl-config
 include/SDL/SDL.h
 include/SDL/SDL_active.h
@@ -25,9 +25,9 @@ include/SDL/SDL_version.h
 include/SDL/SDL_video.h
 include/SDL/begin_code.h
 include/SDL/close_code.h
-lib/libSDL.so.5.0
 lib/libSDL.a
 lib/libSDL.la
+lib/libSDL.so.5.1
 lib/libSDLmain.a
 man/man3/SDLKey.3
 man/man3/SDL_ActiveEvent.3
@@ -70,6 +70,7 @@ man/man3/SDL_DestroyCond.3
 man/man3/SDL_DestroyMutex.3
 man/man3/SDL_DestroySemaphore.3
 man/man3/SDL_DisplayFormat.3
+man/man3/SDL_DisplayFormatAlpha.3
 man/man3/SDL_DisplayYUVOverlay.3
 man/man3/SDL_EnableKeyRepeat.3
 man/man3/SDL_EnableUNICODE.3
@@ -90,12 +91,16 @@ man/man3/SDL_GLattr.3
 man/man3/SDL_GetAppState.3
 man/man3/SDL_GetAudioStatus.3
 man/man3/SDL_GetCursor.3
+man/man3/SDL_GetGamma.3
+man/man3/SDL_GetGammaRamp.3
 man/man3/SDL_GetKeyName.3
 man/man3/SDL_GetKeyState.3
 man/man3/SDL_GetModState.3
 man/man3/SDL_GetMouseState.3
 man/man3/SDL_GetRGB.3
+man/man3/SDL_GetRGBA.3
 man/man3/SDL_GetRelativeMouseState.3
+man/man3/SDL_GetThreadID.3
 man/man3/SDL_GetTicks.3
 man/man3/SDL_GetVideoInfo.3
 man/man3/SDL_GetVideoSurface.3
@@ -129,6 +134,7 @@ man/man3/SDL_LockAudio.3
 man/man3/SDL_LockSurface.3
 man/man3/SDL_LockYUVOverlay.3
 man/man3/SDL_MapRGB.3
+man/man3/SDL_MapRGBA.3
 man/man3/SDL_MixAudio.3
 man/man3/SDL_MouseButtonEvent.3
 man/man3/SDL_MouseMotionEvent.3
@@ -155,12 +161,15 @@ man/man3/SDL_SemValue.3
 man/man3/SDL_SemWait.3
 man/man3/SDL_SemWaitTimeout.3
 man/man3/SDL_SetAlpha.3
-man/man3/SDL_SetClipping.3
+man/man3/SDL_SetClipRect.3
 man/man3/SDL_SetColorKey.3
 man/man3/SDL_SetColors.3
 man/man3/SDL_SetCursor.3
 man/man3/SDL_SetEventFilter.3
+man/man3/SDL_SetGamma.3
+man/man3/SDL_SetGammaRamp.3
 man/man3/SDL_SetModState.3
+man/man3/SDL_SetPalette.3
 man/man3/SDL_SetTimer.3
 man/man3/SDL_SetVideoMode.3
 man/man3/SDL_ShowCursor.3
@@ -184,6 +193,7 @@ man/man3/SDL_WM_ToggleFullScreen.3
 man/man3/SDL_WaitEvent.3
 man/man3/SDL_WaitThread.3
 man/man3/SDL_WarpMouse.3
+man/man3/SDL_WasInit.3
 man/man3/SDL_keysym.3
 man/man3/SDL_mutexP.3
 man/man3/SDL_mutexV.3