Date: Mon, 23 Feb 2015 00:28:43 +0000 (UTC) From: Ruslan Makhmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379636 - head/games/wxlauncher Message-ID: <201502230028.t1N0ShFb055404@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Mon Feb 23 00:28:43 2015 New Revision: 379636 URL: https://svnweb.freebsd.org/changeset/ports/379636 QAT: https://qat.redports.org/buildarchive/r379636/ Log: games/wxlauncher: update to 0.9.5 PR: 197383 Submitted by: lightside@gmx.com (maintainer) Modified: head/games/wxlauncher/Makefile head/games/wxlauncher/distinfo Modified: head/games/wxlauncher/Makefile ============================================================================== --- head/games/wxlauncher/Makefile Mon Feb 23 00:05:39 2015 (r379635) +++ head/games/wxlauncher/Makefile Mon Feb 23 00:28:43 2015 (r379636) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= wxlauncher -PORTVERSION= 0.9.4 -PORTREVISION= 1 +PORTVERSION= 0.9.5 CATEGORIES= games MAINTAINER= lightside@gmx.com @@ -17,13 +16,11 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ma USE_GITHUB= yes GH_ACCOUNT= wxLauncher -GH_PROJECT= ${PORTNAME} -GH_COMMIT= d251770 +GH_COMMIT= 7ee46df GH_TAGNAME= ${GH_COMMIT} USES= cmake:outsource openal python:2,build USE_SDL= sdl -USE_WX= 2.8 WX_UNICODE= yes CMAKE_ARGS+= -DRESOURCES_PATH:STRING="${DATADIR}" @@ -37,25 +34,43 @@ DESKTOP_ENTRIES="wxLauncher" "${COMMENT} "${PORTNAME}" "${PORTNAME}" \ "Game;" false -OPTIONS_DEFINE= DOCS JOYSTICK +OPTIONS_DEFINE= DOCS JOYSTICK WX3 OPTIONS_DEFAULT= JOYSTICK JOYSTICK_DESC= Build with joystick support JOYSTICK_CMAKE_ON= -DUSE_JOYSTICK:BOOL=ON JOYSTICK_CMAKE_OFF= -DUSE_JOYSTICK:BOOL=OFF +WX3_DESC= Build with using wxWidgets 3.0+ version (2.8 otherwise) +WX3_USE= WX=3.0+ +WX3_USE_OFF= WX=2.8 .include <bsd.port.options.mk> +# Allow to build with using concrete wxWidgets version +.if ${PORT_OPTIONS:MWX3} +SED_RE_WX3= wxWidgets 2\./,+1d +.else +SED_RE_WX3= NOT wxWidgets_FOUND/,+3d +.endif + post-patch: .SILENT # The GetPlatformDefaultConfigFilePath function used as extern inside of # ${WRKSRC}/code/apis/PlatformProfileManagerShared.cpp file ${REINPLACE_CMD} -e 's|^inline wxFileName|extern wxFileName|' \ ${WRKSRC}/code/apis/FileProfileManager.cpp -# Change version_strings.cpp.in file, based on GH_TAGNAME, without using hg - ${REINPLACE_CMD} -e '/find_program(HG_EXECUTABLE/d ; \ - /version_strings.cpp will be generated/d' \ +# Fix relative path to OpenAL includes + ${REINPLACE_CMD} -e '/^#include <al/s|al/||' \ + ${WRKSRC}/code/apis/OpenALManager.cpp +# Change version_strings.cpp.in file, based on GH_TAGNAME, without using git + ${REINPLACE_CMD} -e '/find_program(GIT_EXECUTABLE/d ; \ + /version_strings.cpp will be generated/d ; /${SED_RE_WX3}' \ ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e 's|123456789abc+ unknown custom tip|${GH_TAGNAME}|' \ ${WRKSRC}/code/global/version_strings.cpp.in +.if ${PORT_OPTIONS:MWX3} +# Fix ambiguity between wxCStrData and wxString + ${REINPLACE_CMD} -e 's|item->forum\.c_str|(wxString)&|' \ + ${WRKSRC}/code/controls/ModList.cpp +.endif pre-install: ${INSTALL_DATA} ${WRKSRC}/onlinehelp/images/header.png \ Modified: head/games/wxlauncher/distinfo ============================================================================== --- head/games/wxlauncher/distinfo Mon Feb 23 00:05:39 2015 (r379635) +++ head/games/wxlauncher/distinfo Mon Feb 23 00:28:43 2015 (r379636) @@ -1,2 +1,2 @@ -SHA256 (wxlauncher-0.9.4.tar.gz) = c4f94bcc7bb84d694b0cd2a97a6dc37013ae32c9df8cb4d8377d1f55a12ea102 -SIZE (wxlauncher-0.9.4.tar.gz) = 892760 +SHA256 (wxlauncher-0.9.5.tar.gz) = bc4a14cff2a012b95fd72610ffad1ad74df06665c4c19fbde55df949e9e41aea +SIZE (wxlauncher-0.9.5.tar.gz) = 893508
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502230028.t1N0ShFb055404>