Date: Sat, 23 Apr 2016 00:19:27 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413798 - in head/games/megaglest: . files Message-ID: <201604230019.u3N0JRrC034100@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sat Apr 23 00:19:26 2016 New Revision: 413798 URL: https://svnweb.freebsd.org/changeset/ports/413798 Log: - Update to 3.12.0 - While here, convert to options helpers PR: 205485 Submitted by: monwarez@mailoo.org (maintainer) Added: head/games/megaglest/files/patch-source_shared__lib_include_platform_sdl_platform__main.h (contents, props changed) head/games/megaglest/files/patch-source_shared__lib_sources_platform_common_platform__common.cpp (contents, props changed) Deleted: head/games/megaglest/files/patch-source__shared_lib__CMakeLists.txt head/games/megaglest/files/patch-source_shared__lib_sources_platform_posix_socket.cpp Modified: head/games/megaglest/Makefile head/games/megaglest/distinfo head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp head/games/megaglest/pkg-plist Modified: head/games/megaglest/Makefile ============================================================================== --- head/games/megaglest/Makefile Fri Apr 22 23:14:18 2016 (r413797) +++ head/games/megaglest/Makefile Sat Apr 23 00:19:26 2016 (r413798) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= megaglest -PORTVERSION= 3.11.1 +PORTVERSION= 3.12.0 CATEGORIES= games -DISTNAME= ${PORTNAME}-source-${PORTVERSION} MAINTAINER= monwarez@mailoo.org COMMENT= Open source 3D real-time strategy game @@ -28,20 +27,19 @@ GH_PROJECT= megaglest-source SUB_FILES= pkg-message USES= cmake compiler:c++11-lib display:build dos2unix jpeg lua \ - openal:al,alut pkgconfig tar:xz + openal:al,alut pkgconfig USE_GL= glew gl glu -USE_SDL= yes +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 +OPTIONS_DEFINE= EDITOR DOCS VIEWER OPTIONS_SUB= yes EDITOR_DESC= Install MegaGlest Editor - -.include <bsd.port.options.mk> +VIEWER_DESC= Install Megaglest G3D viewer post-patch: @${REINPLACE_CMD} -e 's,/usr/local/include/lua51,${LUA_INCDIR},g ; \ @@ -50,23 +48,26 @@ post-patch: ${WRKSRC}/mk/cmake/Modules/FindLUA.cmake 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/linux/megaglest.png ${STAGEDIR}${PREFIX}/share/icons/ + @${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKSRC}/mk/shared/megaglest.ico ${STAGEDIR}${PREFIX}/share/pixmaps/ ${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 -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -. for f in docs/AUTHORS.source_code.txt docs/CHANGELOG.txt docs/README.txt docs/COPYRIGHT.source_code.txt +.for f in docs/AUTHORS.source_code.txt docs/CHANGELOG.txt docs/README.txt docs/COPYRIGHT.source_code.txt ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} -. endfor -.endif -.if ${PORT_OPTIONS:MEDITOR} +.endfor + +do-install-EDITOR-on: ${INSTALL_PROGRAM} ${WRKSRC}/source/glest_map_editor/megaglest_editor ${STAGEDIR}${PREFIX}/bin/megaglest_editor -.endif + ${INSTALL_DATA} ${WRKSRC}/mk/shared/editor.ico ${STAGEDIR}${PREFIX}/share/pixmaps/ + +do-install-VIEWER-on: + ${INSTALL_PROGRAM} ${WRKSRC}/source/g3d_viewer/megaglest_g3dviewer ${STAGEDIR}${PREFIX}/bin/megaglest_g3dviewer + ${INSTALL_DATA} ${WRKSRC}/mk/shared/g3dviewer.ico ${STAGEDIR}${PREFIX}/share/pixmaps/ .include <bsd.port.mk> Modified: head/games/megaglest/distinfo ============================================================================== --- head/games/megaglest/distinfo Fri Apr 22 23:14:18 2016 (r413797) +++ head/games/megaglest/distinfo Sat Apr 23 00:19:26 2016 (r413798) @@ -1,2 +1,2 @@ -SHA256 (megaglest-source-3.11.1_GH0.tar.xz) = 6bbbbb69d01bc765f439a60c74178b75dc47753cc126e6758e3bc740d8b42a21 -SIZE (megaglest-source-3.11.1_GH0.tar.xz) = 4807372 +SHA256 (MegaGlest-megaglest-source-3.12.0_GH0.tar.gz) = 13c0ed6320f52558939cadcb1b1d16e6ac94cb3b22be6d4d761723ef41e87297 +SIZE (MegaGlest-megaglest-source-3.12.0_GH0.tar.gz) = 3638252 Modified: head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp ============================================================================== --- head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp Fri Apr 22 23:14:18 2016 (r413797) +++ head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp Sat Apr 23 00:19:26 2016 (r413798) @@ -1,5 +1,5 @@ ---- source/shared_lib/sources/platform/posix/ircclient.cpp.orig 2013-11-22 15:51:23.000000000 -0600 -+++ source/shared_lib/sources/platform/posix/ircclient.cpp 2013-11-22 15:51:42.000000000 -0600 +--- source/shared_lib/sources/platform/posix/ircclient.cpp.orig 2016-04-02 12:36:57 UTC ++++ source/shared_lib/sources/platform/posix/ircclient.cpp @@ -19,10 +19,7 @@ #if !defined(DISABLE_IRCCLIENT) Added: head/games/megaglest/files/patch-source_shared__lib_include_platform_sdl_platform__main.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/megaglest/files/patch-source_shared__lib_include_platform_sdl_platform__main.h Sat Apr 23 00:19:26 2016 (r413798) @@ -0,0 +1,11 @@ +--- 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; Added: head/games/megaglest/files/patch-source_shared__lib_sources_platform_common_platform__common.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/megaglest/files/patch-source_shared__lib_sources_platform_common_platform__common.cpp Sat Apr 23 00:19:26 2016 (r413798) @@ -0,0 +1,11 @@ +--- 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); Modified: head/games/megaglest/pkg-plist ============================================================================== --- head/games/megaglest/pkg-plist Fri Apr 22 23:14:18 2016 (r413797) +++ head/games/megaglest/pkg-plist Sat Apr 23 00:19:26 2016 (r413798) @@ -1,11 +1,13 @@ -%%EDITOR%%bin/megaglest_editor 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 +%%EDITOR%%share/pixmaps/editor.ico +%%VIEWER%%share/pixmaps/g3dviewer.ico +share/pixmaps/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604230019.u3N0JRrC034100>