Update to 1.1.3.

FreeBSD is now in the list of supported platforms, so number of patches
required to make SDL work here has been slightly reduced.

8 files changed, 32 insertions, 82 deletions

diff --git a/devel/sdl-devel/Makefile b/devel/sdl-devel/Makefile
index d4cb76fde25d..d8ff4fa26d72 100644
--- a/devel/sdl-devel/Makefile
+++ b/devel/sdl-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		sdl-devel
-PORTVERSION=		1.1.2
+PORTVERSION=		1.1.3
 CATEGORIES=		devel
 MASTER_SITES=		http://www.libsdl.org/release/ \
 			http://www.devolution.com/~slouken/SDL/release/
diff --git a/devel/sdl-devel/distinfo b/devel/sdl-devel/distinfo
index 9ec31ebe1c86..01cc6b25dafc 100644
--- a/devel/sdl-devel/distinfo
+++ b/devel/sdl-devel/distinfo
@@ -1 +1 @@
-MD5 (SDL-1.1.2.tar.gz) = 702a695e74d2e83215b7235bf6ebcd64
+MD5 (SDL-1.1.3.tar.gz) = 675cd5df455b32e7648c86cd734d5a33
diff --git a/devel/sdl-devel/files/patch-ac b/devel/sdl-devel/files/patch-ac
index bec6a4ef45a7..97164834bbf5 100644
--- a/devel/sdl-devel/files/patch-ac
+++ b/devel/sdl-devel/files/patch-ac
@@ -1,6 +1,15 @@
---- configure.orig	Fri Mar 31 08:26:24 2000
-+++ configure	Mon Apr 24 02:09:39 2000
-@@ -610,9 +610,9 @@
+--- configure.orig	Tue Jun  6 07:36:14 2000
++++ configure	Tue Jun  6 12:10:08 2000
+@@ -607,7 +607,7 @@
+ SDL_MAJOR_VERSION=1
+ SDL_MINOR_VERSION=1
+ SDL_MICRO_VERSION=3
+-SDL_INTERFACE_AGE=0
++SDL_INTERFACE_AGE=2
+ SDL_BINARY_AGE=3
+ SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
+ 
+@@ -620,9 +620,9 @@
  
  # libtool versioning
  LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -12,7 +21,7 @@
  
  
  
-@@ -2907,7 +2907,7 @@
+@@ -2939,7 +2939,7 @@
  
  
  SDL_CFLAGS=""
@@ -21,38 +30,3 @@
  
  
  # Check whether --enable-audio or --disable-audio was given.
-@@ -4616,7 +4616,7 @@
-         echo "$ac_t""$video_opengl" 1>&6
-         if test x$video_opengl = xyes; then
-             CFLAGS="$CFLAGS -DHAVE_OPENGL"
--            SYSTEM_LIBS="$SYSTEM_LIBS -ldl"
-+            SYSTEM_LIBS="$SYSTEM_LIBS"
-         fi
-     fi
- }
-@@ -4649,7 +4649,7 @@
-     ac_save_libs="$LIBS"
-     case "$target" in
-         *-*-freebsd*)
--            pthread_lib="-lc_r"
-+            pthread_lib="-pthread"
-             ;;
-         *-*-openbsd*)
-             pthread_lib="-lc_r"
-@@ -4689,7 +4689,7 @@
-         echo "$ac_t""$use_pthreads" 1>&6
-         if test x$use_pthreads = xyes; then
-             CFLAGS="$CFLAGS -D_REENTRANT -DSDL_USE_PTHREADS"
--            SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT"
-+            SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT -D_THREAD_SAFE"
-             SDL_LIBS="$SDL_LIBS $pthread_lib"
-             echo $ac_n "checking whether semun is defined in /usr/include/sys/sem.h""... $ac_c" 1>&6
- echo "configure:4696: checking whether semun is defined in /usr/include/sys/sem.h" >&5
-@@ -5356,6 +5356,7 @@
-         ;;
-     *-*-freebsd*)
-         ARCH=freebsd
-+        CheckNASM
-         CheckESD
-         CheckX11
-         CheckAAlib
diff --git a/devel/sdl-devel/pkg-plist b/devel/sdl-devel/pkg-plist
index c7bacf6fb602..36bdbce65ab5 100644
--- a/devel/sdl-devel/pkg-plist
+++ b/devel/sdl-devel/pkg-plist
@@ -95,6 +95,7 @@ share/examples/SDL11/testhread.c
 share/examples/SDL11/testjoystick.c
 share/examples/SDL11/testkeys.c
 share/examples/SDL11/testlock.c
