- Update devel/sfml to 2.4

- Add LICENSE
- Bump dependent ports due to shlib versioning scheme change
  - Add missing dependency to games/slade

devel/sfml/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sfml
-PORTVERSION=	2.1
+PORTVERSION=	2.4.0
-PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.sfml-dev.org/download/sfml/${PORTVERSION}/
 DISTNAME=	SFML-${PORTVERSION}-sources
@@ -11,13 +10,22 @@ DISTNAME=	SFML-${PORTVERSION}-sources
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simple and Fast Multimedia Library
 
-LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+LICENSE=	ZLIB
-		libfreetype.so:print/freetype2
+LICENSE_FILE=	${WRKSRC}/license.txt
+
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libfreetype.so:print/freetype2 \
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis \
+		libxcb-image.so:x11/xcb-util-image
+
+BROKEN_FreeBSD_9=	does not build
 
 USES=		cmake dos2unix jpeg openal:al zip:infozip
+CMAKE_ARGS=	-DSFML_INSTALL_PKGCONFIG_FILES=ON
 DOS2UNIX_FILES=	CMakeLists.txt
-USE_XORG=	x11 xrandr
+USE_XORG=	x11 xcb
-USE_GL=		gl glew
+USE_GL=		gl
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/SFML-${PORTVERSION}

devel/sfml/distinfo

@@ -1,2 +1,3 @@
-SHA256 (SFML-2.1-sources.zip) = 5f46d7748223be3f0c6a9fcf18c0016d227f7b1903cdbcd85f61ddbc82ef95bf
+TIMESTAMP = 1474077496
-SIZE (SFML-2.1-sources.zip) = 9728420
+SHA256 (SFML-2.4.0-sources.zip) = 868a1a1e43a7ee40c1a90efcbcea061b6f0a6ed129075d9a8f19c8c69e644b0f
+SIZE (SFML-2.4.0-sources.zip) = 24965927

devel/sfml/files/patch-CMakeLists.txt

@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2013-07-21 11:30:08.000000000 +0400
-+++ CMakeLists.txt	2014-08-15 18:24:11.785377335 +0400
-@@ -113,7 +113,7 @@
-                     "tools/pkg-config/sfml-${sfml_module}.pc"
-                     @ONLY)
- 	    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc"
--                    DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
-+                    DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
-             endforeach()
-         endif()
-     else()

devel/sfml/files/patch-src-SFML-Window-Linux-JoystickImpl.cpp

