- Update to 0.7.3.1

- Switch downloads to GitHub
- Support testing

3 files changed, 24 insertions, 46 deletions

diff --git a/games/teeworlds/Makefile b/games/teeworlds/Makefile
index 89a0bb09197c..6641bf496d15 100644
--- a/games/teeworlds/Makefile
+++ b/games/teeworlds/Makefile
@@ -2,11 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	teeworlds
-PORTVERSION=	0.6.5
+PORTVERSION=	0.7.3.1
 CATEGORIES=	games
-MASTER_SITES=	https://downloads.teeworlds.com/ \
-		http://mirror.amdmi3.ru/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Platform game featuring buggers equipped with weapons
@@ -14,25 +11,32 @@ COMMENT=	Platform game featuring buggers equipped with weapons
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-USES=		cmake cpe pkgconfig python
+USE_GITHUB=	yes
+GH_TUPLE=	teeworlds:teeworlds-translation:1cd4924:translations/datasrc/languages \
+		teeworlds:teeworlds-maps:7fefdb4:maps/datasrc/maps
+
+USES=		cmake cpe pkgconfig python ssl
 CPE_VERSION=	${PORTVERSION:C/^0\.//}
 CMAKE_ARGS=	-DPYTHON_EXECUTABLE="${PYTHON_CMD}"
 
 PLIST_FILES=	bin/${PORTNAME}_srv
 PORTDATA=	*
 
-OPTIONS_DEFINE=		CLIENT
-OPTIONS_DEFAULT=	CLIENT
+OPTIONS_DEFINE=		CLIENT TEST
+OPTIONS_DEFAULT=	CLIENT TEST
 
 CLIENT_DESC=		Build game client
 CLIENT_CMAKE_BOOL=	CLIENT
-CLIENT_USES=		gl
-CLIENT_USE=		GL=gl,glu XORG=x11 SDL=sdl
+CLIENT_USES=		gl sdl
+CLIENT_USE=		GL=gl,glu XORG=x11 SDL=sdl2
 CLIENT_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libwavpack.so:audio/wavpack \
 			libpnglite.so:graphics/pnglite
 CLIENT_PLIST_FILES=	bin/${PORTNAME}
 
+TEST_BUILD_DEPENDS=	googletest>=0:devel/googletest
+TEST_TEST_TARGET=	run_tests
+
 post-extract:
 	@${RM} -r ${WRKSRC}/src/engine/external/wavpack
 	@${RM} -r ${WRKSRC}/src/engine/external/pnglite
@@ -40,16 +44,16 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e '/find_package.*Git/ d' ${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's|engine/external/pnglite/pnglite.h|pnglite.h|' \
-		${WRKSRC}/src/engine/client/*.cpp \
-		${WRKSRC}/src/tools/*.cpp
 
 post-patch-CLIENT-off:
 	@${REINPLACE_CMD} -e '/find_package.*Pnglite/ d' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/find_package.*Wavpack/ d' ${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e '/find_package.*SDL/ d' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e '/find_package.*SDL2/ d' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/find_package.*Freetype/ d' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/find_package.*OpenGL/ d' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/find_package.*X11/ d' ${WRKSRC}/CMakeLists.txt
 
+post-patch-TEST-off:
+	@${REINPLACE_CMD} -e '/find_package.*GTest/ d' ${WRKSRC}/CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/games/teeworlds/distinfo b/games/teeworlds/distinfo
index f2c55481f2c6..a862eaf38562 100644
--- a/games/teeworlds/distinfo
+++ b/games/teeworlds/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1541171736
-SHA256 (teeworlds-0.6.5-src.tar.gz) = 0bd3b85c76437138438f8cd7848251d0085e19026e0f89656a2fb44398ec941e
-SIZE (teeworlds-0.6.5-src.tar.gz) = 10387131
+TIMESTAMP = 1555964484
+SHA256 (teeworlds-teeworlds-0.7.3.1_GH0.tar.gz) = 62da301f20dfc20e2e480223dc1fc4ea5f9bfbfa6bc304c4c7732071a319ffd4
+SIZE (teeworlds-teeworlds-0.7.3.1_GH0.tar.gz) = 8422909
+SHA256 (teeworlds-teeworlds-translation-1cd4924_GH0.tar.gz) = f43c95361325521af7dcb5be1605f2a1e2e38cfc9a34013a78536592d2868aa5
+SIZE (teeworlds-teeworlds-translation-1cd4924_GH0.tar.gz) = 152911
+SHA256 (teeworlds-teeworlds-maps-7fefdb4_GH0.tar.gz) = 84764b026963e22cc58658837af9a857e11617c92311dafbd75412507bf7073a
+SIZE (teeworlds-teeworlds-maps-7fefdb4_GH0.tar.gz) = 151472
diff --git a/games/teeworlds/files/patch-CMakeLists.txt b/games/teeworlds/files/patch-CMakeLists.txt
deleted file mode 100644
index 016b5511f490..000000000000
--- a/games/teeworlds/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
---- CMakeLists.txt.orig	2018-10-13 19:03:52 UTC
-+++ CMakeLists.txt
-@@ -254,7 +254,6 @@ if(NOT CMAKE_CROSSCOMPILING)
- endif()
- find_package(ZLIB)
- find_package(Freetype)
--find_package(Git)
- find_package(Pnglite)
- find_package(PythonInterp)
- find_package(SDL)
-@@ -333,7 +332,10 @@ elseif(TARGET_OS STREQUAL "mac")
-   set(PLATFORM_LIBS ${CARBON})
- else()
-   set(PLATFORM_CLIENT)
--  set(PLATFORM_CLIENT_LIBS GL GLU X11)
-+  find_package(OpenGL)
-+  find_package(X11)
-+  set(PLATFORM_CLIENT_LIBS ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${X11_X11_LIB})
-+  set(PLATFORM_CLIENT_INCLUDE_DIRS ${OPENGL_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH})
-   if(TARGET_OS STREQUAL "linux")
-     set(PLATFORM_LIBS rt) # clock_gettime for glibc < 2.17
-   else()
-@@ -700,6 +702,7 @@ if(CLIENT)
-     ${PNGLITE_INCLUDE_DIRS}
-     ${SDL_INCLUDE_DIRS}
-     ${WAVPACK_INCLUDE_DIRS}
-+    ${PLATFORM_CLIENT_INCLUDE_DIRS}
-   )
- 
-   set(PARAMS "${WAVPACK_INCLUDE_DIRS};${WAVPACK_INCLUDE_DIRS}")