- Update to 0.6.5

4 files changed, 63 insertions, 83 deletions

diff --git a/games/teeworlds/Makefile b/games/teeworlds/Makefile
index 0efc51d2aa1b..89a0bb09197c 100644
--- a/games/teeworlds/Makefile
+++ b/games/teeworlds/Makefile
@@ -2,79 +2,54 @@
 # $FreeBSD$
 
 PORTNAME=	teeworlds
-PORTVERSION=	0.6.4
-PORTREVISION=	7
+PORTVERSION=	0.6.5
 CATEGORIES=	games
 MASTER_SITES=	https://downloads.teeworlds.com/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} bam-${BAM_VERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Platform game featuring buggers equipped with weapons
 
 LICENSE=	ZLIB
+LICENSE_FILE=	${WRKSRC}/license.txt
 
-LIB_DEPENDS=	libfreetype.so:print/freetype2
-
+USES=		cmake cpe pkgconfig python
 CPE_VERSION=	${PORTVERSION:C/^0\.//}
-
-USES=		cpe python:build
-BAM_VERSION=	0.4.0
-BAM_WRKSRC=	${WRKDIR}/bam-${BAM_VERSION}
-BAM_TARGET=	release
-USE_GCC=	any
+CMAKE_ARGS=	-DPYTHON_EXECUTABLE="${PYTHON_CMD}"
 
 PLIST_FILES=	bin/${PORTNAME}_srv
 PORTDATA=	*
 
-OPTIONS_DEFINE=	SERVER_ONLY
-SERVER_ONLY_DESC=Build dedicated server only
+OPTIONS_DEFINE=		CLIENT
+OPTIONS_DEFAULT=	CLIENT
 
-.include <bsd.port.options.mk>
+CLIENT_DESC=		Build game client
+CLIENT_CMAKE_BOOL=	CLIENT
+CLIENT_USES=		gl
+CLIENT_USE=		GL=gl,glu XORG=x11 SDL=sdl
+CLIENT_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+			libwavpack.so:audio/wavpack \
+			libpnglite.so:graphics/pnglite
+CLIENT_PLIST_FILES=	bin/${PORTNAME}
 
-.if ${PORT_OPTIONS:MSERVER_ONLY}
-BAM_TARGET=	server_release
-PKGNAMESUFFX=	-server
-.else
-USE_XORG=	x11
-USE_GL=		gl glu
-USE_SDL=	sdl
-PLIST_FILES+=	bin/${PORTNAME}
-DESKTOP_ENTRIES="Teeworlds" \
-		"Platform game featuring buggers equipped with weapons" \
-		"${DATADIR}/Teeworlds.ico" \
-		"${PORTNAME}" \
-		"Game;ActionGame;" \
-		""
-.endif
+post-extract:
+	@${RM} -r ${WRKSRC}/src/engine/external/wavpack
+	@${RM} -r ${WRKSRC}/src/engine/external/pnglite
+	@${RM} -r ${WRKSRC}/src/engine/external/zlib
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|"python "|"${PYTHON_CMD} "|' \
-		${WRKSRC}/bam.lua
-	@${REINPLACE_CMD} -e 's|-O.||; s|^gcc|${CC} ${CFLAGS}|; s|-ldl||g' \
-		${BAM_WRKSRC}/make_unix.sh
-	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/other/sdl/sdl.lua
-	@${REINPLACE_CMD} -e '/aDirs\[\]/,/}/ s|"/.*"|"${DATADIR}"|' \
-		${WRKSRC}/src/engine/shared/storage.cpp
-	@${REINPLACE_CMD} -e 's|gcc|${CC}|; s|g++|${CXX}|' \
-		${BAM_WRKSRC}/src/driver_gcc.lua ${WRKSRC}/configure.lua
-
-# build bam executable - teeworlds own build system
-pre-build:
-	cd ${BAM_WRKSRC} && ${SH} -v make_unix.sh
-
-# build teeworlds
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${BAM_WRKSRC}/bam -n -a -v ${_MAKE_JOBS:C/-j/-j /} ${BAM_TARGET}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}_srv ${STAGEDIR}${PREFIX}/bin/
-	@cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/other/icons/Teeworlds.ico ${STAGEDIR}${DATADIR}/
-
-do-install-SERVER_ONLY-off:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	@${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.*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
 
 .include <bsd.port.mk>
diff --git a/games/teeworlds/distinfo b/games/teeworlds/distinfo
index b1368e4211c2..f2c55481f2c6 100644
--- a/games/teeworlds/distinfo
+++ b/games/teeworlds/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1479896827
-SHA256 (teeworlds-0.6.4-src.tar.gz) = c261d19ebb00b5451faa2ceb4a7ca945cad2add48b06046eb43b40ccc9fd98e2
-SIZE (teeworlds-0.6.4-src.tar.gz) = 8771622
-SHA256 (bam-0.4.0.tar.gz) = 5e4e4920b4d265da582f66774e9b1ec8ddfbe75ddc028fba86c12f686ea18db3
-SIZE (bam-0.4.0.tar.gz) = 206780
+TIMESTAMP = 1541171736
+SHA256 (teeworlds-0.6.5-src.tar.gz) = 0bd3b85c76437138438f8cd7848251d0085e19026e0f89656a2fb44398ec941e
+SIZE (teeworlds-0.6.5-src.tar.gz) = 10387131
diff --git a/games/teeworlds/files/patch-CMakeLists.txt b/games/teeworlds/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..016b5511f490
--- /dev/null
+++ b/games/teeworlds/files/patch-CMakeLists.txt
@@ -0,0 +1,30 @@
+--- 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}")
diff --git a/games/teeworlds/files/patch-bam.lua b/games/teeworlds/files/patch-bam.lua
deleted file mode 100644
index bf8b4634e508..000000000000
--- a/games/teeworlds/files/patch-bam.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---- bam.lua.orig	2011-04-09 23:15:25.000000000 +0400
-+++ bam.lua	2011-08-04 01:03:26.000000000 +0400
-@@ -154,7 +154,7 @@
- 			settings.link.frameworks:Add("Carbon")
- 			settings.link.frameworks:Add("AppKit")
- 		else
--			settings.link.libs:Add("pthread")
-+			settings.link.flags:Add("-pthread")
- 		end
- 	elseif family == "windows" then
- 		settings.link.libs:Add("gdi32")
-@@ -281,8 +281,10 @@
- release_settings.config_name = "release"
- release_settings.config_ext = ""
- release_settings.debug = 0
--release_settings.optimize = 1
-+release_settings.optimize = 0
- release_settings.cc.defines:Add("CONF_RELEASE")
-+release_settings.cc.flags_c:Add(os.getenv("CFLAGS"))
-+release_settings.cc.flags_cxx:Add(os.getenv("CXXFLAGS"))
- 
- if platform == "macosx"  and arch == "ia32" then
- 	debug_settings_ppc = debug_settings:Copy()