@@ -1,209 +0,0 @@
---- src/SFML/Window/Linux/JoystickImpl.cpp.orig	2013-07-21 11:30:08.000000000 +0400
-+++ src/SFML/Window/Linux/JoystickImpl.cpp	2014-08-15 18:39:52.598031897 +0400
-@@ -27,7 +27,6 @@
- ////////////////////////////////////////////////////////////
- #include <SFML/Window/JoystickImpl.hpp>
- #include <SFML/System/Err.hpp>
--#include <sys/inotify.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <errno.h>
-@@ -45,7 +44,7 @@
-         for (unsigned int i = 0; i < sf::Joystick::Count; ++i)
-         {
-             char name[32];
--            std::snprintf(name, sizeof(name), "/dev/input/js%u", i);
-+            ::snprintf(name, sizeof(name), "/dev/input/js%u", i);
-             struct stat info;
-             plugged[i] = (stat(name, &info) == 0);
-         }
-@@ -70,185 +69,46 @@
- ////////////////////////////////////////////////////////////
- void JoystickImpl::initialize()
- {
--    // Reset the array of plugged joysticks
--    std::fill(plugged, plugged + Joystick::Count, false);
--
--    // Create the inotify instance
--    notifyFd = inotify_init();
--    if (notifyFd < 0)
--    {
--        err() << "Failed to initialize inotify, joystick connections and disconnections won't be notified" << std::endl;
--        return;
--    }
--
--    // Watch nodes created and deleted in the /dev/input directory
--    inputFd = inotify_add_watch(notifyFd, "/dev/input", IN_CREATE | IN_DELETE);
--    if (inputFd < 0)
--    {
--        err() << "Failed to initialize inotify, joystick connections and disconnections won't be notified" << std::endl;
--        return;
--    }
--
--    // Do an initial scan
--    updatePluggedList();
- }
- 
- 
- ////////////////////////////////////////////////////////////
- void JoystickImpl::cleanup()
- {
--    // Stop watching the /dev/input directory
--    if (inputFd >= 0)
--        inotify_rm_watch(notifyFd, inputFd);
--
--    // Close the inotify file descriptor
--    if (inputFd >= 0)
--        ::close(notifyFd);
- }
- 
- 
- ////////////////////////////////////////////////////////////
- bool JoystickImpl::isConnected(unsigned int index)
- {
--    // First check if new joysticks were added/removed since last update
--    if (canRead(notifyFd))
--    {
--        // Don't bother decomposing and interpreting the filename, just do a full scan
--        updatePluggedList();
--
--        // Flush all the pending events
--        while (canRead(notifyFd))
--        {
--            char buffer[128];
--            read(notifyFd, buffer, sizeof(buffer));
--        }
--	}
--
--    // Then check if the joystick is connected
--    return plugged[index];
-+	return false;
- }
- 
- 
- ////////////////////////////////////////////////////////////
- bool JoystickImpl::open(unsigned int index)
- {
--    if (plugged[index])
--    {
--        char name[32];
--        std::snprintf(name, sizeof(name), "/dev/input/js%u", index);
--
--        // Open the joystick's file descriptor (read-only and non-blocking)
--        m_file = ::open(name, O_RDONLY | O_NONBLOCK);
--        if (m_file >= 0)
--        {
--            // Retrieve the axes mapping
--            ioctl(m_file, JSIOCGAXMAP, m_mapping);
--
--            // Reset the joystick state
--            m_state = JoystickState();
--
--            return true;
--        }
--        else
--        {
--            return false;
--        }
--    }
--    else
--    {
--        return false;
--    }
-+	return false;
- }
- 
- 
- ////////////////////////////////////////////////////////////
- void JoystickImpl::close()
- {
--    ::close(m_file);
- }
- 
- 
- ////////////////////////////////////////////////////////////
- JoystickCaps JoystickImpl::getCapabilities() const
- {
--    JoystickCaps caps;
--
--    // Get the number of buttons
--    char buttonCount;
--    ioctl(m_file, JSIOCGBUTTONS, &buttonCount);
--    caps.buttonCount = buttonCount;
--    if (caps.buttonCount > Joystick::ButtonCount)
--        caps.buttonCount = Joystick::ButtonCount;
--
--    // Get the supported axes
--    char axesCount;
--    ioctl(m_file, JSIOCGAXES, &axesCount);
--    for (int i = 0; i < axesCount; ++i)
--    {
--        switch (m_mapping[i])
--        {
--            case ABS_X :        caps.axes[Joystick::X]    = true; break;
--            case ABS_Y :        caps.axes[Joystick::Y]    = true; break;
--            case ABS_Z :
--            case ABS_THROTTLE : caps.axes[Joystick::Z]    = true; break;
--            case ABS_RZ:
--            case ABS_RUDDER:    caps.axes[Joystick::R]    = true; break;
--            case ABS_RX :       caps.axes[Joystick::U]    = true; break;
--            case ABS_RY :       caps.axes[Joystick::V]    = true; break;
--            case ABS_HAT0X :    caps.axes[Joystick::PovX] = true; break;
--            case ABS_HAT0Y :    caps.axes[Joystick::PovY] = true; break;
--            default : break;
--        }
--    }
--
--    return caps;
-+    return JoystickCaps();
- }
- 
- 
- ////////////////////////////////////////////////////////////
- JoystickState JoystickImpl::JoystickImpl::update()
- {
--    // pop events from the joystick file
--    js_event joyState;
--    while (read(m_file, &joyState, sizeof(joyState)) > 0)
--    {
--        switch (joyState.type & ~JS_EVENT_INIT)
--        {
--            // An axis was moved
--            case JS_EVENT_AXIS :
--            {
--                float value = joyState.value * 100.f / 32767.f;
--                switch (m_mapping[joyState.number])
--                {
--                    case ABS_X :        m_state.axes[Joystick::X]    = value; break;
--                    case ABS_Y :        m_state.axes[Joystick::Y]    = value; break;
--                    case ABS_Z :
--                    case ABS_THROTTLE : m_state.axes[Joystick::Z]    = value; break;
--                    case ABS_RZ:
--                    case ABS_RUDDER:    m_state.axes[Joystick::R]    = value; break;
--                    case ABS_RX :       m_state.axes[Joystick::U]    = value; break;
--                    case ABS_RY :       m_state.axes[Joystick::V]    = value; break;
--                    case ABS_HAT0X :    m_state.axes[Joystick::PovX] = value; break;
--                    case ABS_HAT0Y :    m_state.axes[Joystick::PovY] = value; break;
--                    default : break;
--                }
--                break;
--            }
--
--            // A button was pressed
--            case JS_EVENT_BUTTON :
--            {
--                if (joyState.number < Joystick::ButtonCount)
--                    m_state.buttons[joyState.number] = (joyState.value != 0);
--                break;
--            }
--        }
--    }
--
--    // Check the connection state of the joystick (read() fails with an error != EGAIN if it's no longer connected)
--    m_state.connected = (errno == EAGAIN);
--
--    return m_state;
-+    return JoystickState();
- }
- 
- } // namespace priv

