- Update to 0.180

- Support staging
- Use new LIB_DEPENDS syntax
- Use new OPTIONS features

10 files changed, 107 insertions, 101 deletions

diff --git a/games/springlobby/Makefile b/games/springlobby/Makefile
index 7fb7b5fd3f69..d9bcf9247810 100644
--- a/games/springlobby/Makefile
+++ b/games/springlobby/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	springlobby
-PORTVERSION=	0.143
-PORTREVISION=	2
+PORTVERSION=	0.180
 CATEGORIES=	games net
 MASTER_SITES=	http://www.springlobby.info/tarballs/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -11,11 +10,14 @@ MASTER_SITES=	http://www.springlobby.info/tarballs/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Cross-platform lobby client for the Spring RTS project
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	spring:${PORTSDIR}/games/spring
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libboost_thread.so:${PORTSDIR}/devel/boost-libs
 
 USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake pkgconfig compiler:c++11-lib
 CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
 		-DENABLE_DEBUG_REPORT=FALSE
 USE_WX=		2.8+
@@ -23,41 +25,24 @@ WX_UNICODE=	yes
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	TORRENT SOUND DOCS NLS
-OPTIONS_DEFAULT=	TORRENT SOUND
-TORRENT_DESC=	Support automatic content downloads via torrent
-SOUND_DESC=	Enable sound
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CMAKE_ARGS+=	-DOPTION_TRANSLATION_SUPPORT:BOOL=OFF
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTORRENT}
-LIB_DEPENDS+=	torrent-rasterbar:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15
-.else
-CMAKE_ARGS+=	-DOPTION_TORRENT_SYSTEM:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MSOUND}
-USE_OPENAL=		al
-.else
-CMAKE_ARGS+=	-DOPTION_SOUND:BOOL=OFF
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e '/<curl\/types.h>/d' \
-		${WRKSRC}/src/utils/curlhelper.h \
-		${WRKSRC}/src/utils/downloader.cpp
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e '/install.*FILES.*share\/doc/ d' \
-		${WRKSRC}/CMakeLists.txt
-.endif
+OPTIONS_DEFINE=	SOUND NLS NOTIFY DOCS
+OPTIONS_DEFAULT=SOUND NOTIFY
+OPTIONS_SUB=	yes
+
+SOUND_DESC=	Enable sound notifications
+NOTIFY_DESC=	Enable libnotify support for popup status messages
+
+NLS_CMAKE_ON=		-DOPTION_TRANSLATION_SUPPORT:BOOL=ON
+NLS_CMAKE_OFF=		-DOPTION_TRANSLATION_SUPPORT:BOOL=OFF
+NLS_USES=		gettext
+
+SOUND_CMAKE_ON=		-DOPTION_SOUND:BOOL=ON
+SOUND_CMAKE_OFF=	-DOPTION_SOUND:BOOL=OFF
+SOUND_LIB_DEPENDS=	libalure.so:${PORTSDIR}/audio/alure
+SOUND_USE=		OPENAL=al
+
+NOTIFY_CMAKE_ON=	-DOPTION_NOTIFY=ON
+NOTIFY_CMAKE_OFF=	-DOPTION_NOTIFY=OFF
+NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
 
 .include <bsd.port.mk>
