Attachment #168890 for bug #205485




# $FreeBSD$

PORTNAME=	megaglest
PORTVERSION=	3.12.0
CATEGORIES=	games
DISTNAME=	${PORTNAME}-source-${PORTVERSION}


USES=		cmake compiler:c++11-lib display:build dos2unix jpeg lua \
		openal:al,alut pkgconfig tar:xz
USE_GL=		glew gl glu
USE_SDL=	sdl2
USE_WX=		3.0
USE_CXXSTD=	c++11


CFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib -lssl -lcrypto

OPTIONS_DEFINE=	EDITOR DOCS VIEWER
OPTIONS_SUB=	yes
EDITOR_DESC=	Install MegaGlest Editor
VIEWER_DESC=	Install Megaglest G3D viewer

.include <bsd.port.options.mk>


do-install:
	${STRIP_CMD} ${WRKSRC}/source/glest_game/megaglest
	@${MKDIR} ${STAGEDIR}${DATADIR}
	#${INSTALL_DATA} ${WRKSRC}/mk/linux/megaglest.desktop ${STAGEDIR}${PREFIX}/share/applications/
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons
	${INSTALL_DATA} ${WRKSRC}/mk/shared/megaglest.ico ${STAGEDIR}${PREFIX}/share/icons/
	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_game/megaglest ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
.for f in mk/linux/glest.ini mk/shared/glestkeys.ini mk/shared/servers.ini
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}

. endfor
.endif
.if ${PORT_OPTIONS:MEDITOR}
	${STRIP_CMD} ${WRKSRC}/source/glest_map_editor/megaglest_editor
	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_map_editor/megaglest_editor ${STAGEDIR}${PREFIX}/bin/megaglest_editor
	${INSTALL_DATA} ${WRKSRC}/mk/shared/editor.ico ${STAGEDIR}${PREFIX}/share/icons/
.endif
.if ${PORT_OPTIONS:MVIEWER}
	${STRIP_CMD} ${WRKSRC}/source/g3d_viewer/megaglest_g3dviewer
	${INSTALL_PROGRAM} ${WRKSRC}/source/g3d_viewer/megaglest_g3dviewer ${STAGEDIR}${PREFIX}/bin/megaglest_g3dviewer
	${INSTALL_DATA} ${WRKSRC}/mk/shared/g3dviewer.ico ${STAGEDIR}${PREFIX}/share/icons/
.endif
.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (megaglest-source-3.11.1_GH0.tar.xz) = 6bbbbb69d01bc765f439a60c74178b75dc47753cc126e6758e3bc740d8b42a21	1	SHA256 (megaglest-source-3.12.0_GH0.tar.xz) = 13c0ed6320f52558939cadcb1b1d16e6ac94cb3b22be6d4d761723ef41e87297
2	SIZE (megaglest-source-3.11.1_GH0.tar.xz) = 4807372	2	SIZE (megaglest-source-3.12.0_GH0.tar.xz) = 3638252

Lines 1-5 Link Here

(-)files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp (-2 / +2 lines)
1	--- source/shared_lib/sources/platform/posix/ircclient.cpp.orig 2013-11-22 15:51:23.000000000 -0600	1	--- source/shared_lib/sources/platform/posix/ircclient.cpp.orig 2016-04-02 12:36:57 UTC
2	+++ source/shared_lib/sources/platform/posix/ircclient.cpp 2013-11-22 15:51:42.000000000 -0600	2	+++ source/shared_lib/sources/platform/posix/ircclient.cpp
3	@@ -19,10 +19,7 @@	3	@@ -19,10 +19,7 @@
4	#if !defined(DISABLE_IRCCLIENT)	4	#if !defined(DISABLE_IRCCLIENT)
5		5




commit fc07d9caf22ee609c03b2edd5ca03b17fd5c2098
Author: Michael Palimaka <kensington@gentoo.org>
Date:   Wed May 13 04:22:45 2015 +1000

    Fix build with >=cmake-3.2.

    The FindOpenGL module no longer pulls in X11 libraries.

--- source/shared_lib/CMakeLists.txt
+++ source/shared_lib/CMakeLists.txt
@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
 	ENDIF()
 
+        IF(UNIX)
+		FIND_PACKAGE(X11 REQUIRED)
+		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
+        ENDIF()
 
         IF(WANT_XERCES)
 	        FIND_PACKAGE(XercesC REQUIRED)
yes
native
text/plain