devel/sfml/files/patch-src-SFML-Window-Linux-WindowImplX11.cpp

@@ -1,10 +0,0 @@
---- src/SFML/Window/Linux/WindowImplX11.cpp.orig	2014-04-25 17:24:48.844984881 +0400
-+++ src/SFML/Window/Linux/WindowImplX11.cpp	2014-04-25 17:24:55.854171823 +0400
-@@ -35,6 +35,7 @@
- #include <X11/keysym.h>
- #include <X11/extensions/Xrandr.h>
- #include <unistd.h>
-+#include <libgen.h>
- #include <cstring>
- #include <sstream>
- #include <vector>

devel/sfml/pkg-descr

@@ -6,4 +6,4 @@ You can use SFML as a minimal windowing system to interface with
 OpenGL, or as a fully-featured multimedia library for building games
 or interactive programs.
 
-WWW: http://www.sfml-dev.org/index.php
+WWW: http://www.sfml-dev.org/

devel/sfml/pkg-plist

@@ -1,10 +1,17 @@
 include/SFML/Audio.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
@@ -17,6 +24,8 @@ 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/PrimitiveType.hpp
@@ -37,6 +46,7 @@ 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
@@ -54,12 +64,16 @@ 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/Sleep.hpp
 include/SFML/System/String.hpp
+include/SFML/System/String.inl
 include/SFML/System/Thread.hpp
 include/SFML/System/Thread.inl
 include/SFML/System/ThreadLocal.hpp
@@ -81,25 +95,27 @@ 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/WindowStyle.hpp
 lib/libsfml-audio.so
-lib/libsfml-audio.so.2
+lib/libsfml-audio.so.2.4
-lib/libsfml-audio.so.2.1
+lib/libsfml-audio.so.2.4.0
 lib/libsfml-graphics.so
-lib/libsfml-graphics.so.2
+lib/libsfml-graphics.so.2.4
-lib/libsfml-graphics.so.2.1
+lib/libsfml-graphics.so.2.4.0
 lib/libsfml-network.so
-lib/libsfml-network.so.2
+lib/libsfml-network.so.2.4
-lib/libsfml-network.so.2.1
+lib/libsfml-network.so.2.4.0
 lib/libsfml-system.so
-lib/libsfml-system.so.2
+lib/libsfml-system.so.2.4
-lib/libsfml-system.so.2.1
+lib/libsfml-system.so.2.4.0
 lib/libsfml-window.so
-lib/libsfml-window.so.2
+lib/libsfml-window.so.2.4
-lib/libsfml-window.so.2.1
+lib/libsfml-window.so.2.4.0
 libdata/pkgconfig/sfml-all.pc
 libdata/pkgconfig/sfml-audio.pc
 libdata/pkgconfig/sfml-graphics.pc

emulators/dolphin-emu/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	dolphin-emu
 DISTVERSION=	5.0-rc
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 
 MAINTAINER=	martymac@FreeBSD.org

games/slade/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	slade
 PORTVERSION=	3.1.1.3
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -21,6 +22,7 @@ GH_PROJECT=	${PORTNAME:tu}
 
 USES=		cmake compiler:c++11-lib pkgconfig
 USE_WX=		3.0+
+USE_GL=		glew
 USE_CXXSTD=	c++11
 
 PLIST_FILES=	bin/slade share/slade3/slade.pk3