Switch SDL2 to the standard autotools build system. Upstream considers

the CMake build system to be experimental.  This gets us working joystick
support on NetBSD, avoids installing bogus headers, and moves us to a sane
library major (which is highly unlikely to ever change again).  Bump
PKGREVISION to 5 and set BUILDLINK_ABI_DEPENDS accordingly.

Recursive revbump coming up.

While here, tidy up this package's options a bit:
- instead of providing six (!) options for standard modern X libraries,
  simply lump them all into the existing x11 option
- provide a dbus option

2 files changed, 18 insertions, 32 deletions

diff --git a/devel/SDL2/patches/patch-CMakeLists.txt b/devel/SDL2/patches/patch-CMakeLists.txt
deleted file mode 100644
index 89e36773b4d..00000000000
--- a/devel/SDL2/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2014/03/13 13:25:49 adam Exp $
-
-Allow in-tree build.
-Handle .dylib extension on Darwin.
-
---- CMakeLists.txt.orig	2014-03-08 04:36:49.000000000 +0000
-+++ CMakeLists.txt
-@@ -1,6 +1,3 @@
--if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
--  message(FATAL_ERROR "Prevented in-tree built. Please create a build directory outside of the SDL source code and call cmake from there")
--endif()
- 
- cmake_minimum_required(VERSION 2.6)
- project(SDL2 C)
-@@ -1283,10 +1280,15 @@ install(FILES ${INCLUDE_FILES} DESTINATI
- 
- if(NOT WINDOWS OR CYGWIN)
-   if(SDL_SHARED)
-+    if(APPLE)
-+      set(SO_EXT "dylib")
-+    else(APPLE)
-+      set(SO_EXT "so")
-+    endif(APPLE)
-     install(CODE "
-       execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
--      \"libSDL2-2.0.so\" \"libSDL2.so\")")
--    install(FILES ${SDL2_BINARY_DIR}/libSDL2.so DESTINATION "lib${LIB_SUFFIX}")
-+      \"libSDL2-2.0.${SO_EXT}\" \"libSDL2.${SO_EXT}\")")
-+    install(FILES ${SDL2_BINARY_DIR}/libSDL2.${SO_EXT} DESTINATION "lib${LIB_SUFFIX}")
-   endif()
-   if(FREEBSD)
-     # FreeBSD uses ${PREFIX}/libdata/pkgconfig
diff --git a/devel/SDL2/patches/patch-src_thread_pthread_SDL__systhread.c b/devel/SDL2/patches/patch-src_thread_pthread_SDL__systhread.c
new file mode 100644
index 00000000000..74fe3ff075f
--- /dev/null
+++ b/devel/SDL2/patches/patch-src_thread_pthread_SDL__systhread.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_thread_pthread_SDL__systhread.c,v 1.1 2015/02/09 08:27:07 snj Exp $
+
+Handle NetBSD's pthread_setname_np.
+
+--- src/thread/pthread/SDL_systhread.c.orig	2014-03-15 19:31:44.000000000 -0700
++++ src/thread/pthread/SDL_systhread.c	2015-02-09 00:17:52.000000000 -0800
+@@ -129,7 +129,11 @@ SDL_SYS_SetupThread(const char *name)
+             #endif
+         }
+         #elif HAVE_PTHREAD_SETNAME_NP
++            #if defined(__NETBSD__)
++            pthread_setname_np(pthread_self(), "%s", name);        
++            #else
+             pthread_setname_np(pthread_self(), name);
++            #endif
+         #elif HAVE_PTHREAD_SET_NAME_NP
+             pthread_set_name_np(pthread_self(), name);
+         #elif defined(__HAIKU__)