diff -ruN wxlauncher.orig/Makefile wxlauncher/Makefile --- wxlauncher.orig/Makefile 2014-12-12 21:12:19.000000000 +0400 +++ wxlauncher/Makefile 2015-02-07 05:21:16.000000000 +0400 @@ -2,8 +2,7 @@ # $FreeBSD: head/games/wxlauncher/Makefile 374599 2014-12-12 17:12:19Z amdmi3 $ PORTNAME= wxlauncher -PORTVERSION= 0.9.4 -PORTREVISION= 1 +PORTVERSION= 0.9.5 CATEGORIES= games MAINTAINER= lightside@gmx.com @@ -17,13 +16,11 @@ 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 @@ "${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 +# 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 forum\.c_str|(wxString)&|' \ + ${WRKSRC}/code/controls/ModList.cpp +.endif pre-install: ${INSTALL_DATA} ${WRKSRC}/onlinehelp/images/header.png \ diff -ruN wxlauncher.orig/distinfo wxlauncher/distinfo --- wxlauncher.orig/distinfo 2014-12-12 03:05:50.000000000 +0400 +++ wxlauncher/distinfo 2015-02-07 00:16:00.000000000 +0400 @@ -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