From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 10:55:16 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B8158722; Mon, 16 Dec 2013 10:55:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A2BE011EC; Mon, 16 Dec 2013 10:55:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGAtGvQ088231; Mon, 16 Dec 2013 10:55:16 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGAtF1k088222; Mon, 16 Dec 2013 10:55:15 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312161055.rBGAtF1k088222@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 16 Dec 2013 10:55:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336617 - in head/games/springlobby: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 10:55:16 -0000 Author: amdmi3 Date: Mon Dec 16 10:55:14 2013 New Revision: 336617 URL: http://svnweb.freebsd.org/changeset/ports/336617 Log: - Update to 0.180 - Support staging - Use new LIB_DEPENDS syntax - Use new OPTIONS features Added: head/games/springlobby/files/patch-lsl-fmemopen (contents, props changed) head/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h (contents, props changed) head/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp (contents, props changed) head/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp (contents, props changed) head/games/springlobby/files/patch-src-spring.cpp (contents, props changed) Deleted: head/games/springlobby/files/patch-CMakeLists.txt head/games/springlobby/files/patch-src-battlelistctrl.cpp Modified: head/games/springlobby/Makefile head/games/springlobby/distinfo head/games/springlobby/pkg-plist Modified: head/games/springlobby/Makefile ============================================================================== --- head/games/springlobby/Makefile Mon Dec 16 09:43:55 2013 (r336616) +++ head/games/springlobby/Makefile Mon Dec 16 10:55:14 2013 (r336617) @@ -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.inf 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 - -.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 '//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 Modified: head/games/springlobby/distinfo ============================================================================== --- head/games/springlobby/distinfo Mon Dec 16 09:43:55 2013 (r336616) +++ head/games/springlobby/distinfo Mon Dec 16 10:55:14 2013 (r336617) @@ -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 Added: head/games/springlobby/files/patch-lsl-fmemopen ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/springlobby/files/patch-lsl-fmemopen Mon Dec 16 10:55:14 2013 (r336617) @@ -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 + + +-#ifdef WIN32 ++#if !defined(HAVE_FMEMOPEN) + #include + //! we need our own fmemopen implementation since its posix only + FILE* fmemopen(void* data, size_t size, const char* mode) Added: head/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h Mon Dec 16 10:55:14 2013 (r336617) @@ -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 + #endif + ++#include ++ + 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', Added: head/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp Mon Dec 16 10:55:14 2013 (r336617) @@ -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 ) Added: head/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp Mon Dec 16 10:55:14 2013 (r336617) @@ -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 + #include ++#include + + namespace LSL { + namespace Util { Added: head/games/springlobby/files/patch-src-spring.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/springlobby/files/patch-src-spring.cpp Mon Dec 16 10:55:14 2013 (r336617) @@ -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 + #include + #include ++#include + #include + + #include "spring.h" Modified: head/games/springlobby/pkg-plist ============================================================================== --- head/games/springlobby/pkg-plist Mon Dec 16 09:43:55 2013 (r336616) +++ head/games/springlobby/pkg-plist Mon Dec 16 10:55:14 2013 (r336617) @@ -18,8 +18,6 @@ share/icons/hicolor/scalable/apps/spring %%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