+share/examples/SDL11/testsem.c
 share/examples/SDL11/testsprite.c
 share/examples/SDL11/testtimer.c
 share/examples/SDL11/testtypes.c
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index d4cb76fde25d..d8ff4fa26d72 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		sdl-devel
-PORTVERSION=		1.1.2
+PORTVERSION=		1.1.3
 CATEGORIES=		devel
 MASTER_SITES=		http://www.libsdl.org/release/ \
 			http://www.devolution.com/~slouken/SDL/release/
diff --git a/devel/sdl12/distinfo b/devel/sdl12/distinfo
index 9ec31ebe1c86..01cc6b25dafc 100644
--- a/devel/sdl12/distinfo
+++ b/devel/sdl12/distinfo
@@ -1 +1 @@
-MD5 (SDL-1.1.2.tar.gz) = 702a695e74d2e83215b7235bf6ebcd64
+MD5 (SDL-1.1.3.tar.gz) = 675cd5df455b32e7648c86cd734d5a33
diff --git a/devel/sdl12/files/patch-ac b/devel/sdl12/files/patch-ac
index bec6a4ef45a7..97164834bbf5 100644
--- a/devel/sdl12/files/patch-ac
+++ b/devel/sdl12/files/patch-ac
@@ -1,6 +1,15 @@
---- configure.orig	Fri Mar 31 08:26:24 2000
-+++ configure	Mon Apr 24 02:09:39 2000
-@@ -610,9 +610,9 @@
+--- configure.orig	Tue Jun  6 07:36:14 2000
++++ configure	Tue Jun  6 12:10:08 2000
+@@ -607,7 +607,7 @@
+ SDL_MAJOR_VERSION=1
+ SDL_MINOR_VERSION=1
+ SDL_MICRO_VERSION=3
+-SDL_INTERFACE_AGE=0
++SDL_INTERFACE_AGE=2
+ SDL_BINARY_AGE=3
+ SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
+ 
+@@ -620,9 +620,9 @@
  
  # libtool versioning
  LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -12,7 +21,7 @@
  
  
  
-@@ -2907,7 +2907,7 @@
+@@ -2939,7 +2939,7 @@
  
  
  SDL_CFLAGS=""
@@ -21,38 +30,3 @@
  
  
  # Check whether --enable-audio or --disable-audio was given.
-@@ -4616,7 +4616,7 @@
-         echo "$ac_t""$video_opengl" 1>&6
-         if test x$video_opengl = xyes; then
-             CFLAGS="$CFLAGS -DHAVE_OPENGL"
--            SYSTEM_LIBS="$SYSTEM_LIBS -ldl"
-+            SYSTEM_LIBS="$SYSTEM_LIBS"
-         fi
-     fi
- }
-@@ -4649,7 +4649,7 @@
-     ac_save_libs="$LIBS"
-     case "$target" in
-         *-*-freebsd*)
--            pthread_lib="-lc_r"
-+            pthread_lib="-pthread"
-             ;;
-         *-*-openbsd*)
-             pthread_lib="-lc_r"
-@@ -4689,7 +4689,7 @@
-         echo "$ac_t""$use_pthreads" 1>&6
-         if test x$use_pthreads = xyes; then
-             CFLAGS="$CFLAGS -D_REENTRANT -DSDL_USE_PTHREADS"
--            SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT"
-+            SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT -D_THREAD_SAFE"
-             SDL_LIBS="$SDL_LIBS $pthread_lib"
-             echo $ac_n "checking whether semun is defined in /usr/include/sys/sem.h""... $ac_c" 1>&6
- echo "configure:4696: checking whether semun is defined in /usr/include/sys/sem.h" >&5
-@@ -5356,6 +5356,7 @@
-         ;;
-     *-*-freebsd*)
-         ARCH=freebsd
-+        CheckNASM
-         CheckESD
-         CheckX11
-         CheckAAlib
diff --git a/devel/sdl12/pkg-plist b/devel/sdl12/pkg-plist
index c7bacf6fb602..36bdbce65ab5 100644
--- a/devel/sdl12/pkg-plist
+++ b/devel/sdl12/pkg-plist
@@ -95,6 +95,7 @@ share/examples/SDL11/testhread.c
 share/examples/SDL11/testjoystick.c
 share/examples/SDL11/testkeys.c
 share/examples/SDL11/testlock.c
+share/examples/SDL11/testsem.c
 share/examples/SDL11/testsprite.c
 share/examples/SDL11/testtimer.c
 share/examples/SDL11/testtypes.c