games/endless-sky: update 0.9.16.1 → 0.10.2

4 files changed, 65 insertions, 48 deletions

diff --git a/games/endless-sky/Makefile b/games/endless-sky/Makefile
index b6178519a22a..080820934a52 100644
--- a/games/endless-sky/Makefile
+++ b/games/endless-sky/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	endless-sky
-PORTVERSION=	0.9.16.1
-PORTREVISION=	1
+PORTVERSION=	0.10.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
@@ -8,8 +7,9 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Space exploration and combat game similar to Escape Velocity
 WWW=		https://endless-sky.github.io/
 
-LICENSE=	GPLv3+ CC-BY-4.0 CC-BY-SA-3.0 CC-BY-SA-4.0 PD
+LICENSE=	GPLv3+ GPLv2 CC-BY-2.0 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0 CC-BY-SA-4.0 PD CC0-1.0
 LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/copyright
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/license.txt
 
 LIB_DEPENDS=	libpng.so:graphics/png \
@@ -18,19 +18,21 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 
 USE_GITHUB=	yes
 
-USES=		compiler:c++11-lang gl gnome jpeg localbase:ldflags openal scons sdl xorg
+USES=		cmake compiler:c++11-lang gl jpeg openal sdl
 USE_SDL=	sdl2
 USE_GL=		gl glew
