Update to SDL 1.1 (repo-copy from devel/sdl to devel/sdl-devel).

PR:		18188
Submitted by:	maintainer

5 files changed, 104 insertions, 9 deletions

diff --git a/devel/sdl12/files/patch-ac b/devel/sdl12/files/patch-ac
index 8585592c74a6..bec6a4ef45a7 100644
--- a/devel/sdl12/files/patch-ac
+++ b/devel/sdl12/files/patch-ac
@@ -1,6 +1,6 @@
---- configure.orig	Sat Mar  4 04:58:00 2000
-+++ configure	Mon Mar  6 13:40:33 2000
-@@ -604,9 +604,9 @@
+--- configure.orig	Fri Mar 31 08:26:24 2000
++++ configure	Mon Apr 24 02:09:39 2000
+@@ -610,9 +610,9 @@
  
  # libtool versioning
  LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -12,7 +12,25 @@
  
  
  
-@@ -4324,7 +4324,7 @@
+@@ -2907,7 +2907,7 @@
+ 
+ 
+ SDL_CFLAGS=""
+-SDL_LIBS="-lSDL"
++SDL_LIBS="-lSDL-1.1"
+ 
+ 
+ # 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*)
@@ -21,20 +39,20 @@
              ;;
          *-*-openbsd*)
              pthread_lib="-lc_r"
-@@ -4364,7 +4364,7 @@
+@@ -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"
-         fi
-     fi
-@@ -4953,6 +4953,7 @@
+             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
-         CheckPTHREAD
+         CheckAAlib
diff --git a/devel/sdl12/files/patch-ah b/devel/sdl12/files/patch-ah
new file mode 100644
index 000000000000..43115ee865d0
--- /dev/null
+++ b/devel/sdl12/files/patch-ah
@@ -0,0 +1,26 @@
+--- src/main/Makefile.in.orig	Sun Apr 23 22:37:43 2000
++++ src/main/Makefile.in	Sun Apr 23 22:45:12 2000
+@@ -109,7 +109,7 @@
+ ARCH_SUBDIRS = beos linux macos win32
+ 
+ # Build a separate library containing the main() entry point.
+-lib_LIBRARIES = libSDLmain.a
++lib_LIBRARIES = libSDLmain-1.1.a
+ 
+ MAINLIB_ARCH_SRCS = SDL_main.c
+ 
+@@ -257,10 +257,10 @@
+ 
+ maintainer-clean-libtool:
+ 
+-libSDLmain.a: $(libSDLmain_a_OBJECTS) $(libSDLmain_a_DEPENDENCIES)
+-	-rm -f libSDLmain.a
+-	$(AR) cru libSDLmain.a $(libSDLmain_a_OBJECTS) $(libSDLmain_a_LIBADD)
+-	$(RANLIB) libSDLmain.a
++libSDLmain-1.1.a: $(libSDLmain_a_OBJECTS) $(libSDLmain_a_DEPENDENCIES)
++	-rm -f libSDLmain-1.1.a
++	$(AR) cru libSDLmain-1.1.a $(libSDLmain_a_OBJECTS) $(libSDLmain_a_LIBADD)
++	$(RANLIB) libSDLmain-1.1.a
+ 
+ mostlyclean-noinstLTLIBRARIES:
+ 
diff --git a/devel/sdl12/files/patch-ai b/devel/sdl12/files/patch-ai
new file mode 100644
index 000000000000..6084e7e540c3
--- /dev/null
+++ b/devel/sdl12/files/patch-ai
@@ -0,0 +1,11 @@
+--- include/Makefile.in.orig	Sun Apr 23 22:34:25 2000
++++ include/Makefile.in	Sun Apr 23 22:34:43 2000
+@@ -106,7 +106,7 @@
+ with_gcc = @with_gcc@
+ with_gnu_ld = @with_gnu_ld@
+ 
+-libSDLincludedir = $(includedir)/SDL
++libSDLincludedir = $(includedir)/SDL11
+ 
+ # Which header files to install
+ libSDLinclude_HEADERS =  	SDL.h				SDL_active.h			SDL_audio.h			SDL_byteorder.h			SDL_cdrom.h			SDL_copying.h			SDL_endian.h			SDL_error.h			SDL_events.h			SDL_joystick.h			SDL_keyboard.h			SDL_keysym.h			SDL_main.h			SDL_mouse.h			SDL_mutex.h			SDL_quit.h			SDL_rwops.h			SDL_syswm.h			SDL_thread.h			SDL_timer.h			SDL_types.h			SDL_version.h			SDL_video.h			begin_code.h			close_code.h
diff --git a/devel/sdl12/files/patch-aj b/devel/sdl12/files/patch-aj
new file mode 100644
index 000000000000..ea594b88bd00
--- /dev/null
+++ b/devel/sdl12/files/patch-aj
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	Fri Mar 31 08:31:12 2000
++++ Makefile.in	Mon Apr 24 00:29:07 2000
+@@ -113,7 +113,7 @@
+ DIST_SUBDIRS = $(SUBDIRS) docs
+ 
+ # SDL runtime configuration script
+-bin_SCRIPTS = sdl-config
++bin_SCRIPTS = sdl11-config
+ 
+ # All the rest of the distributed files
+ EXTRA_DIST =  	BUGS		        COPYING		        CREDITS		        INSTALL		        README		        README-SDL.txt	        README.Win32	        README.MacOS	        VisualC.html	        VisualC.zip		CWprojects.sea.hqx         MPWmake.sea.hqx	        WhatsNew	        docs.html	        sdl.m4		        autogen.sh	        strip_fPIC.sh
+@@ -121,7 +121,7 @@
+ 
+ # M4 macro file for inclusion with autoconf
+ m4datadir = $(datadir)/aclocal
+-m4data_DATA = sdl.m4
++m4data_DATA = sdl11.m4
+ 
+ # Create a CVS snapshot that people can run update -d on
+ CVSROOT = :pserver:guest@cvs.lokigames.com:/cvs
diff --git a/devel/sdl12/files/patch-ak b/devel/sdl12/files/patch-ak
new file mode 100644
index 000000000000..b692d613b4a2
--- /dev/null
+++ b/devel/sdl12/files/patch-ak
@@ -0,0 +1,20 @@
+--- sdl-config.in.orig	Sun Apr 23 22:23:24 2000
++++ sdl-config.in	Sun Apr 23 22:24:14 2000
+@@ -5,7 +5,7 @@
+ exec_prefix_set=no
+ 
+ usage="\
+-Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
++Usage: sdl11-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
+ 
+ if test $# -eq 0; then
+       echo "${usage}" 1>&2
+@@ -42,7 +42,7 @@
+       if test @includedir@ != /usr/include ; then
+         includes=-I@includedir@
+       fi
+-      echo $includes -I@includedir@/SDL @SDL_CFLAGS@
++      echo $includes -I@includedir@/SDL11 @SDL_CFLAGS@
+       ;;
+     --libs)
+       if [ "`uname`" = "SunOS" ]; then