Update to 1.0.4

PR:		16607
Submitted by:	Maxim Sobolev <sobomax@altavista.net>

4 files changed, 46 insertions, 19 deletions

diff --git a/devel/sdl-devel/Makefile b/devel/sdl-devel/Makefile
index ab7b9436e05f..23dcbefd4875 100644
--- a/devel/sdl-devel/Makefile
+++ b/devel/sdl-devel/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	SDL
-# Version required:			1.0.3
+# Version required:			1.0.4
 # Date created:				8 August 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		SDL-1.0.3
-PKGNAME=		sdl-1.0.3
+DISTNAME=		SDL-1.0.4
+PKGNAME=		sdl-1.0.4
 CATEGORIES=		devel
 MASTER_SITES=		http://www.devolution.com/~slouken/SDL/release/
 
diff --git a/devel/sdl-devel/distinfo b/devel/sdl-devel/distinfo
index f84b72a7d11a..04c02aa45349 100644
--- a/devel/sdl-devel/distinfo
+++ b/devel/sdl-devel/distinfo
@@ -1 +1 @@
-MD5 (SDL-1.0.3.tar.gz) = b5592e3ff5c35612a9295cf05a24ffbe
+MD5 (SDL-1.0.4.tar.gz) = b90f4c9de63b4b3b82f65b6fe04fc76b
diff --git a/devel/sdl-devel/files/patch-ac b/devel/sdl-devel/files/patch-ac
index 64f6440c88b9..1979a1121aa3 100644
--- a/devel/sdl-devel/files/patch-ac
+++ b/devel/sdl-devel/files/patch-ac
@@ -1,6 +1,6 @@
---- configure.orig	Tue Dec 14 01:33:42 1999
-+++ configure	Sat Jan  8 23:23:37 2000
-@@ -3030,7 +3030,7 @@
+--- configure.orig	Tue Feb  8 03:53:58 2000
++++ configure	Tue Feb  8 11:31:03 2000
+@@ -3016,7 +3016,7 @@
       echo "$ac_t""yes" 1>&6
       
              CFLAGS="$CFLAGS -DESD_SUPPORT $ESD_CFLAGS"
@@ -9,21 +9,16 @@
               
    else
       echo "$ac_t""no" 1>&6
-@@ -4333,11 +4333,11 @@
- 
+@@ -4326,7 +4326,7 @@
      ac_save_libs="$LIBS"
      case "$target" in
--        *-*-freebsd*)
-+        *-*-frebsd*)
-             pthread_lib="-lc_r"
-             ;;
-         *)
--            pthread_lib="-lpthread"
+         *-*-freebsd*)
+-            pthread_lib="-lc_r"
 +            pthread_lib="-L""$LOCALBASE""/lib -llthread -llgcc_r"
              ;;
-     esac
-     LIBS="$LIBS $pthread_lib"
-@@ -4371,7 +4371,7 @@
+         *-*-openbsd*)
+             pthread_lib="-lc_r"
+@@ -4366,7 +4366,7 @@
          echo "$ac_t""$use_pthreads" 1>&6
          if test x$use_pthreads = xyes; then
              CFLAGS="$CFLAGS -D_REENTRANT -DSDL_USE_PTHREADS"
@@ -32,7 +27,7 @@
              SDL_LIBS="$SDL_LIBS $pthread_lib"
          fi
      fi
-@@ -4851,6 +4851,7 @@
+@@ -4955,6 +4955,7 @@
          ;;
      *-*-freebsd*)
          ARCH=freebsd
@@ -40,3 +35,32 @@
          CheckESD
          CheckX11
          CheckPTHREAD
+@@ -5038,6 +5039,28 @@
+ __EOF__
+   cat >>$new <$old
+ 
++
++  echo "Copying src/audio/linux/SDL_dspaudio.h -> src/audio/SDL_dspaudio.h"
++  old="$srcdir/src/audio/linux/SDL_dspaudio.h"
++  new="$srcdir/src/audio/SDL_dspaudio.h"
++  cat >$new <<__EOF__
++/* WARNING:  This file was automatically generated!
++ * Original: $old
++ */
++__EOF__
++  cat >>$new <$old
++
++            
++  echo "Copying src/audio/linux/SDL_dspaudio.c -> src/audio/SDL_dspaudio.c"
++  old="$srcdir/src/audio/linux/SDL_dspaudio.c"
++  new="$srcdir/src/audio/SDL_dspaudio.c"
++  cat >$new <<__EOF__
++/* WARNING:  This file was automatically generated!
++ * Original: $old
++ */
++__EOF__
++  cat >>$new <$old
++  
+         fi
+         # Set up files for the cdrom library
+         if test x$enable_cdrom = xyes; then
diff --git a/devel/sdl-devel/pkg-plist b/devel/sdl-devel/pkg-plist
index a7c4b2e94388..31b1cc9fa09a 100644
--- a/devel/sdl-devel/pkg-plist
+++ b/devel/sdl-devel/pkg-plist
@@ -32,6 +32,9 @@ lib/libSDLmain.a
 @exec /sbin/ldconfig -m %B
 @unexec /sbin/ldconfig -R
 share/aclocal/sdl.m4
+share/doc/SDL/.codeblock
+share/doc/SDL/.header
+share/doc/SDL/.macros
 share/doc/SDL/BUGS
 share/doc/SDL/COPYING
 share/doc/SDL/CREDITS