diff --git a/games/springlobby/distinfo b/games/springlobby/distinfo
index 204564085198..06e75ee5f047 100644
--- a/games/springlobby/distinfo
+++ b/games/springlobby/distinfo
@@ -1,2 +1,2 @@
-SHA256 (springlobby-0.143.tar.bz2) = 4694a0d88c7409a42cc83cd10b80226aa2cc5b2f0f83fa95351638fee3e77b61
-SIZE (springlobby-0.143.tar.bz2) = 1797369
+SHA256 (springlobby-0.180.tar.bz2) = ca9612fd4b8beb940169dfdbca76d15a73daee90ceb35c12f5ef451e79e6576c
+SIZE (springlobby-0.180.tar.bz2) = 2543659
diff --git a/games/springlobby/files/patch-CMakeLists.txt b/games/springlobby/files/patch-CMakeLists.txt
deleted file mode 100644
index a5020274adbe..000000000000
--- a/games/springlobby/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
---- CMakeLists.txt.orig	2010-07-20 01:38:35.000000000 +0400
-+++ CMakeLists.txt	2010-07-30 16:21:01.000000000 +0400
-@@ -92,7 +92,6 @@
- # Did we find wxWidgets ? This condition will fail for as long as the internal Vars do not point to the proper wxWidgets Configuration.
- IF(wxWidgets_FOUND)
- 	# Include wxWidgets macros
--	INCLUDE(${wxWidgets_USE_FILE})
- 	IF(MSVC)
- 		INCLUDE_DIRECTORIES( ${wxWidgets_ROOT_DIR}/include/msvc )
- 	ENDIF(MSVC)
-@@ -100,6 +99,9 @@
- 		SET(wxWidgets_RC_DIR ${wxWidgets_ROOT_DIR}/include)
- 	ENDIF(MINGW)
- 	INCLUDE_DIRECTORIES( ${wxWidgets_INCLUDE_DIRS} )
-+	STRING(REGEX REPLACE ";" ";-D" wxWidgets_DEFINITIONS "${wxWidgets_DEFINITIONS}")
-+	SET(wxWidgets_DEFINITIONS "-D${wxWidgets_DEFINITIONS}")
-+	ADD_DEFINITIONS( ${wxWidgets_DEFINITIONS} )
- ELSE(wxWidgets_FOUND)
- 	# For Convenience. If we cannot continue, inform the User.
- 	MESSAGE( FATAL_ERROR "wxWidgets library not found! Please install the package to continue")
-@@ -120,7 +122,7 @@
- 
- 	Add_Subdirectory( ${springlobby_SOURCE_DIR}/src/sound/alure )
- 	INCLUDE_DIRECTORIES( ${springlobby_SOURCE_DIR}/src/sound/alure/include )
--	LINK_LIBRARIES( ${OPENAL_LIBRARY} ${springlobby_BINARY_DIR}/src/sound/alure/libalure.a )
-+	LINK_LIBRARIES( ${OPENAL_LIBRARY} alure )
- ELSE ( OPTION_SOUND )
-     # Disable sound.
-     ADD_DEFINITIONS( -DDISABLE_SOUND )
-@@ -171,7 +173,7 @@
- 	    IF( Boost_FOUND )
- 		    link_directories( ${Boost_LIB_DIR} )
- 		    INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
--		    SET( SL_BOOST_LIBS boost_system-mt )
-+		    SET( SL_BOOST_LIBS boost_system )
- 	    ELSE()
- 		    MESSAGE( FATAL_ERROR "boost library not found! Please install the package or toggle OPTION_TORRENT_SYSTEM to OFF")
- 	    ENDIF()
-@@ -185,6 +187,7 @@
- 	LIST( APPEND SLSharedWithSettings ${curlSRC} )
- ELSE( OPTION_TORRENT_SYSTEM )
- 	ADD_DEFINITIONS( -DNO_TORRENT_SYSTEM )
-+	LIST( APPEND SLSharedWithSettings ${curlSRC} )
- ENDIF( OPTION_TORRENT_SYSTEM )
- 
- 
diff --git a/games/springlobby/files/patch-lsl-fmemopen b/games/springlobby/files/patch-lsl-fmemopen
new file mode 100644
index 000000000000..6009d87f5dc8
--- /dev/null
+++ b/games/springlobby/files/patch-lsl-fmemopen
@@ -0,0 +1,32 @@
+diff --git src/CMakeLists.txt src/CMakeLists.txt
+index a1d9e3a..d82dac8 100644
+--- src/lsl/src/CMakeLists.txt
++++ src/lsl/src/CMakeLists.txt
+@@ -11,6 +11,14 @@ ENDIF ( EXISTS ${libSpringLobby_BINARY_DIR}/libSpringLobby_config.h  OR  EXISTS
+ INCLUDE_DIRECTORIES(${libSpringLobby_SOURCE_DIR}/lib)
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
++INCLUDE (CheckFunctionExists)
++
++SET(CMAKE_REQUIRED_INCLUDES stdio.h)
++CHECK_FUNCTION_EXISTS(fmemopen HAVE_FMEMOPEN)
++IF(HAVE_FMEMOPEN)
++	ADD_DEFINITIONS(-DHAVE_FMEMOPEN)
++ENDIF(HAVE_FMEMOPEN)
++
+ add_subdirectory( lslutils )
+ if (LSLSERVER)
+ 	add_subdirectory( lsl )
+diff --git src/lslunitsync/image.cpp src/lslunitsync/image.cpp
+index fbc4591..e26215c 100644
+--- src/lsl/src/lslunitsync/image.cpp
++++ src/lsl/src/lslunitsync/image.cpp
+@@ -14,7 +14,7 @@
+ #include <lslutils/logging.h>
+ 
+ 
+-#ifdef WIN32
++#if !defined(HAVE_FMEMOPEN)
+ #include <boost/filesystem.hpp>
+ //! we need our own fmemopen implementation since its posix only
+ FILE* fmemopen(void* data, size_t size, const char* mode)
diff --git a/games/springlobby/files/patch-src-battlelistctrl.cpp b/games/springlobby/files/patch-src-battlelistctrl.cpp
deleted file mode 100644
index cec646876e1f..000000000000
--- a/games/springlobby/files/patch-src-battlelistctrl.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/battlelistctrl.cpp.orig	2012-03-09 20:01:28.000000000 +0400
-+++ src/battlelistctrl.cpp	2012-03-10 07:08:45.273705553 +0400
-@@ -103,7 +103,7 @@
- 		case 7: return wxFormat(_T("%d") ) % int(battle.GetSpectators());
- 		case 8: return wxFormat(_T("%d") ) % (int(battle.GetNumUsers()) - int(battle.GetSpectators()));
- 		case 9: return wxFormat(_T("%d") ) % int(battle.GetMaxPlayers());
--        case 10: return ( wxDateTime(battle.GetBattleRunningTime()).FormatISOTime() );
-+        case 10: return ( wxDateTime((time_t)battle.GetBattleRunningTime()).FormatISOTime() );
-     }
- }
- 
diff --git a/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h b/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h
new file mode 100644
index 000000000000..165b380e594d
--- /dev/null
+++ b/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h
@@ -0,0 +1,11 @@
+--- src/downloader/lib/src/lib/xmlrpc++/src/base64.h.orig	2013-02-10 22:02:43.000000000 +0400
++++ src/downloader/lib/src/lib/xmlrpc++/src/base64.h	2013-12-10 04:19:12.257112752 +0400
+@@ -13,6 +13,8 @@
+ # include <iterator>
+ #endif
+ 
++#include <iostream>
++
+ static
+ int _base64Chars[]= {'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
+ 				     'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',
diff --git a/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp b/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp
new file mode 100644
index 000000000000..7e75cf3024cb
--- /dev/null
+++ b/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp
@@ -0,0 +1,17 @@
+--- src/lsl/src/lslunitsync/unitsync.cpp.orig	2013-11-23 01:34:07.000000000 +0400
++++ src/lsl/src/lslunitsync/unitsync.cpp	2013-12-10 04:23:40.875093997 +0400
+@@ -55,13 +55,7 @@
+ {
+ 	static std::locale l("C");
+ 	static boost::is_iless il(l);
+-	try {
+-		//this fails on certain names
+-		return il(first,second);
+-	}
+-	catch(...) {
+-		return first < second;
+-	}
++	return first < second;
+ }
+ 
+ bool Unitsync::LoadUnitSyncLib( const std::string& unitsyncloc )
diff --git a/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp b/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp
new file mode 100644
index 000000000000..510117436b01
--- /dev/null
+++ b/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp
@@ -0,0 +1,10 @@
+--- src/lsl/src/lslutils/misc.cpp.orig	2013-08-31 14:17:00.000000000 +0400
++++ src/lsl/src/lslutils/misc.cpp	2013-12-10 04:20:26.887107289 +0400
+@@ -3,6 +3,7 @@
+ 
+ #include <boost/filesystem.hpp>
+ #include <fstream>
++#include <cmath>
+ 
+ namespace LSL {
+ namespace Util {
diff --git a/games/springlobby/files/patch-src-spring.cpp b/games/springlobby/files/patch-src-spring.cpp
new file mode 100644
index 000000000000..367e2b141f83
--- /dev/null
+++ b/games/springlobby/files/patch-src-spring.cpp
@@ -0,0 +1,10 @@
+--- src/spring.cpp.orig	2013-11-23 01:34:04.000000000 +0400
++++ src/spring.cpp	2013-12-10 04:26:29.352082590 +0400
+@@ -28,6 +28,7 @@
+ #include <wx/filename.h>
+ #include <stdexcept>
+ #include <vector>
++#include <clocale>
+ #include <fstream>
+ 
+ #include "spring.h"
diff --git a/games/springlobby/pkg-plist b/games/springlobby/pkg-plist
index c7f2cdbf944d..8cbf799d32aa 100644
--- a/games/springlobby/pkg-plist
+++ b/games/springlobby/pkg-plist
@@ -18,8 +18,6 @@ share/icons/hicolor/scalable/apps/springlobby.svg
 %%NLS%%share/locale/sv/LC_MESSAGES/springlobby.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/springlobby.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/springlobby.mo
-%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en_US
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor