- Update devel/sdl12 to version 1.2.11. Now we employ stock SDL directory

   structure (i.e. include/SDL for includes and sdl-config for configuration
   binary)
 - Update graphics/sdl_ttf to version 2.0.8
 - Update graphics/sdl_image to version 1.2.5
 - Update audio/sdl_mixer to version 1.2.7
 - Update net/sdl_net to version 1.2.6
 - Update Mk/bsd.sdl.mk accordingly
 - Fix dependent ports to fit the new directory structure and avoid several
   API breakages
 - Bump up portrevisions for all dependent ports to allow them to be upgraded
   by portupgrade/portmaster etc tools

Approved by:    kris (portmgr), sem (mentor)

3 files changed, 1 insertions, 291 deletions

diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile
index 4eb79bbda53d..a91c7ff4cc62 100644
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gl-117
 PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/gl-117/files/patch-configure b/games/gl-117/files/patch-configure
index 04c87239cbb4..a7c80462a182 100644
--- a/games/gl-117/files/patch-configure
+++ b/games/gl-117/files/patch-configure
@@ -1,257 +1,5 @@
 --- configure.orig	Sat Jun 12 01:44:13 2004
 +++ configure	Mon Jun 14 11:14:35 2004
-@@ -6154,7 +6154,7 @@
-  path=""
-  for tmp in /usr/local /usr/X11R6 /usr $with_sdl_dir
-  do
--  if test -f $tmp/include/SDL/SDL.h ; then
-+  if test -f $tmp/include/SDL11/SDL.h ; then
-    path=$tmp
-   fi
-  done
-@@ -6164,8 +6164,8 @@
-  else
-   echo "$as_me:$LINENO: result: $path" >&5
- echo "${ECHO_T}$path" >&6
--  CPPFLAGS="$CPPFLAGS -I$path/include"
--  CXXFLAGS="$CXXFLAGS -I$path/include"
-+  CPPFLAGS="$CPPFLAGS -I$path/include -I$path/include/SDL11"
-+  CXXFLAGS="$CXXFLAGS -I$path/include -I$path/include/SDL11"
-   LIBS="$LIBS -L$path/lib"
-  fi
- 
-@@ -6871,8 +6871,8 @@
- 
- 
- if test "${ac_cv_header_SDL_SDL_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for SDL/SDL.h" >&5
--echo $ECHO_N "checking for SDL/SDL.h... $ECHO_C" >&6
-+  echo "$as_me:$LINENO: checking for SDL11/SDL.h" >&5
-+echo $ECHO_N "checking for SDL11/SDL.h... $ECHO_C" >&6
- if test "${ac_cv_header_SDL_SDL_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
-@@ -6880,8 +6880,8 @@
- echo "${ECHO_T}$ac_cv_header_SDL_SDL_h" >&6
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking SDL/SDL.h usability" >&5
--echo $ECHO_N "checking SDL/SDL.h usability... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking SDL11/SDL.h usability" >&5
-+echo $ECHO_N "checking SDL11/SDL.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -6889,7 +6889,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <SDL/SDL.h>
-+#include <SDL.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -6925,15 +6925,15 @@
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking SDL/SDL.h presence" >&5
--echo $ECHO_N "checking SDL/SDL.h presence... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking SDL11/SDL.h presence" >&5
-+echo $ECHO_N "checking SDL11/SDL.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <SDL/SDL.h>
-+#include <SDL11/SDL.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -6967,25 +6967,25 @@
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: SDL/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: SDL/SDL.h: proceeding with the compiler's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: SDL11/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: SDL11/SDL.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: SDL/SDL.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: SDL/SDL.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: SDL/SDL.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: SDL/SDL.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: SDL/SDL.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: SDL/SDL.h: in the future, the compiler will take precedence" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: SDL11/SDL.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: SDL11/SDL.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: SDL11/SDL.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: SDL11/SDL.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: SDL11/SDL.h: in the future, the compiler will take precedence" >&2;}
-     (
-       cat <<\_ASBOX
- ## ------------------------------------------ ##
-@@ -6996,8 +6996,8 @@
-       sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--echo "$as_me:$LINENO: checking for SDL/SDL.h" >&5
--echo $ECHO_N "checking for SDL/SDL.h... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for SDL11/SDL.h" >&5
-+echo $ECHO_N "checking for SDL11/SDL.h... $ECHO_C" >&6
- if test "${ac_cv_header_SDL_SDL_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7019,8 +7019,8 @@
- 
- 
- if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5
--echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6
-+  echo "$as_me:$LINENO: checking for SDL11/SDL_mixer.h" >&5
-+echo $ECHO_N "checking for SDL11/SDL_mixer.h... $ECHO_C" >&6
- if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
-@@ -7028,8 +7028,8 @@
- echo "${ECHO_T}$ac_cv_header_SDL_SDL_mixer_h" >&6
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking SDL/SDL_mixer.h usability" >&5
--echo $ECHO_N "checking SDL/SDL_mixer.h usability... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking SDL11/SDL_mixer.h usability" >&5
-+echo $ECHO_N "checking SDL11/SDL_mixer.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -7037,7 +7037,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <SDL/SDL_mixer.h>
-+#include <SDL11/SDL_mixer.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -7073,15 +7073,15 @@
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking SDL/SDL_mixer.h presence" >&5
--echo $ECHO_N "checking SDL/SDL_mixer.h presence... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking SDL11/SDL_mixer.h presence" >&5
-+echo $ECHO_N "checking SDL11/SDL_mixer.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <SDL/SDL_mixer.h>
-+#include <SDL11/SDL_mixer.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -7115,25 +7115,25 @@
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: SDL/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: SDL/SDL_mixer.h: proceeding with the compiler's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: SDL11/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: SDL11/SDL_mixer.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: SDL/SDL_mixer.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: SDL/SDL_mixer.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: SDL/SDL_mixer.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: SDL/SDL_mixer.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: SDL/SDL_mixer.h: in the future, the compiler will take precedence" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: SDL11/SDL_mixer.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: SDL11/SDL_mixer.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: SDL11/SDL_mixer.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: SDL11/SDL_mixer.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: SDL11/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: SDL11/SDL_mixer.h: in the future, the compiler will take precedence" >&2;}
-     (
-       cat <<\_ASBOX
- ## ------------------------------------------ ##
-@@ -7144,8 +7144,8 @@
-       sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5
--echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for SDL11/SDL_mixer.h" >&5
-+echo $ECHO_N "checking for SDL11/SDL_mixer.h... $ECHO_C" >&6
- if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7380,13 +7380,13 @@
- echo "$as_me: WARNING: GLUT not found - please install GLUT or MesaGLUT" >&2;}
- fi
- 
--echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
--echo $ECHO_N "checking for SDL_Init in -lSDL... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for SDL_Init in -lSDL-1.1" >&5
-+echo $ECHO_N "checking for SDL_Init in -lSDL-1.1... $ECHO_C" >&6
- if test "${ac_cv_lib_SDL_SDL_Init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lSDL -lpthread $LIBS"
-+LIBS="-lSDL-1.1 -lpthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -7445,7 +7445,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_Init" >&5
- echo "${ECHO_T}$ac_cv_lib_SDL_SDL_Init" >&6
- if test $ac_cv_lib_SDL_SDL_Init = yes; then
--  LIBS="$LIBS -lSDL -lSDLmain"
-+  LIBS="$LIBS -lSDL-1.1 -lSDLmain-1.1"
- else
-   { echo "$as_me:$LINENO: WARNING: SDL not found - please install SDL" >&5
- echo "$as_me: WARNING: SDL not found - please install SDL" >&2;}
 @@ -7524,7 +7524,7 @@
  
  
diff --git a/games/gl-117/files/patch-src_common.h b/games/gl-117/files/patch-src_common.h
deleted file mode 100644
index 2dfa6a09e020..000000000000
--- a/games/gl-117/files/patch-src_common.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/common.h.orig	Sun Jun 13 11:17:16 2004
-+++ src/common.h	Sun Jun 13 11:17:43 2004
-@@ -22,13 +22,13 @@
- // APPLE path is different (thanks Minami)

- #ifdef __APPLE__

- #include <GLUT/glut.h>

--#include "SDL/SDL.h"

--#include "SDL/SDL_thread.h"

-+#include "SDL11/SDL.h"

-+#include "SDL11/SDL_thread.h"

- #ifdef HAVE_SDL_MIXER

--#include "SDL/SDL_mixer.h"

-+#include "SDL11/SDL_mixer.h"

- #endif

- #ifdef HAVE_SDL_NET

--#include "SDL/SDL_net.h"

-+#include "SDL11/SDL_net.h"

- #endif

- #endif

- #ifndef __APPLE__

-@@ -36,13 +36,13 @@
- #include <GL/glut.h>

- #else

- #include <GL/glut.h>

--#include "SDL/SDL.h"

--#include "SDL/SDL_thread.h"

-+#include "SDL11/SDL.h"

-+#include "SDL11/SDL_thread.h"

- #ifdef HAVE_SDL_MIXER

--#include "SDL/SDL_mixer.h"

-+#include "SDL11/SDL_mixer.h"

- #endif

- #ifdef HAVE_SDL_NET

--#include "SDL/SDL_net.h"

-+#include "SDL11/SDL_net.h"

- #endif

- #endif

- #endif // __APPLE__