Update to 1.2.3.

6 files changed, 26 insertions, 75 deletions

diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 1231b8810ff9..f3597491f2ea 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdl
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.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 a40bea579c1b..15c3f34a3173 100644
--- a/devel/sdl12/distinfo
+++ b/devel/sdl12/distinfo
@@ -1 +1 @@
-MD5 (SDL-1.2.2.tar.gz) = d27e0cd39388e2ff927823577f6c935f
+MD5 (SDL-1.2.3.tar.gz) = a942c605c0f36752a4df5709a449ae7a
diff --git a/devel/sdl12/files/patch-ac b/devel/sdl12/files/patch-ac
index 6e9d95d8d43e..33ec9a32b617 100644
--- a/devel/sdl12/files/patch-ac
+++ b/devel/sdl12/files/patch-ac
@@ -1,18 +1,18 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Jul 23 22:54:08 2001
-+++ configure	Wed Jul 25 11:10:28 2001
-@@ -641,7 +641,7 @@
+--- configure.orig	Thu Nov  8 09:28:08 2001
++++ configure	Tue Nov 13 15:47:41 2001
+@@ -646,7 +646,7 @@
+ #
  SDL_MAJOR_VERSION=1
  SDL_MINOR_VERSION=2
- SDL_MICRO_VERSION=2
--SDL_INTERFACE_AGE=2
-+SDL_INTERFACE_AGE=3
- SDL_BINARY_AGE=2
+-SDL_MICRO_VERSION=3
++SDL_MICRO_VERSION=2
+ SDL_INTERFACE_AGE=3
+ SDL_BINARY_AGE=3
  SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
- 
-@@ -654,9 +654,9 @@
+@@ -660,9 +660,9 @@
  
  # libtool versioning
  LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -24,7 +24,7 @@ $FreeBSD$
  
  
  
-@@ -3068,7 +3068,7 @@
+@@ -2774,7 +2774,7 @@
  
  
  SDL_CFLAGS=""
@@ -33,16 +33,7 @@ $FreeBSD$
  
  
  case "$target" in
-@@ -5445,7 +5445,7 @@
- int main() {
- 
-          VGLBitmap bitmap;
--         exit(bitmap.PyxelBytes);
-+         exit(bitmap.PixelBytes);
-         
- ; return 0; }
- EOF
-@@ -5712,8 +5712,8 @@
+@@ -5578,8 +5578,8 @@
  #            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
              ;;
          *-*-freebsd*)
@@ -53,19 +44,3 @@ $FreeBSD$
              ;;
          *-*-netbsd*)
              pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
-@@ -6344,7 +6344,6 @@
-         CheckX11
-         CheckDGA
-         CheckSVGA
--        CheckVGL
-         CheckAAlib
-         CheckOpenGL
-         CheckPTHREAD
-@@ -6491,6 +6490,7 @@
-         ARCH=freebsd
-         CheckDummyVideo
-         CheckDiskAudio
-+        CheckVGL
-         CheckNASM
-         CheckOSS
-         CheckARTSC
diff --git a/devel/sdl12/files/patch-ah b/devel/sdl12/files/patch-ah
index 43115ee865d0..04b4bdce3748 100644
--- a/devel/sdl12/files/patch-ah
+++ b/devel/sdl12/files/patch-ah
@@ -1,15 +1,18 @@
---- 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
+
+$FreeBSD$
+
+--- src/main/Makefile.in.orig	Thu Nov  8 09:28:02 2001
++++ src/main/Makefile.in	Tue Nov 13 15:48:40 2001
+@@ -117,7 +117,7 @@
+ 
  
  # Build a separate library containing the main() entry point.
 -lib_LIBRARIES = libSDLmain.a
 +lib_LIBRARIES = libSDLmain-1.1.a
+ @TARGET_MACOSX_TRUE@MAINLIB_ARCH_SRCS = SDLMain.m SDLMain.h
+ @TARGET_MACOSX_FALSE@MAINLIB_ARCH_SRCS = SDL_main.c
  
- MAINLIB_ARCH_SRCS = SDL_main.c
- 
-@@ -257,10 +257,10 @@
+@@ -264,10 +264,10 @@
  
  maintainer-clean-libtool:
  
diff --git a/devel/sdl12/files/patch-configure.in b/devel/sdl12/files/patch-configure.in
deleted file mode 100644
index f8f532ab9fd9..000000000000
--- a/devel/sdl12/files/patch-configure.in
+++ /dev/null
@@ -1,30 +0,0 @@
-
-$FreeBSD$
-
---- configure.in	2001/07/25 08:10:33	1.1
-+++ configure.in	2001/07/25 08:11:38
-@@ -775,7 +775,7 @@
-          #include <vgl.h>
-         ],[
-          VGLBitmap bitmap;
--         exit(bitmap.PyxelBytes);
-+         exit(bitmap.PixelBytes);
-         ],[
-         video_vgl=yes
-         ])
-@@ -1257,7 +1257,6 @@
-         CheckX11
-         CheckDGA
-         CheckSVGA
--        CheckVGL
-         CheckAAlib
-         CheckOpenGL
-         CheckPTHREAD
-@@ -1294,6 +1293,7 @@
-         ARCH=freebsd
-         CheckDummyVideo
-         CheckDiskAudio
-+        CheckVGL
-         CheckNASM
-         CheckOSS
-         CheckARTSC
diff --git a/devel/sdl12/pkg-plist b/devel/sdl12/pkg-plist
index ca4f503e2904..fac147d831d5 100644
--- a/devel/sdl12/pkg-plist
+++ b/devel/sdl12/pkg-plist
@@ -15,6 +15,7 @@ include/SDL11/SDL_keysym.h
 include/SDL11/SDL_main.h
 include/SDL11/SDL_mouse.h
 include/SDL11/SDL_mutex.h
+include/SDL11/SDL_opengl.h
 include/SDL11/SDL_quit.h
 include/SDL11/SDL_rwops.h
 include/SDL11/SDL_syswm.h
@@ -110,6 +111,7 @@ share/doc/SDL11/docs/html/sdlenablekeyrepeat.html
 share/doc/SDL11/docs/html/sdlenableunicode.html
 share/doc/SDL11/docs/html/sdlevent.html
 share/doc/SDL11/docs/html/sdleventstate.html
+share/doc/SDL11/docs/html/sdlexposeevent.html
 share/doc/SDL11/docs/html/sdlfillrect.html
 share/doc/SDL11/docs/html/sdlflip.html
 share/doc/SDL11/docs/html/sdlfreecursor.html
@@ -120,6 +122,7 @@ share/doc/SDL11/docs/html/sdlgetappstate.html
 share/doc/SDL11/docs/html/sdlgetaudiostatus.html
 share/doc/SDL11/docs/html/sdlgetcliprect.html
 share/doc/SDL11/docs/html/sdlgetcursor.html
+share/doc/SDL11/docs/html/sdlgeterror.html
 share/doc/SDL11/docs/html/sdlgeteventfilter.html
 share/doc/SDL11/docs/html/sdlgetgammaramp.html
 share/doc/SDL11/docs/html/sdlgetkeyname.html