Attachment #161141 for bug #202939




# $FreeBSD: head/games/wxlauncher/Makefile 387986 2015-05-30 21:25:06Z mat $

PORTNAME=	wxlauncher
PORTVERSION=	0.10.0
DISTVERSIONPREFIX=	release-
PORTREVISION=	2
CATEGORIES=	games

MAINTAINER=	lightside@gmx.com

		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3

USE_GITHUB=	yes
GH_ACCOUNT=	scp-fs2open
GH_PROJECT=	wxLauncher

USES=		cmake:outsource openal pkgconfig python:2,build
USE_SDL=	sdl2
WX_UNICODE=	yes
CMAKE_ARGS+=	-DRESOURCES_PATH:STRING="${DATADIR}"

PORTDATA=	*

WX3_USES=	compiler:c++11-lib
WX3_USE=	WX=3.0+
WX3_USE_OFF=	WX=2.8
WX3_CMAKE_ON=	-DWXVER:STRING="3.0"
WX3_CMAKE_OFF=	-DWXVER:STRING="2.8"

# 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
# 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' \
		${WRKSRC}/CMakeLists.txt
	${REINPLACE_CMD} -e 's|123456789abc+ unknown custom tip|${GH_TAGNAME}|' \
		${WRKSRC}/code/global/version_strings.cpp.in

Lines 1-2 Link Here

(-)wxlauncher/distinfo (-2 / +2 lines)
1	SHA256 (wxLauncher-wxlauncher-release-0.9.6_GH0.tar.gz) = 24a90722a63ee8a711e268bd78535bbb1ec99a2b27fd7c3750517d07424b6979	1	SHA256 (scp-fs2open-wxLauncher-release-0.10.0_GH0.tar.gz) = b47c88be4d7cc6582a7b7816cf8dc9fe1502947f3bdd509bc0b4b6fcf06a8bc0
2	SIZE (wxLauncher-wxlauncher-release-0.9.6_GH0.tar.gz) = 893799	2	SIZE (scp-fs2open-wxLauncher-release-0.10.0_GH0.tar.gz) = 2434207




