Update to 1.2.1.

6 files changed, 33 insertions, 40 deletions

diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 35a8d0ae3aec..597af6cbbf82 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sdl
-PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTVERSION=	1.2.1
 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 4db58e936dd4..ec6e49dfc303 100644
--- a/devel/sdl12/distinfo
+++ b/devel/sdl12/distinfo
@@ -1 +1 @@
-MD5 (SDL-1.2.0.tar.gz) = 20419c09eed9c3a64ec5fb39e0cb924c
+MD5 (SDL-1.2.1.tar.gz) = 72c9058de7a9277693585660cc1876ae
diff --git a/devel/sdl12/files/patch-ac b/devel/sdl12/files/patch-ac
index 67930064f5d7..dfe694cebdb0 100644
--- a/devel/sdl12/files/patch-ac
+++ b/devel/sdl12/files/patch-ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Mar 27 06:39:34 2001
-+++ configure	Mon Apr  2 11:25:59 2001
-@@ -84,6 +84,8 @@
+--- configure.orig	Mon Jun 18 18:21:53 2001
++++ configure	Mon Jun 25 17:59:47 2001
+@@ -100,6 +100,8 @@
  ac_help="$ac_help
    --enable-video-svga     use SVGAlib video driver [default=no]"
  ac_help="$ac_help
@@ -11,17 +11,17 @@ $FreeBSD$
 +ac_help="$ac_help
    --enable-video-aalib    use AAlib video driver [default=no]"
  ac_help="$ac_help
-   --enable-video-opengl   include OpenGL context creation [default=yes]"
-@@ -621,7 +623,7 @@
+   --enable-video-dummy    use dummy video driver [default=no]"
+@@ -639,7 +641,7 @@
  SDL_MAJOR_VERSION=1
  SDL_MINOR_VERSION=2
- SDL_MICRO_VERSION=0
--SDL_INTERFACE_AGE=0
+ SDL_MICRO_VERSION=1
+-SDL_INTERFACE_AGE=1
 +SDL_INTERFACE_AGE=3
- SDL_BINARY_AGE=0
+ SDL_BINARY_AGE=1
  SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
  
-@@ -634,9 +636,9 @@
+@@ -652,9 +654,9 @@
  
  # libtool versioning
  LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -33,7 +33,7 @@ $FreeBSD$
  
  
  
-@@ -3042,7 +3044,7 @@
+@@ -3066,7 +3068,7 @@
  
  
  SDL_CFLAGS=""
@@ -42,7 +42,7 @@ $FreeBSD$
  
  
  case "$target" in
-@@ -5226,6 +5228,57 @@
+@@ -5392,6 +5394,57 @@
      fi
  }
  
@@ -100,7 +100,7 @@ $FreeBSD$
  CheckAAlib()
  {
      # Check whether --enable-video-aalib or --disable-video-aalib was given.
-@@ -5451,8 +5504,8 @@
+@@ -5634,8 +5687,8 @@
  #            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
              ;;
          *-*-freebsd*)
@@ -109,9 +109,9 @@ $FreeBSD$
 +            pthread_cflags="-D_REENTRANT ${PTHREAD_CFLAGS}"
 +            pthread_lib="${PTHREAD_LIBS}"
              ;;
-         *-*-openbsd*)
-             pthread_cflags="-D_REENTRANT"
-@@ -6193,6 +6246,7 @@
+         *-*-netbsd*)
+             pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
+@@ -6236,6 +6289,7 @@
          CheckX11
          CheckDGA
          CheckSVGA
@@ -119,7 +119,7 @@ $FreeBSD$
          CheckAAlib
          CheckOpenGL
          CheckPTHREAD
-@@ -6378,10 +6432,10 @@
+@@ -6577,10 +6631,10 @@
    cat >>$new <$old
  
          # Set up files for the audio library
@@ -134,18 +134,11 @@ $FreeBSD$
          # Set up files for the joystick library
          # (No joystick support yet)
          if test x$enable_joystick = xyes; then
-@@ -8818,6 +8872,7 @@
- src/video/macdsp/Makefile
+@@ -9088,6 +9142,8 @@
  src/video/macrom/Makefile
+ src/video/quartz/Makefile
  src/video/svga/Makefile
 +src/video/vgl/Makefile
