10 files changed, 92 insertions, 34 deletions

diff --git a/devel/sdl-devel/Makefile b/devel/sdl-devel/Makefile
index cebc3d0f453b..a352863322f8 100644
--- a/devel/sdl-devel/Makefile
+++ b/devel/sdl-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdl-devel
-PORTVERSION=	1.1.6
+PORTVERSION=	1.1.7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/ \
 		http://www.devolution.com/~slouken/SDL/release/
@@ -18,7 +18,6 @@ LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
 		vga.1:${PORTSDIR}/graphics/svgalib
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
-USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_ESOUND=	yes
 INSTALLS_SHLIB=	yes
diff --git a/devel/sdl-devel/distinfo b/devel/sdl-devel/distinfo
index 923398521987..cd1f0ec7ad85 100644
--- a/devel/sdl-devel/distinfo
+++ b/devel/sdl-devel/distinfo
@@ -1 +1 @@
-MD5 (SDL-1.1.6.tar.gz) = e41b349360395feac648bfa6f50a1e77
+MD5 (SDL-1.1.7.tar.gz) = ce181f1e8173bc071bc9f98d9633ccae
diff --git a/devel/sdl-devel/files/patch-ac b/devel/sdl-devel/files/patch-ac
index 1995e1aec6f8..8e0b1cfa2709 100644
--- a/devel/sdl-devel/files/patch-ac
+++ b/devel/sdl-devel/files/patch-ac
@@ -1,15 +1,6 @@
---- configure.orig	Tue Oct  3 19:01:18 2000
-+++ configure	Thu Oct  5 19:49:53 2000
-@@ -609,7 +609,7 @@
- SDL_MAJOR_VERSION=1
- SDL_MINOR_VERSION=1
- SDL_MICRO_VERSION=6
--SDL_INTERFACE_AGE=1
-+SDL_INTERFACE_AGE=2
- SDL_BINARY_AGE=6
- SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
- 
-@@ -622,9 +622,9 @@
+--- configure.orig	Thu Dec 21 07:02:47 2000
++++ configure	Wed Jan  3 13:37:14 2001
+@@ -630,9 +630,9 @@
  
  # libtool versioning
  LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -21,7 +12,7 @@
  
  
  
-@@ -3012,7 +3012,7 @@
+@@ -3022,7 +3022,7 @@
  
  
  SDL_CFLAGS=""
@@ -30,3 +21,18 @@
  
  
  case "$target" in