--- code/apis/JoystickManager.cpp.orig	2015-08-26 04:54:06 UTC
+++ code/apis/JoystickManager.cpp
@@ -84,9 +84,9 @@ bool JoyMan::IsInitialized() {
 \sa JoyMan::WasCompiledIn()
 */
 bool JoyMan::Initialize(ApiType apiType) {
 	if ( JoyMan::IsInitialized() ) {
+#if USE_JOYSTICK
 	currentApi = apiType;
 			joysticks.Count());
+#endif
 		return true;
 	}
 
-#if USE_JOYSTICK
 	if ( JoyMan::IsInitialized() ) {
 		wxLogDebug(_T("JoyMan already initialized"));
 		return true;

Lines 5-8 Link Here

(-)wxlauncher/pkg-descr (-1 / +1 lines)
5	to those looking for an easy way to find and get updates to their Freespace 2	5	to those looking for an easy way to find and get updates to their Freespace 2
6	MODs and TCs.	6	MODs and TCs.
7		7
8	WWW: http://github.com/wxLauncher/wxlauncher	8	WWW: http://github.com/scp-fs2open/wxLauncher

Return to bug 202939

Lines 2-10 Link Here

(-)wxlauncher/Makefile (-16 / +8 lines)
2	# $FreeBSD: head/games/wxlauncher/Makefile 387986 2015-05-30 21:25:06Z mat $	2	# $FreeBSD: head/games/wxlauncher/Makefile 387986 2015-05-30 21:25:06Z mat $
3		3
4	PORTNAME= wxlauncher	4	PORTNAME= wxlauncher
5	PORTVERSION= 0.9.6	5	PORTVERSION= 0.10.0
6	DISTVERSIONPREFIX= release-	6	DISTVERSIONPREFIX= release-
7	PORTREVISION= 2
8	CATEGORIES= games	7	CATEGORIES= games
9		8
10	MAINTAINER= lightside@gmx.com	9	MAINTAINER= lightside@gmx.com
Lines 17-27 Link Here
17	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3	16	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
18		17
19	USE_GITHUB= yes	18	USE_GITHUB= yes
20	GH_ACCOUNT= wxLauncher	19	GH_ACCOUNT= scp-fs2open
		20	GH_PROJECT= wxLauncher
21		21
22	USES= cmake:outsource openal python:2,build	22	USES= cmake:outsource openal pkgconfig python:2,build
23	USE_SDL= sdl	23	USE_SDL= sdl2
24	WX_UNICODE= yes
25	CMAKE_ARGS+= -DRESOURCES_PATH:STRING="${DATADIR}"	24	CMAKE_ARGS+= -DRESOURCES_PATH:STRING="${DATADIR}"
26		25
27	PORTDATA= *	26	PORTDATA= *
Lines 45-64 Link Here
45	WX3_USES= compiler:c++11-lib	44	WX3_USES= compiler:c++11-lib
46	WX3_USE= WX=3.0+	45	WX3_USE= WX=3.0+
47	WX3_USE_OFF= WX=2.8	46	WX3_USE_OFF= WX=2.8
48		47	WX3_CMAKE_ON= -DWXVER:STRING="3.0"
49	.include <bsd.port.options.mk>	48	WX3_CMAKE_OFF= -DWXVER:STRING="2.8"
50
51	# Allow to build with using concrete wxWidgets version
52	.if ${PORT_OPTIONS:MWX3}
53	SED_RE_WX3= wxWidgets 2\./,+1d
54	.else
55	SED_RE_WX3= NOT wxWidgets_FOUND/,+3d
56	.endif
57		49
58	post-patch: .SILENT	50	post-patch: .SILENT
59	# Change version_strings.cpp.in file, based on GH_TAGNAME, without using git	51	# Change version_strings.cpp.in file, based on GH_TAGNAME, without using git
60	${REINPLACE_CMD} -e '/find_program(GIT_EXECUTABLE/d ; \	52	${REINPLACE_CMD} -e '/find_program(GIT_EXECUTABLE/d ; \
61	/version_strings.cpp will be generated/d ; /${SED_RE_WX3}' \	53	/version_strings.cpp will be generated/d' \
62	${WRKSRC}/CMakeLists.txt	54	${WRKSRC}/CMakeLists.txt
63	${REINPLACE_CMD} -e 's\|123456789abc+ unknown custom tip\|${GH_TAGNAME}\|' \	55	${REINPLACE_CMD} -e 's\|123456789abc+ unknown custom tip\|${GH_TAGNAME}\|' \
64	${WRKSRC}/code/global/version_strings.cpp.in	56	${WRKSRC}/code/global/version_strings.cpp.in

Lines 1-13 Link Here

(-)wxlauncher/files/patch-code_apis_JoystickManager.cpp (-9 / +9 lines)
1	--- code/apis/JoystickManager.cpp.orig 2015-04-11 22:15:55 UTC	1	--- code/apis/JoystickManager.cpp.orig 2015-08-26 04:54:06 UTC
2	+++ code/apis/JoystickManager.cpp	2	+++ code/apis/JoystickManager.cpp
3	@@ -65,8 +65,10 @@ bool JoyMan::IsInitialized() {	3	@@ -84,9 +84,9 @@ bool JoyMan::IsInitialized() {
		4	\sa JoyMan::WasCompiledIn()
4	*/	5	*/
5	bool JoyMan::Initialize() {	6	bool JoyMan::Initialize(ApiType apiType) {
6	if ( JoyMan::IsInitialized() ) {
7	+#if USE_JOYSTICK	7	+#if USE_JOYSTICK
8	wxLogDebug(_T("JoyMan already initialized with %d joysticks"),	8	currentApi = apiType;
9	joysticks.Count());
10	+#endif
11	return true;
12	}
13		9
		10	-#if USE_JOYSTICK
		11	if ( JoyMan::IsInitialized() ) {
		12	wxLogDebug(_T("JoyMan already initialized"));
		13	return true;