--- source/shared_lib/include/platform/sdl/platform_main.h.orig	2016-04-02 12:37:33 UTC
+++ source/shared_lib/include/platform/sdl/platform_main.h
@@ -667,7 +667,7 @@ int mainSetup(int argc, char **argv) {
 	}
 	else {
 		 if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
-		 if(SDL_Init(SDL_INIT_EVERYTHING) < 0)  {
+		 if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER | SDL_INIT_EVENTS) < 0)  {
 			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
 			std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n";
 			return 3;
yes
native
text/plain




--- source/shared_lib/sources/platform/common/platform_common.cpp.orig	2016-04-02 12:36:57 UTC
+++ source/shared_lib/sources/platform/common/platform_common.cpp
@@ -124,7 +124,7 @@ tm threadsafe_localtime(const time_t &ti
 // extracting std::time_t from std:chrono for "now"
 time_t systemtime_now() {
 #if __cplusplus > 199711L
-	system_time_point system_now = std::chrono::system_clock::now();
+	auto system_now = std::chrono::system_clock::now();
 	return std::chrono::system_clock::to_time_t(system_now);
 #else
 	return time(NULL);
yes
native
text/plain




--- source/shared_lib/sources/platform/posix/socket.cpp.orig	2015-10-14 18:18:16 UTC
+++ source/shared_lib/sources/platform/posix/socket.cpp
@@ -2554,7 +2554,11 @@ int UPNP_Tools::upnp_init(void *param) {
 		int upnp_error = 0;
 
 #ifndef MINIUPNPC_VERSION_PRE1_6
+#if MINIUPNPC_API_VERSION >= 14
+		devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, 2, &upnp_error);
+#else
 		devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
+#endif
 
 		if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
 		if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP discover returned upnp_error = %d.\n",upnp_error);
yes
native
text/plain




bin/megaglest
%%EDITOR%%bin/megaglest_editor
%%VIEWER%%bin/megaglest_g3dviewer
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.source_code.txt
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.source_code.txt
%%PORTDOCS%%%%DOCSDIR%%/README.txt
share/icons/editor.ico
share/icons/g3dviewer.ico
share/icons/megaglest.ico
%%DATADIR%%/glest.ini
%%DATADIR%%/glestkeys.ini
%%DATADIR%%/servers.ini
%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.source_code.txt
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.source_code.txt
share/applications/megaglest.desktop
share/icons/megaglest.png

Return to bug 205485

Lines 2-8 Link Here

(-)Makefile (-6 / +13 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= megaglest	4	PORTNAME= megaglest
5	PORTVERSION= 3.11.1	5	PORTVERSION= 3.12.0
6	CATEGORIES= games	6	CATEGORIES= games
7	DISTNAME= ${PORTNAME}-source-${PORTVERSION}	7	DISTNAME= ${PORTNAME}-source-${PORTVERSION}
8		8
Lines 30-36 Link Here
30	USES= cmake compiler:c++11-lib display:build dos2unix jpeg lua \	30	USES= cmake compiler:c++11-lib display:build dos2unix jpeg lua \
31	openal:al,alut pkgconfig tar:xz	31	openal:al,alut pkgconfig tar:xz
32	USE_GL= glew gl glu	32	USE_GL= glew gl glu
33	USE_SDL= yes	33	USE_SDL= sdl2
34	USE_WX= 3.0	34	USE_WX= 3.0
35	USE_CXXSTD= c++11	35	USE_CXXSTD= c++11
36		36
Lines 37-45 Link Here
37	CFLAGS+= -I${LOCALBASE}/include	37	CFLAGS+= -I${LOCALBASE}/include
38	LDFLAGS+= -L${LOCALBASE}/lib -lssl -lcrypto	38	LDFLAGS+= -L${LOCALBASE}/lib -lssl -lcrypto
39		39
40	OPTIONS_DEFINE= EDITOR DOCS	40	OPTIONS_DEFINE= EDITOR DOCS VIEWER
41	OPTIONS_SUB= yes	41	OPTIONS_SUB= yes
42	EDITOR_DESC= Install MegaGlest Editor	42	EDITOR_DESC= Install MegaGlest Editor
		43	VIEWER_DESC= Install Megaglest G3D viewer
43		44
44	.include <bsd.port.options.mk>	45	.include <bsd.port.options.mk>
45		46
Lines 52-60 Link Here
52	do-install:	53	do-install:
53	${STRIP_CMD} ${WRKSRC}/source/glest_game/megaglest	54	${STRIP_CMD} ${WRKSRC}/source/glest_game/megaglest
54	@${MKDIR} ${STAGEDIR}${DATADIR}	55	@${MKDIR} ${STAGEDIR}${DATADIR}
55	${INSTALL_DATA} ${WRKSRC}/mk/linux/megaglest.desktop ${STAGEDIR}${PREFIX}/share/applications/	56	#${INSTALL_DATA} ${WRKSRC}/mk/linux/megaglest.desktop ${STAGEDIR}${PREFIX}/share/applications/
56	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons	57	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons
57	${INSTALL_DATA} ${WRKSRC}/mk/linux/megaglest.png ${STAGEDIR}${PREFIX}/share/icons/	58	${INSTALL_DATA} ${WRKSRC}/mk/shared/megaglest.ico ${STAGEDIR}${PREFIX}/share/icons/
58	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_game/megaglest ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	59	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_game/megaglest ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
59	.for f in mk/linux/glest.ini mk/shared/glestkeys.ini mk/shared/servers.ini	60	.for f in mk/linux/glest.ini mk/shared/glestkeys.ini mk/shared/servers.ini
60	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}	61	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
Lines 66-72 Link Here
66	. endfor	67	. endfor
67	.endif	68	.endif
68	.if ${PORT_OPTIONS:MEDITOR}	69	.if ${PORT_OPTIONS:MEDITOR}
		70	${STRIP_CMD} ${WRKSRC}/source/glest_map_editor/megaglest_editor
69	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_map_editor/megaglest_editor ${STAGEDIR}${PREFIX}/bin/megaglest_editor	71	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_map_editor/megaglest_editor ${STAGEDIR}${PREFIX}/bin/megaglest_editor
		72	${INSTALL_DATA} ${WRKSRC}/mk/shared/editor.ico ${STAGEDIR}${PREFIX}/share/icons/
70	.endif	73	.endif
71		74	.if ${PORT_OPTIONS:MVIEWER}
		75	${STRIP_CMD} ${WRKSRC}/source/g3d_viewer/megaglest_g3dviewer
		76	${INSTALL_PROGRAM} ${WRKSRC}/source/g3d_viewer/megaglest_g3dviewer ${STAGEDIR}${PREFIX}/bin/megaglest_g3dviewer
		77	${INSTALL_DATA} ${WRKSRC}/mk/shared/g3dviewer.ico ${STAGEDIR}${PREFIX}/share/icons/
		78	.endif
72	.include <bsd.port.mk>	79	.include <bsd.port.mk>

Lines 1-21 Link Here

(-)files/patch-source__shared_lib__CMakeLists.txt (-24 lines)
1	commit fc07d9caf22ee609c03b2edd5ca03b17fd5c2098
2	Author: Michael Palimaka <kensington@gentoo.org>
3	Date: Wed May 13 04:22:45 2015 +1000
4
5	Fix build with >=cmake-3.2.
6
7	The FindOpenGL module no longer pulls in X11 libraries.
8
9	--- source/shared_lib/CMakeLists.txt
10	+++ source/shared_lib/CMakeLists.txt
11	@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
12	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
13	ENDIF()
14
15	+ IF(UNIX)
16	+ FIND_PACKAGE(X11 REQUIRED)
17	+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
18	+ ENDIF()
19
20	IF(WANT_XERCES)
21	FIND_PACKAGE(XercesC REQUIRED)
22	yes
23	native
24	text/plain

Line 0 Link Here

(-)files/patch-source_shared__lib_include_platform_sdl_platform__main.h (+14 lines)
	1	--- source/shared_lib/include/platform/sdl/platform_main.h.orig 2016-04-02 12:37:33 UTC
	2	+++ source/shared_lib/include/platform/sdl/platform_main.h
	3	@@ -667,7 +667,7 @@ int mainSetup(int argc, char **argv) {
	4	}
	5	else {
	6	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
	7	- if(SDL_Init(SDL_INIT_EVERYTHING) < 0) {
	8	+ if(SDL_Init(SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_JOYSTICK \| SDL_INIT_GAMECONTROLLER \| SDL_INIT_EVENTS) < 0) {
	9	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
	10	std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n";
	11	return 3;
	12	yes
	13	native
	14	text/plain

Line 0 Link Here

(-)files/patch-source_shared__lib_sources_platform_common_platform__common.cpp (+14 lines)
	1	--- source/shared_lib/sources/platform/common/platform_common.cpp.orig 2016-04-02 12:36:57 UTC
	2	+++ source/shared_lib/sources/platform/common/platform_common.cpp
	3	@@ -124,7 +124,7 @@ tm threadsafe_localtime(const time_t &ti
	4	// extracting std::time_t from std:chrono for "now"
	5	time_t systemtime_now() {
	6	#if __cplusplus > 199711L
	7	- system_time_point system_now = std::chrono::system_clock::now();
	8	+ auto system_now = std::chrono::system_clock::now();
	9	return std::chrono::system_clock::to_time_t(system_now);
	10	#else
	11	return time(NULL);
	12	yes
	13	native
	14	text/plain

Lines 1-11 Link Here

(-)pkg-plist (-7 / +9 lines)
		1	bin/megaglest
1	%%EDITOR%%bin/megaglest_editor	2	%%EDITOR%%bin/megaglest_editor
2	bin/megaglest	3	%%VIEWER%%bin/megaglest_g3dviewer
		4	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.source_code.txt
		5	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
		6	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.source_code.txt
		7	%%PORTDOCS%%%%DOCSDIR%%/README.txt
		8	share/icons/editor.ico
		9	share/icons/g3dviewer.ico
		10	share/icons/megaglest.ico
3	%%DATADIR%%/glest.ini	11	%%DATADIR%%/glest.ini
4	%%DATADIR%%/glestkeys.ini	12	%%DATADIR%%/glestkeys.ini
5	%%DATADIR%%/servers.ini	13	%%DATADIR%%/servers.ini
6	%%PORTDOCS%%%%DOCSDIR%%/README.txt
7	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.source_code.txt
8	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
9	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.source_code.txt
10	share/applications/megaglest.desktop
11	share/icons/megaglest.png