+@@ -5899,10 +5899,10 @@
+   cat >>$new <$old
+ 
+         # Set up files for the audio library
+-        if test x$enable_audio = xyes; then
+-            AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
+-            AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
+-        fi
++        #if test x$enable_audio = xyes; then
++        #    AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
++        #    AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
++        #fi
+         # Set up files for the joystick library
+         # (No joystick support yet)
+         if test x$enable_joystick = xyes; then
diff --git a/devel/sdl-devel/files/patch-src_audio_SDL__audio.c b/devel/sdl-devel/files/patch-src_audio_SDL__audio.c
new file mode 100644
index 000000000000..bec914983b26
--- /dev/null
+++ b/devel/sdl-devel/files/patch-src_audio_SDL__audio.c
@@ -0,0 +1,11 @@
+--- src/audio/SDL_audio.c	2001/01/03 11:25:01	1.1
++++ src/audio/SDL_audio.c	2001/01/03 11:25:24
+@@ -41,7 +41,7 @@
+ 
+ /* Available audio drivers */
+ static AudioBootStrap *bootstrap[] = {
+-#if defined(unix) && !defined(linux)
++#if defined(unix) && !defined(linux) && !defined(__FreeBSD__)
+ 	&AUDIO_bootstrap,
+ #endif
+ #ifdef OSS_SUPPORT
diff --git a/devel/sdl-devel/pkg-plist b/devel/sdl-devel/pkg-plist
index f7253c7cf2a4..1e447f488ae2 100644
--- a/devel/sdl-devel/pkg-plist
+++ b/devel/sdl-devel/pkg-plist
@@ -44,9 +44,14 @@ share/doc/SDL11/docs/html/event.html
 share/doc/SDL11/docs/html/eventfunctions.html
 share/doc/SDL11/docs/html/eventstructures.html
 share/doc/SDL11/docs/html/general.html
+share/doc/SDL11/docs/html/guideexamples.html
+share/doc/SDL11/docs/html/guideinput.html
+share/doc/SDL11/docs/html/guidepreface.html
+share/doc/SDL11/docs/html/guidethebasics.html
 share/doc/SDL11/docs/html/index.html
-share/doc/SDL11/docs/html/intro.html
 share/doc/SDL11/docs/html/joystick.html
+share/doc/SDL11/docs/html/p255.html
+share/doc/SDL11/docs/html/p8.html
 share/doc/SDL11/docs/html/sdlactiveevent.html
 share/doc/SDL11/docs/html/sdladdtimer.html
 share/doc/SDL11/docs/html/sdlaudiocvt.html
@@ -218,6 +223,14 @@ share/doc/SDL11/docs/html/thread.html
 share/doc/SDL11/docs/html/time.html
 share/doc/SDL11/docs/html/video.html
 share/doc/SDL11/docs/html/wm.html
+share/doc/SDL11/docs/html/x15.html
+share/doc/SDL11/docs/html/x178.html
+share/doc/SDL11/docs/html/x19.html
+share/doc/SDL11/docs/html/x211.html
+share/doc/SDL11/docs/html/x218.html
+share/doc/SDL11/docs/html/x229.html
+share/doc/SDL11/docs/html/x248.html
+share/doc/SDL11/docs/html/x36.html
 share/doc/SDL11/docs/index.html
 share/examples/SDL11/COPYING
 share/examples/SDL11/Makefile.am
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index cebc3d0f453b..a352863322f8 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdl-devel
-PORTVERSION=	1.1.6
+PORTVERSION=	1.1.7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/ \
 		http://www.devolution.com/~slouken/SDL/release/
@@ -18,7 +18,6 @@ LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
 		vga.1:${PORTSDIR}/graphics/svgalib
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
-USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_ESOUND=	yes
 INSTALLS_SHLIB=	yes
diff --git a/devel/sdl12/distinfo b/devel/sdl12/distinfo
index 923398521987..cd1f0ec7ad85 100644
--- a/devel/sdl12/distinfo
+++ b/devel/sdl12/distinfo
@@ -1 +1 @@
-MD5 (SDL-1.1.6.tar.gz) = e41b349360395feac648bfa6f50a1e77
+MD5 (SDL-1.1.7.tar.gz) = ce181f1e8173bc071bc9f98d9633ccae
diff --git a/devel/sdl12/files/patch-ac b/devel/sdl12/files/patch-ac
index 1995e1aec6f8..8e0b1cfa2709 100644
--- a/devel/sdl12/files/patch-ac
+++ b/devel/sdl12/files/patch-ac
@@ -1,15 +1,6 @@
---- configure.orig	Tue Oct  3 19:01:18 2000
-+++ configure	Thu Oct  5 19:49:53 2000
-@@ -609,7 +609,7 @@
- SDL_MAJOR_VERSION=1
- SDL_MINOR_VERSION=1
- SDL_MICRO_VERSION=6
--SDL_INTERFACE_AGE=1
-+SDL_INTERFACE_AGE=2
- SDL_BINARY_AGE=6
- SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
- 
-@@ -622,9 +622,9 @@
+--- configure.orig	Thu Dec 21 07:02:47 2000
++++ configure	Wed Jan  3 13:37:14 2001
+@@ -630,9 +630,9 @@
  
  # libtool versioning
  LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -21,7 +12,7 @@
  
  
  
-@@ -3012,7 +3012,7 @@
+@@ -3022,7 +3022,7 @@
  
  
  SDL_CFLAGS=""
@@ -30,3 +21,18 @@
  
  
  case "$target" in
+@@ -5899,10 +5899,10 @@
+   cat >>$new <$old
+ 
+         # Set up files for the audio library
+-        if test x$enable_audio = xyes; then
+-            AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
+-            AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
+-        fi
++        #if test x$enable_audio = xyes; then
++        #    AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
++        #    AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
++        #fi
+         # Set up files for the joystick library
+         # (No joystick support yet)
+         if test x$enable_joystick = xyes; then
diff --git a/devel/sdl12/files/patch-src_audio_SDL__audio.c b/devel/sdl12/files/patch-src_audio_SDL__audio.c
new file mode 100644
index 000000000000..bec914983b26
--- /dev/null
+++ b/devel/sdl12/files/patch-src_audio_SDL__audio.c
@@ -0,0 +1,11 @@
+--- src/audio/SDL_audio.c	2001/01/03 11:25:01	1.1
++++ src/audio/SDL_audio.c	2001/01/03 11:25:24
+@@ -41,7 +41,7 @@
+ 
+ /* Available audio drivers */
+ static AudioBootStrap *bootstrap[] = {
+-#if defined(unix) && !defined(linux)
++#if defined(unix) && !defined(linux) && !defined(__FreeBSD__)
+ 	&AUDIO_bootstrap,
+ #endif
+ #ifdef OSS_SUPPORT
diff --git a/devel/sdl12/pkg-plist b/devel/sdl12/pkg-plist
index f7253c7cf2a4..1e447f488ae2 100644
--- a/devel/sdl12/pkg-plist
+++ b/devel/sdl12/pkg-plist
@@ -44,9 +44,14 @@ share/doc/SDL11/docs/html/event.html
 share/doc/SDL11/docs/html/eventfunctions.html
 share/doc/SDL11/docs/html/eventstructures.html
 share/doc/SDL11/docs/html/general.html
+share/doc/SDL11/docs/html/guideexamples.html
+share/doc/SDL11/docs/html/guideinput.html
+share/doc/SDL11/docs/html/guidepreface.html
+share/doc/SDL11/docs/html/guidethebasics.html
 share/doc/SDL11/docs/html/index.html
-share/doc/SDL11/docs/html/intro.html
 share/doc/SDL11/docs/html/joystick.html
+share/doc/SDL11/docs/html/p255.html
+share/doc/SDL11/docs/html/p8.html
 share/doc/SDL11/docs/html/sdlactiveevent.html
 share/doc/SDL11/docs/html/sdladdtimer.html
 share/doc/SDL11/docs/html/sdlaudiocvt.html
@@ -218,6 +223,14 @@ share/doc/SDL11/docs/html/thread.html
 share/doc/SDL11/docs/html/time.html
 share/doc/SDL11/docs/html/video.html
 share/doc/SDL11/docs/html/wm.html
+share/doc/SDL11/docs/html/x15.html
+share/doc/SDL11/docs/html/x178.html
+share/doc/SDL11/docs/html/x19.html
+share/doc/SDL11/docs/html/x211.html
+share/doc/SDL11/docs/html/x218.html
+share/doc/SDL11/docs/html/x229.html
+share/doc/SDL11/docs/html/x248.html
+share/doc/SDL11/docs/html/x36.html
 share/doc/SDL11/docs/index.html
 share/examples/SDL11/COPYING
 share/examples/SDL11/Makefile.am