View | Details | Raw Unified | Return to bug 197383 | Differences between
and this patch

Collapse All | Expand All

(-)wxlauncher/Makefile (-9 / +24 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/games/wxlauncher/Makefile 374599 2014-12-12 17:12:19Z amdmi3 $
2
# $FreeBSD: head/games/wxlauncher/Makefile 374599 2014-12-12 17:12:19Z amdmi3 $
3
3
4
PORTNAME=	wxlauncher
4
PORTNAME=	wxlauncher
5
PORTVERSION=	0.9.4
5
PORTVERSION=	0.9.5
6
PORTREVISION=	1
7
CATEGORIES=	games
6
CATEGORIES=	games
8
7
9
MAINTAINER=	lightside@gmx.com
8
MAINTAINER=	lightside@gmx.com
Lines 17-29 Link Here
17
16
18
USE_GITHUB=	yes
17
USE_GITHUB=	yes
19
GH_ACCOUNT=	wxLauncher
18
GH_ACCOUNT=	wxLauncher
20
GH_PROJECT=	${PORTNAME}
19
GH_COMMIT=	7ee46df
21
GH_COMMIT=	d251770
22
GH_TAGNAME=	${GH_COMMIT}
20
GH_TAGNAME=	${GH_COMMIT}
23
21
24
USES=		cmake:outsource openal python:2,build
22
USES=		cmake:outsource openal python:2,build
25
USE_SDL=	sdl
23
USE_SDL=	sdl
26
USE_WX=		2.8
27
WX_UNICODE=	yes
24
WX_UNICODE=	yes
28
CMAKE_ARGS+=	-DRESOURCES_PATH:STRING="${DATADIR}"
25
CMAKE_ARGS+=	-DRESOURCES_PATH:STRING="${DATADIR}"
29
26
Lines 37-61 Link Here
37
		"${PORTNAME}" "${PORTNAME}" \
34
		"${PORTNAME}" "${PORTNAME}" \
38
		"Game;" false
35
		"Game;" false
39
36
40
OPTIONS_DEFINE=	DOCS JOYSTICK
37
OPTIONS_DEFINE=	DOCS JOYSTICK WX3
41
OPTIONS_DEFAULT=	JOYSTICK
38
OPTIONS_DEFAULT=	JOYSTICK
42
JOYSTICK_DESC=	Build with joystick support
39
JOYSTICK_DESC=	Build with joystick support
43
JOYSTICK_CMAKE_ON=	-DUSE_JOYSTICK:BOOL=ON
40
JOYSTICK_CMAKE_ON=	-DUSE_JOYSTICK:BOOL=ON
44
JOYSTICK_CMAKE_OFF=	-DUSE_JOYSTICK:BOOL=OFF
41
JOYSTICK_CMAKE_OFF=	-DUSE_JOYSTICK:BOOL=OFF
42
WX3_DESC=	Build with using wxWidgets 3.0+ version (2.8 otherwise)
43
WX3_USE=	WX=3.0+
44
WX3_USE_OFF=	WX=2.8
45
45
46
.include <bsd.port.options.mk>
46
.include <bsd.port.options.mk>
47
47
48
# Allow to build with using concrete wxWidgets version
49
.if ${PORT_OPTIONS:MWX3}
50
SED_RE_WX3=	wxWidgets 2\./,+1d
51
.else
52
SED_RE_WX3=	NOT wxWidgets_FOUND/,+3d
53
.endif
54
48
post-patch: .SILENT
55
post-patch: .SILENT
49
# The GetPlatformDefaultConfigFilePath function used as extern inside of
56
# The GetPlatformDefaultConfigFilePath function used as extern inside of
50
# ${WRKSRC}/code/apis/PlatformProfileManagerShared.cpp file
57
# ${WRKSRC}/code/apis/PlatformProfileManagerShared.cpp file
51
	${REINPLACE_CMD} -e 's|^inline wxFileName|extern wxFileName|' \
58
	${REINPLACE_CMD} -e 's|^inline wxFileName|extern wxFileName|' \
52
		${WRKSRC}/code/apis/FileProfileManager.cpp
59
		${WRKSRC}/code/apis/FileProfileManager.cpp
53
# Change version_strings.cpp.in file, based on GH_TAGNAME, without using hg
60
# Fix relative path to OpenAL includes
54
	${REINPLACE_CMD} -e '/find_program(HG_EXECUTABLE/d ; \
61
	${REINPLACE_CMD} -e '/^#include <al/s|al/||' \
55
		/version_strings.cpp will be generated/d' \
62
		${WRKSRC}/code/apis/OpenALManager.cpp
63
# Change version_strings.cpp.in file, based on GH_TAGNAME, without using git
64
	${REINPLACE_CMD} -e '/find_program(GIT_EXECUTABLE/d ; \
65
		/version_strings.cpp will be generated/d ; /${SED_RE_WX3}' \
56
		${WRKSRC}/CMakeLists.txt
66
		${WRKSRC}/CMakeLists.txt
57
	${REINPLACE_CMD} -e 's|123456789abc+ unknown custom tip|${GH_TAGNAME}|' \
67
	${REINPLACE_CMD} -e 's|123456789abc+ unknown custom tip|${GH_TAGNAME}|' \
58
		${WRKSRC}/code/global/version_strings.cpp.in
68
		${WRKSRC}/code/global/version_strings.cpp.in
69
.if ${PORT_OPTIONS:MWX3}
70
# Fix ambiguity between wxCStrData and wxString
71
	${REINPLACE_CMD} -e 's|item->forum\.c_str|(wxString)&|' \
72
		${WRKSRC}/code/controls/ModList.cpp
73
.endif
59
74
60
pre-install:
75
pre-install:
61
	${INSTALL_DATA} ${WRKSRC}/onlinehelp/images/header.png \
76
	${INSTALL_DATA} ${WRKSRC}/onlinehelp/images/header.png \
(-)wxlauncher/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (wxlauncher-0.9.4.tar.gz) = c4f94bcc7bb84d694b0cd2a97a6dc37013ae32c9df8cb4d8377d1f55a12ea102
1
SHA256 (wxlauncher-0.9.5.tar.gz) = bc4a14cff2a012b95fd72610ffad1ad74df06665c4c19fbde55df949e9e41aea
2
SIZE (wxlauncher-0.9.4.tar.gz) = 892760
2
SIZE (wxlauncher-0.9.5.tar.gz) = 893508

Return to bug 197383