+CMAKE_OFF=	ES_USE_VCPKG
+CMAKE_ARGS=	-DCMAKE_INSTALL_DOCDIR="${DOCSDIR}"
 
 LDFLAGS_i386=	-Wl,-znotext
 
 PORTDATA=	*
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
 
 post-build:
 	@${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/|; s|share/games|share|' \
 		${WRKSRC}/source/Files.cpp
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
 .include <bsd.port.mk>
diff --git a/games/endless-sky/distinfo b/games/endless-sky/distinfo
index 1451ff54d641..7c42cc841f6f 100644
--- a/games/endless-sky/distinfo
+++ b/games/endless-sky/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666198557
-SHA256 (endless-sky-endless-sky-v0.9.16.1_GH0.tar.gz) = a190da3827661f5ec979342cdcf0adc7183c703cecf91cb245a568ce6421b49b
-SIZE (endless-sky-endless-sky-v0.9.16.1_GH0.tar.gz) = 184582283
+TIMESTAMP = 1687196186
+SHA256 (endless-sky-endless-sky-v0.10.2_GH0.tar.gz) = ba9caf9f52ac915e77a3df62d7eb864f32dcdf1d63baf4f51fc9388bbab0bab7
+SIZE (endless-sky-endless-sky-v0.10.2_GH0.tar.gz) = 254913337
diff --git a/games/endless-sky/files/patch-CMakeLists.txt b/games/endless-sky/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..b7e21f4fe908
--- /dev/null
+++ b/games/endless-sky/files/patch-CMakeLists.txt
@@ -0,0 +1,53 @@
+--- CMakeLists.txt.orig	2023-06-18 21:53:14 UTC
++++ CMakeLists.txt
+@@ -257,19 +257,21 @@ elseif(WIN32)
+ 	install(FILES changelog DESTINATION .)
+ 	install(FILES license.txt DESTINATION .)
+ elseif(UNIX)
++	include(GNUInstallDirs)
++
+ 	# Install the binary.
+-	install(TARGETS EndlessSky CONFIGURATIONS Release RUNTIME DESTINATION games)
++	install(TARGETS EndlessSky CONFIGURATIONS Release RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ 	# Install the desktop file.
+-	install(FILES endless-sky.desktop DESTINATION share/applications)
++	install(FILES endless-sky.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+ 
+ 	# Install app center metadata.
+-	install(FILES io.github.endless_sky.endless_sky.appdata.xml DESTINATION share/metainfo)
++	install(FILES io.github.endless_sky.endless_sky.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
+ 
+ 	# Install icons, keeping track of all the paths.
+ 	# Most Ubuntu apps supply 16, 22, 24, 32, 48, and 256, and sometimes others.
+ 	foreach(size "16x16" "22x22" "24x24" "32x32" "48x48" "128x128" "256x256" "512x512")
+-		install(FILES "icons/icon_${size}.png" DESTINATION "share/icons/hicolor/${size}/apps"
++		install(FILES "icons/icon_${size}.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${size}/apps"
+ 			RENAME endless-sky.png)
+ 	endforeach()
+ 
+@@ -281,15 +283,15 @@ elseif(UNIX)
+ 		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ 		VERBATIM)
+ 	target_sources(EndlessSky PRIVATE endless-sky.6.gz)
+-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/endless-sky.6.gz DESTINATION share/man/man6)
++	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/endless-sky.6.gz DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
+ 
+ 	# Install the resource files.
+-	install(DIRECTORY data DESTINATION share/games/endless-sky)
+-	install(DIRECTORY images DESTINATION share/games/endless-sky)
+-	install(DIRECTORY sounds DESTINATION share/games/endless-sky)
+-	install(FILES credits.txt DESTINATION share/games/endless-sky)
+-	install(FILES keys.txt DESTINATION share/games/endless-sky)
+-	install(FILES copyright DESTINATION share/doc/endless-sky)
+-	install(FILES changelog DESTINATION share/doc/endless-sky)
+-	install(FILES license.txt DESTINATION share/doc/endless-sky)
++	install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATADIR}/endless-sky)
++	install(DIRECTORY images DESTINATION ${CMAKE_INSTALL_DATADIR}/endless-sky)
++	install(DIRECTORY sounds DESTINATION ${CMAKE_INSTALL_DATADIR}/endless-sky)
++	install(FILES credits.txt DESTINATION ${CMAKE_INSTALL_DATADIR}/endless-sky)
++	install(FILES keys.txt DESTINATION ${CMAKE_INSTALL_DATADIR}/endless-sky)
++	#install(FILES copyright DESTINATION ${CMAKE_INSTALL_DOCDIR}/endless-sky)
++	install(FILES changelog DESTINATION ${CMAKE_INSTALL_DOCDIR}/endless-sky)
++	#install(FILES license.txt DESTINATION ${CMAKE_INSTALL_DOCDIR}/endless-sky)
+ endif()
diff --git a/games/endless-sky/files/patch-SConstruct b/games/endless-sky/files/patch-SConstruct
deleted file mode 100644
index b28233f78553..000000000000
--- a/games/endless-sky/files/patch-SConstruct
+++ /dev/null
@@ -1,38 +0,0 @@
---- SConstruct.orig	2022-10-03 23:09:48 UTC
-+++ SConstruct
-@@ -51,9 +51,6 @@ Help(opts.GenerateHelpText(env))
- #   $ CXXFLAGS=-march=native scons
- # or modify the `flags` variable:
- flags = ["-std=c++11", "-Wall", "-Wold-style-cast", "-fno-rtti"]
--if env["mode"] != "debug":
--	flags += ["-Werror", "-O3", "-flto"]
--	env.Append(LINKFLAGS = ["-O3", "-flto"])
- if env["mode"] == "debug":
- 	flags += ["-g"]
- elif env["mode"] == "profile":
-@@ -191,7 +188,7 @@ env.AlwaysBuild("test")
- 
- 
- # Install the binary:
--env.Install("$DESTDIR$PREFIX/games", sky)
-+env.Install("$DESTDIR$PREFIX/bin", sky)
- 
- # Install the desktop file:
- env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop")
-@@ -232,11 +229,11 @@ def RecursiveInstall(env, target, source):
- 			RecursiveInstall(env, pathjoin(target, name), node.abspath)
- 		else:
- 			env.Install(target, node)
--RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/data", "data")
--RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/images", "images")
--RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/sounds", "sounds")
--env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "credits.txt")
--env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "keys.txt")
-+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/data", "data")
-+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/images", "images")
-+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/sounds", "sounds")
-+env.Install("$DESTDIR$PREFIX/share/endless-sky", "credits.txt")
-+env.Install("$DESTDIR$PREFIX/share/endless-sky", "keys.txt")
- 
- # Make the word "install" in the command line do an installation.
- env.Alias("install", "$DESTDIR$PREFIX")