- src/video/aalib/Makefile
- src/video/wincommon/Makefile
- src/video/windib/Makefile
-@@ -9042,6 +9097,7 @@
- src/video/macdsp/Makefile
- src/video/macrom/Makefile
- src/video/svga/Makefile
 +src/video/vgl/Makefile
  src/video/aalib/Makefile
  src/video/wincommon/Makefile
diff --git a/devel/sdl12/files/patch-src_video_Makefile.am b/devel/sdl12/files/patch-src_video_Makefile.am
index 7a13c06bd5d9..c0ac73df4da7 100644
--- a/devel/sdl12/files/patch-src_video_Makefile.am
+++ b/devel/sdl12/files/patch-src_video_Makefile.am
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/video/Makefile.am	2001/01/21 20:09:35	1.1
-+++ src/video/Makefile.am	2001/01/21 20:10:15
-@@ -7,7 +7,8 @@
- SUBDIRS = @VIDEO_SUBDIRS@
- DIST_SUBDIRS = x11 dga fbcon svga ggi aalib \
+--- src/video/Makefile.am.orig	Mon Jun 18 18:21:39 2001
++++ src/video/Makefile.am	Mon Jun 25 18:00:56 2001
+@@ -8,7 +8,8 @@
+ DIST_SUBDIRS = dummy x11 dga nanox fbcon svga ggi aalib \
                 wincommon windib windx5 \
--               maccommon macdsp macrom bwindow photon cybergfx
-+               maccommon macdsp macrom bwindow photon cybergfx \
+                maccommon macdsp macrom quartz \
+-               bwindow ps2gs photon cybergfx
++               bwindow ps2gs photon cybergfx \
 +               vgl
  
  DRIVERS = @VIDEO_DRIVERS@
diff --git a/devel/sdl12/files/patch-src_video_Makefile.in b/devel/sdl12/files/patch-src_video_Makefile.in
index d6bccaefb1a1..4ae3a424c84e 100644
--- a/devel/sdl12/files/patch-src_video_Makefile.in
+++ b/devel/sdl12/files/patch-src_video_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/video/Makefile.in	2001/01/21 20:10:22	1.1
-+++ src/video/Makefile.in	2001/01/21 20:10:38
-@@ -103,7 +103,7 @@
+--- src/video/Makefile.in.orig	Mon Jun 18 18:22:19 2001
++++ src/video/Makefile.in	Mon Jun 25 18:01:55 2001
+@@ -106,7 +106,7 @@
  
  # Define which subdirectories need to be built
  SUBDIRS = @VIDEO_SUBDIRS@
--DIST_SUBDIRS = x11 dga fbcon svga ggi aalib                wincommon windib windx5                maccommon macdsp macrom bwindow photon cybergfx
-+DIST_SUBDIRS = x11 dga fbcon svga ggi aalib                wincommon windib windx5                maccommon macdsp macrom bwindow photon cybergfx vgl
+-DIST_SUBDIRS = dummy x11 dga nanox fbcon svga ggi aalib                wincommon windib windx5                maccommon macdsp macrom quartz                bwindow ps2gs photon cybergfx
++DIST_SUBDIRS = dummy x11 dga nanox fbcon svga ggi aalib                wincommon windib windx5                maccommon macdsp macrom quartz                bwindow ps2gs photon cybergfx vgl
  
  
  DRIVERS = @VIDEO_DRIVERS@
diff --git a/devel/sdl12/pkg-plist b/devel/sdl12/pkg-plist
index 8643d04213a9..ca4f503e2904 100644
--- a/devel/sdl12/pkg-plist
+++ b/devel/sdl12/pkg-plist
@@ -60,6 +60,7 @@ share/doc/SDL11/docs/html/guidethebasics.html
 share/doc/SDL11/docs/html/guidetimeexamples.html
 share/doc/SDL11/docs/html/guidevideo.html
 share/doc/SDL11/docs/html/guidevideoexamples.html
+share/doc/SDL11/docs/html/guidevideoopengl.html
 share/doc/SDL11/docs/html/index.html
 share/doc/SDL11/docs/html/joystick.html
 share/doc/SDL11/docs/html/reference.html