sfml+: update to sfml+-2.4.2

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sun Mar 18 23:00:40 2018 +0200
Changeset:	e5ec2cba4bf45366de9a0de3ca053bd33661f63c

Modified Files:
	sfml+/Makefile
	sfml+/PLIST
	sfml+/distinfo
	sfml+/patches/patch-CMakeLists.txt
	sfml+/patches/patch-cmake_Config.cmake
	sfml+/patches/patch-src_SFML_Window_CMakeLists.txt
Added Files:
	sfml+/patches/patch-src_SFML_Window_FreeBSD_JoystickImpl.cpp

Log Message:
sfml+: update to sfml+-2.4.2

pkgsrc change: implement hid_get_report_id for joystick support on NetBSD (untested)

SFML 2.4.2
==========

Also available on the website: http://www.sfml-dev.org/changelog.php#sfml-2.4.2

System
======

Bugfixes
--------
* [Windows] Removed thread affinity changes in sf::Clock (#1107)

Window
======

Bugfixes
--------
* Fixed bug where TransientContextLock would hang (#1165, #1172)
* [Linux] Fixed GLX extensions being loaded too late (#1183)
* [Linux] Fix wrong types passed to XChangeProperty (#1168 #1171)
* [Windows] Make context disabling via wglMakeCurrent more tolerant of broken drivers (#1186)

Graphics
========

Bugfixes
--------
* Optimized sf::Image::create and made it more exception safe (#1166)

SFML 2.4.1
==========

Also available on the website: http://www.sfml-dev.org/changelog.php#sfml-2.4.1

General
=======

* [kFreeBSD] Define SFML_OS_FREEBSD when compiling for kFreeBSD (#1129)
* [Windows] Added some simple messaging when trying to build under Cygwin (#1153)

Window
======

Bugfixes
--------
* Fixed stack overflow on GlContext creation with multiple threads (#989, #1002)
* Adjusted mouse cursor grab documentation (#1133)
* [iOS] Fixed orientation change not rescaling window size properly (#1049, #1050)
* [Linux] Fixed fullscreen issue (#921, #1138)
* [Linux] Switched from XCB back to Xlib for windowing (#1138)
* [Linux] Fixed window icon not showing up on some distros (#1087, #1088)
* [Linux] Fixed an issue where GNOME flags window unresponsive (#1089, #1138)
* [Linux] Fixed leak of XVisualInfo objects during GlxContext creation (#1135)
* [Linux] Fixed possible hang when setting visibility if external window sources (#1136)
* [OS X] Fixed inconsistency between doc and impl on OS X for the grab feature (#1133, #1148, #1150)
* [Windows] Fixed context memory leaks (#1143, #1002)

Graphics
========

Bugfixes
--------
* Adjusted uniform error message (#1131)
* Clarify documentation on Rect::contains function bounds (#1151)

Network
=======

Bugfixes
--------
* Fixed a typo in comment for void unbind() (#1121)

SFML 2.4.0
==========

Also available on the website: http://www.sfml-dev.org/changelog.php#sfml-2.4.0

General
=======

* Added deprecation macro (#969)
* Fixed issues reported by Coverity Scan static analysis (#1064)
* Fixed some initialization issues reported by Cppcheck (#1008)
* Changed comment chars in FindSFML.cmake to # (#1090)
* Fixed some typos (#1098, #993, #1099, #956, #963, #979)
* Updated/fixed string comparisons in Config.cmake (#1102)
* Added the missing -s postfix for the RelWithDebInfo config (#1014)
* [Android] Fixed current Android compilation issues (#1116, #1111, #1079)
* [OS X] Update Xcode template material (#976, #968)
* [Windows] Added support for VS 2015 (#972)
* [Windows] Create and install PDB debug symbols alongside binaries (#1037)

Deprecated API
==============

* sf::RenderWindow::capture(): Use a sf::Texture and its sf::Texture::update(const Window&) function and copy its contents into an sf::Image instead.
* sf::Shader::setParameter(): Use setUniform() instead.
* sf::Text::getColor(): There is now fill and outline colors instead of a single global color. Use getFillColor() or getOutlineColor() instead.
* sf::Text::setColor(): There is now fill and outline colors instead of a single global color. Use setFillColor() or setOutlineColor() instead.
* sf::LinesStrip: Use LineStrip instead.
* sf::TrianglesFan: Use TriangleFan instead.
* sf::TrianglesStrip: Use TriangleStrip instead.

System
======

Features
--------
* [Android] Added sf::getNativeActivity() (#1005, #680)

Bugfixes
--------
* Added missing <iterator> include in String.hpp (#1069, #1068)
* Fixed encoding of UTF-16 (#997)
* [Android] Fixed crash when trying to load a non-existing font file (#1058)

Window
======

Features
--------
* Added ability to grab cursor (#614, #394, #1107)
* Added Multi-GPU preference (#869, #867)
* Added support for sRGB capable framebuffers (#981, #175)
* [Linux, Windows] Improved OpenGL context creation (#884)
* [Linux, Windows] Added support for pbuffers on Windows and Unix (#885, #434)

Bugfixes
--------
* Updated platform-specific handle documentation (#961)
* [Android] Accept touch events from "multiple" devices (#954, #953)
* [Android] Copy the selected EGL context's settings to SFML (#1039)
* [Linux] Fixed modifiers causing sf::Keyboard::Unknown being returned (#1022, #1012)
* [OS X] Improved memory management on OS X (#962, #790)
* [OS X] Fixed crash when resizing a window to a zero-height/width size (#986, #984)
* [OS X] Use the mouse button constant instead of 0 to avoid a compiler error on OSX (#1035)
* [OS X] OS X improvement: warnings + bugfix + refactoring, the lot! (#1042)

Graphics
========

Features
--------
* Added support for outlined text (#840)
* Add support for geometry shaders (#886, #428)
* Feature/blend mode reverse subtract (#945, #944)
* Implemented support for mipmap generation (#973, #498, #123)
* Added new API to set shader uniforms (#983, #538)
* Rewrite RenderWindow::capture (#1001)

Bugfixes
--------
* Exporting some Glsl utility functions due to linking issues (#1044, #1046)
* Fixed missing initialisation of Font::m_stroker (#1059)
* Changed primitive types to be grammatically correct (#1095, #939)

Audio
=====

Features
--------
* Implemented stereo audio recording (#1010)

Bugfixes
--------
* Added an assignment operator to SoundSource (#864)
* [OS X] Updates OpenAL-soft for OS X to version 1.17.2 (#1057, #900, #1000)
* Fixed a bug where vorbis can't handle large buffers (#1067)
* Added support for 24-bit .wav files (#958, #955)
* Fixed threading issue in sf::SoundRecorder (#1011)
* Made WAV file reader no longer assume that data chunk goes till end of file to prevent reading trailing metadata as samples (#1018)
* Fixed seeking in multi channel FLAC files (#1041, #1040)

Network
=======

Features
--------
* Added optional argument on which address to bind (socket). (#850, #678)

Bugfixes
--------
* Fixed FTP directory listing blocking forever (#1086, #1025)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e5ec2cba4bf45366de9a0de3ca053bd33661f63c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 sfml+/Makefile                                     |  13 +--
 sfml+/PLIST                                        | 106 ++++++++++++++-------
 sfml+/distinfo                                     |  15 +--
 sfml+/patches/patch-CMakeLists.txt                 |   6 +-
 sfml+/patches/patch-cmake_Config.cmake             |  10 +-
 sfml+/patches/patch-src_SFML_Window_CMakeLists.txt |  21 ++--
 .../patch-src_SFML_Window_FreeBSD_JoystickImpl.cpp |  21 ++++
 7 files changed, 119 insertions(+), 73 deletions(-)

diffs:
diff --git a/sfml+/Makefile b/sfml+/Makefile
index 5ab9910f10..bdfa3666f9 100644
--- a/sfml+/Makefile
+++ b/sfml+/Makefile
@@ -1,17 +1,17 @@
 # $NetBSD: Makefile,v 1.6 2015/02/24 17:25:10 blef Exp $
 
-DISTNAME=	SFML-2.3.2-sources
-PKGNAME=	sfml+-2.3.2
+DISTNAME=	SFML-2.4.2-sources
+PKGNAME=	sfml+-2.4.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.sfml-dev.org/files/
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.sfml-dev.org/
 COMMENT=	Free multimedia C++ API
 LICENSE=	zlib
+EXTRACT_SUFX=	.zip
 
-WRKSRC=			${WRKDIR}/SFML-2.3.2
+WRKSRC=			${WRKDIR}/SFML-2.4.2
 USE_CMAKE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		rm
@@ -27,11 +27,6 @@ INSTALLATION_DIRS+=	include/SFML/Window lib
 
 .include "options.mk"
 
-post-install:
-			${RM} ${DESTDIR}${PREFIX}/include/SFML/Config.hpp.orig
-			${RM} ${DESTDIR}${PREFIX}/include/SFML/Window/OpenGL.hpp.orig
-			${RM} ${DESTDIR}${PREFIX}/include/SFML/Window/WindowHandle.hpp.orig
-
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
diff --git a/sfml+/PLIST b/sfml+/PLIST
index 85678b7bdb..424282d9f3 100644
--- a/sfml+/PLIST
+++ b/sfml+/PLIST
@@ -1,84 +1,122 @@
 @comment $NetBSD: PLIST,v 1.1 2012/10/03 15:05:59 othyro Exp $
 include/SFML/Audio.hpp
-include/SFML/Audio/AudioResource.hpp
+include/SFML/Audio/AlResource.hpp
+include/SFML/Audio/Export.hpp
+include/SFML/Audio/InputSoundFile.hpp
 include/SFML/Audio/Listener.hpp
 include/SFML/Audio/Music.hpp
+include/SFML/Audio/OutputSoundFile.hpp
 include/SFML/Audio/Sound.hpp
 include/SFML/Audio/SoundBuffer.hpp
 include/SFML/Audio/SoundBufferRecorder.hpp
+include/SFML/Audio/SoundFileFactory.hpp
+include/SFML/Audio/SoundFileFactory.inl
+include/SFML/Audio/SoundFileReader.hpp
+include/SFML/Audio/SoundFileWriter.hpp
 include/SFML/Audio/SoundRecorder.hpp
+include/SFML/Audio/SoundSource.hpp
 include/SFML/Audio/SoundStream.hpp
 include/SFML/Config.hpp
 include/SFML/Graphics.hpp
+include/SFML/Graphics/BlendMode.hpp
+include/SFML/Graphics/CircleShape.hpp
 include/SFML/Graphics/Color.hpp
+include/SFML/Graphics/ConvexShape.hpp
 include/SFML/Graphics/Drawable.hpp
+include/SFML/Graphics/Export.hpp
 include/SFML/Graphics/Font.hpp
+include/SFML/Graphics/Glsl.hpp
+include/SFML/Graphics/Glsl.inl
 include/SFML/Graphics/Glyph.hpp
 include/SFML/Graphics/Image.hpp
-include/SFML/Graphics/Matrix3.hpp
-include/SFML/Graphics/Matrix3.inl
-include/SFML/Graphics/PostFX.hpp
+include/SFML/Graphics/PrimitiveType.hpp
 include/SFML/Graphics/Rect.hpp
 include/SFML/Graphics/Rect.inl
+include/SFML/Graphics/RectangleShape.hpp
+include/SFML/Graphics/RenderStates.hpp
 include/SFML/Graphics/RenderTarget.hpp
+include/SFML/Graphics/RenderTexture.hpp
 include/SFML/Graphics/RenderWindow.hpp
+include/SFML/Graphics/Shader.hpp
 include/SFML/Graphics/Shape.hpp
 include/SFML/Graphics/Sprite.hpp
-include/SFML/Graphics/String.hpp
+include/SFML/Graphics/Text.hpp
+include/SFML/Graphics/Texture.hpp
+include/SFML/Graphics/Transform.hpp
+include/SFML/Graphics/Transformable.hpp
+include/SFML/Graphics/Vertex.hpp
+include/SFML/Graphics/VertexArray.hpp
 include/SFML/Graphics/View.hpp
+include/SFML/Main.hpp
 include/SFML/Network.hpp
+include/SFML/Network/Export.hpp
 include/SFML/Network/Ftp.hpp
 include/SFML/Network/Http.hpp
-include/SFML/Network/IPAddress.hpp
+include/SFML/Network/IpAddress.hpp
 include/SFML/Network/Packet.hpp
-include/SFML/Network/Selector.hpp
-include/SFML/Network/Selector.inl
-include/SFML/Network/SelectorBase.hpp
-include/SFML/Network/SocketHelper.hpp
-include/SFML/Network/SocketTCP.hpp
-include/SFML/Network/SocketUDP.hpp
-include/SFML/Network/Sockets.hpp
-include/SFML/Network/Unix/SocketHelper.hpp
-include/SFML/Network/Win32/SocketHelper.hpp
+include/SFML/Network/Socket.hpp
+include/SFML/Network/SocketHandle.hpp
+include/SFML/Network/SocketSelector.hpp
+include/SFML/Network/TcpListener.hpp
+include/SFML/Network/TcpSocket.hpp
+include/SFML/Network/UdpSocket.hpp
+include/SFML/OpenGL.hpp
 include/SFML/System.hpp
 include/SFML/System/Clock.hpp
+include/SFML/System/Err.hpp
+include/SFML/System/Export.hpp
+include/SFML/System/FileInputStream.hpp
+include/SFML/System/InputStream.hpp
 include/SFML/System/Lock.hpp
+include/SFML/System/MemoryInputStream.hpp
 include/SFML/System/Mutex.hpp
+include/SFML/System/NativeActivity.hpp
 include/SFML/System/NonCopyable.hpp
-include/SFML/System/Randomizer.hpp
-include/SFML/System/Resource.hpp
-include/SFML/System/Resource.inl
-include/SFML/System/ResourcePtr.inl
 include/SFML/System/Sleep.hpp
+include/SFML/System/String.hpp
+include/SFML/System/String.inl
 include/SFML/System/Thread.hpp
-include/SFML/System/Unicode.hpp
-include/SFML/System/Unicode.inl
-include/SFML/System/Unix/Mutex.hpp
-include/SFML/System/Unix/Thread.hpp
+include/SFML/System/Thread.inl
+include/SFML/System/ThreadLocal.hpp
+include/SFML/System/ThreadLocalPtr.hpp
+include/SFML/System/ThreadLocalPtr.inl
+include/SFML/System/Time.hpp
+include/SFML/System/Utf.hpp
+include/SFML/System/Utf.inl
 include/SFML/System/Vector2.hpp
 include/SFML/System/Vector2.inl
 include/SFML/System/Vector3.hpp
 include/SFML/System/Vector3.inl
-include/SFML/System/Win32/Mutex.hpp
-include/SFML/System/Win32/Thread.hpp
 include/SFML/Window.hpp
 include/SFML/Window/Context.hpp
+include/SFML/Window/ContextSettings.hpp
 include/SFML/Window/Event.hpp
-include/SFML/Window/Input.hpp
-include/SFML/Window/OpenGL.hpp
+include/SFML/Window/Export.hpp
+include/SFML/Window/GlResource.hpp
+include/SFML/Window/Joystick.hpp
+include/SFML/Window/Keyboard.hpp
+include/SFML/Window/Mouse.hpp
+include/SFML/Window/Sensor.hpp
+include/SFML/Window/Touch.hpp
 include/SFML/Window/VideoMode.hpp
 include/SFML/Window/Window.hpp
 include/SFML/Window/WindowHandle.hpp
-include/SFML/Window/WindowListener.hpp
-include/SFML/Window/WindowSettings.hpp
 include/SFML/Window/WindowStyle.hpp
 lib/libsfml-audio.so
-lib/libsfml-audio.so.1.6
+lib/libsfml-audio.so.2.4
+lib/libsfml-audio.so.2.4.2
 lib/libsfml-graphics.so
-lib/libsfml-graphics.so.1.6
+lib/libsfml-graphics.so.2.4
+lib/libsfml-graphics.so.2.4.2
 lib/libsfml-network.so
-lib/libsfml-network.so.1.6
+lib/libsfml-network.so.2.4
+lib/libsfml-network.so.2.4.2
 lib/libsfml-system.so
-lib/libsfml-system.so.1.6
+lib/libsfml-system.so.2.4
+lib/libsfml-system.so.2.4.2
 lib/libsfml-window.so
-lib/libsfml-window.so.1.6
+lib/libsfml-window.so.2.4
+lib/libsfml-window.so.2.4.2
+share/SFML/cmake/Modules/FindSFML.cmake
+share/SFML/license.txt
+share/SFML/readme.txt
diff --git a/sfml+/distinfo b/sfml+/distinfo
index 8e5dbfa18a..c5574bb296 100644
--- a/sfml+/distinfo
+++ b/sfml+/distinfo
@@ -1,16 +1,17 @@
 $NetBSD: distinfo,v 1.1 2012/10/03 15:05:59 othyro Exp $
 
-SHA1 (SFML-2.3.2-sources.zip) = 762f287d2347382bc036760dbfa0da73ff8c2a1d
-RMD160 (SFML-2.3.2-sources.zip) = 9745cb27914e3d29ca16d82414429d32e47be728
-SHA512 (SFML-2.3.2-sources.zip) = d35456f442c059f4438bf4ccc9fe363069d1f4caee3202a4ab2885b14a3db56c39f0fb6f03a8145c47d8ec71cf083710df87bac5b1f183430be6c6f66b2c477c
-Size (SFML-2.3.2-sources.zip) = 22586862 bytes
-SHA1 (patch-CMakeLists.txt) = 3b78c865d707f0e5c275c343ff461b3475f63e40
-SHA1 (patch-cmake_Config.cmake) = f9544531e9cd75ec6d244d2c5d87f5ed449eb8a9
+SHA1 (SFML-2.4.2-sources.zip) = 9cb3cdf2f679a4979f71d36041c950a82a31178a
+RMD160 (SFML-2.4.2-sources.zip) = 02c872a6937e59a710d3b1be97d7d2731b53f143
+SHA512 (SFML-2.4.2-sources.zip) = 14f2b9f244bbff681d1992581f20012f3073456e4baed0fb2bf2cf82538e9c5ddd8ce01b0cfb3874af47091ec19654aa23c426df04fe1ffcfa209623dc362f85
+Size (SFML-2.4.2-sources.zip) = 24961872 bytes
+SHA1 (patch-CMakeLists.txt) = 562f20c12b99c394f8cb0f28d04fdf1f5d129c91
+SHA1 (patch-cmake_Config.cmake) = 81e539daa3b13c2e93c31eec8de1f6177a2d6d43
 SHA1 (patch-include_SFML_Config.hpp) = 2ef6d01309fa039804dbaa73258e6eee4cf6a5f7
 SHA1 (patch-include_SFML_OpenGL.hpp) = 1320361b147b0baf5e882772ea5bcb7643680285
 SHA1 (patch-include_SFML_Window_WindowHandle.hpp) = feb03e491f89c2b48e32956821d005f3b32d1cda
 SHA1 (patch-src_SFML_System_CMakeLists.txt) = 2cfc1f05b414105549769c7658699972c9e88f86
-SHA1 (patch-src_SFML_Window_CMakeLists.txt) = 40fdc7be081d94c19932a48efd32ad221fe1a940
+SHA1 (patch-src_SFML_Window_CMakeLists.txt) = ebc3841486a587b006e03e2edc7c2a5a26cc3499
+SHA1 (patch-src_SFML_Window_FreeBSD_JoystickImpl.cpp) = 46e882a29624d86043ab15c239e20e70a97c116b
 SHA1 (patch-src_SFML_Window_FreeBSD_JoystickImpl.hpp) = a4eb1a07b937d0ad7677cff53b946a8d5a6546ab
 SHA1 (patch-src_SFML_Window_GlContext.cpp) = 1419707c8b71e1bfdfd29f049b6aac418713ccd6
 SHA1 (patch-src_SFML_Window_InputImpl.hpp) = 3cee9ad1eb3efe282f1044dfd1815a1a17323a1d
diff --git a/sfml+/patches/patch-CMakeLists.txt b/sfml+/patches/patch-CMakeLists.txt
index 2034c45a86..6d8d699b10 100644
--- a/sfml+/patches/patch-CMakeLists.txt
+++ b/sfml+/patches/patch-CMakeLists.txt
@@ -1,9 +1,9 @@
 $NetBSD$
 
---- CMakeLists.txt.orig	2015-08-24 16:01:06.000000000 +0000
+--- CMakeLists.txt.orig	2017-02-08 11:29:16.000000000 +0000
 +++ CMakeLists.txt
-@@ -188,11 +188,14 @@ if(SFML_OS_MACOSX)
-     endif()
+@@ -202,11 +202,14 @@ if(SFML_OS_MACOSX)
+     set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)")
  endif()
  
 -if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
diff --git a/sfml+/patches/patch-cmake_Config.cmake b/sfml+/patches/patch-cmake_Config.cmake
index e5ccaffa41..e7a0dfcfe9 100644
--- a/sfml+/patches/patch-cmake_Config.cmake
+++ b/sfml+/patches/patch-cmake_Config.cmake
@@ -1,19 +1,19 @@
 $NetBSD$
 
---- cmake/Config.cmake.orig	2015-08-24 16:01:06.000000000 +0000
+--- cmake/Config.cmake.orig	2017-02-08 11:29:16.000000000 +0000
 +++ cmake/Config.cmake
-@@ -31,6 +31,10 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Fre
+@@ -31,6 +31,10 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "^k?Fre
      set(SFML_OS_FREEBSD 1)
      # don't use the OpenGL ES implementation on FreeBSD
      set(OPENGL_ES 0)
-+elseif(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
++elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
 +    set(SFML_OS_NETBSD 1)
 +    # XXX we want to use OPENGL_ES for some NetBSD, but which?
 +    set(OPENGL_ES 0)
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
      if(IOS)
          set(SFML_OS_IOS 1)
-@@ -110,7 +114,7 @@ endif()
+@@ -116,7 +120,7 @@ endif()
  # define the install directory for miscellaneous files
  if(SFML_OS_WINDOWS OR SFML_OS_IOS)
      set(INSTALL_MISC_DIR .)
diff --git a/sfml+/patches/patch-src_SFML_Window_CMakeLists.txt b/sfml+/patches/patch-src_SFML_Window_CMakeLists.txt
index 8c7650e33a..6919defba1 100644
--- a/sfml+/patches/patch-src_SFML_Window_CMakeLists.txt
+++ b/sfml+/patches/patch-src_SFML_Window_CMakeLists.txt
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/SFML/Window/CMakeLists.txt.orig	2015-08-24 16:01:06.000000000 +0000
+--- src/SFML/Window/CMakeLists.txt.orig	2017-02-08 11:29:16.000000000 +0000
 +++ src/SFML/Window/CMakeLists.txt
 @@ -69,7 +69,7 @@ if(SFML_OS_WINDOWS)
  
@@ -11,7 +11,7 @@ $NetBSD$
      set(PLATFORM_SRC
          ${SRCROOT}/Unix/Display.cpp
          ${SRCROOT}/Unix/Display.hpp
-@@ -98,7 +98,7 @@ elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD)
+@@ -96,7 +96,7 @@ elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD)
              ${SRCROOT}/Unix/JoystickImpl.cpp
              ${SRCROOT}/Unix/JoystickImpl.hpp
          )
@@ -20,7 +20,7 @@ $NetBSD$
          set(PLATFORM_SRC
              ${PLATFORM_SRC}
              ${SRCROOT}/FreeBSD/JoystickImpl.cpp
-@@ -188,7 +188,7 @@ elseif(SFML_OS_ANDROID)
+@@ -193,7 +193,7 @@ elseif(SFML_OS_ANDROID)
  endif()
  
  # find external libraries
@@ -29,21 +29,12 @@ $NetBSD$
      find_package(X11 REQUIRED)
      if(NOT X11_FOUND)
          message(FATAL_ERROR "X11 library not found")
-@@ -198,7 +198,7 @@ endif()
- if(NOT SFML_OPENGL_ES)
-     find_package(OpenGL REQUIRED)
-     include_directories(${OPENGL_INCLUDE_DIR})
--    if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
-+    if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_NETBSD)
-         find_package(XCB COMPONENTS xlib_xcb image randr REQUIRED)
-         if(NOT LIBXCB_FOUND)
-             message(FATAL_ERROR "Xcb library not found")
-@@ -225,7 +225,7 @@ if(SFML_OS_WINDOWS)
+@@ -226,7 +226,7 @@ if(SFML_OS_WINDOWS)
      list(APPEND WINDOW_EXT_LIBS winmm gdi32)
  elseif(SFML_OS_LINUX)
-     list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${LIBXCB_LIBRARIES} ${UDEV_LIBRARIES})
+     list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${X11_Xrandr_LIB} ${UDEV_LIBRARIES})
 -elseif(SFML_OS_FREEBSD)
 +elseif(SFML_OS_FREEBSD OR SFML_OS_NETBSD)
-     list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${LIBXCB_LIBRARIES} usbhid)
+     list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${X11_Xrandr_LIB} usbhid)
  elseif(SFML_OS_MACOSX)
      list(APPEND WINDOW_EXT_LIBS "-framework Foundation -framework AppKit -framework IOKit -framework Carbon")
diff --git a/sfml+/patches/patch-src_SFML_Window_FreeBSD_JoystickImpl.cpp b/sfml+/patches/patch-src_SFML_Window_FreeBSD_JoystickImpl.cpp
new file mode 100644
index 0000000000..d306bce430
--- /dev/null
+++ b/sfml+/patches/patch-src_SFML_Window_FreeBSD_JoystickImpl.cpp
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- src/SFML/Window/FreeBSD/JoystickImpl.cpp.orig	2017-02-08 11:29:16.000000000 +0000
++++ src/SFML/Window/FreeBSD/JoystickImpl.cpp
+@@ -53,6 +53,16 @@ namespace
+     std::map<unsigned int, std::string> plugged;
+     std::map<int, std::pair<int, int> > hatValueMap;
+ 
++#if defined(__NetBSD__)
++    int hid_get_report_id(int fd)
++    {
++        int id;
++        if (ioctl(fd, USB_GET_REPORT_ID, &id) < 0)
++            return -1; 
++        return id;
++    }
++#endif
++
+     bool isJoystick(const char *name)
+     {
+         int file = ::open(name, O_RDONLY | O_NONBLOCK);