games/nxengine: update to 2.6.5

5 files changed, 17 insertions, 102 deletions

diff --git a/games/nxengine/Makefile b/games/nxengine/Makefile
index 6fcde9a017b6..6406ca719e23 100644
--- a/games/nxengine/Makefile
+++ b/games/nxengine/Makefile
@@ -1,17 +1,9 @@
 PORTNAME=	nxengine
-PORTVERSION=	2.6.4
+PORTVERSION=	2.6.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES+=	https://www.cavestory.org/downloads/:data \
-		SF/lifanov-ports-distfiles/games/${PORTNAME}/:icons
-DISTFILES+=	${PORTNAME}.png:icons \
-		cavestoryen.zip:data
-EXTRACT_ONLY=	${DISTFILES:[2..3]:S/:data//}
-
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	d38fcaf80ac5c4b1a2da51b5d1a605ed408a192f.patch:-p1 \
-		f6bbeb2555e7c10dfdc04be57f20fedfc9f401af.patch:-p1
+MASTER_SITES+=	https://www.cavestory.org/downloads/:data
+DISTFILES+=	cavestoryen.zip:data
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Engine-rewrite of the classic platformer Cave Story
@@ -27,10 +19,8 @@ LICENSE_DISTFILES_FREEWARE=	${DISTFILES:[2]:S/:data//}
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		cmake compiler:c++11-lang sdl
-
-USE_SDL=	mixer2 sdl2
-SUB_FILES=	${PORTNAME}
+USES=		cmake compiler:c++11-lang jpeg sdl
+USE_SDL=	image2 mixer2 sdl2
 
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}-evo
@@ -38,14 +28,10 @@ GH_PROJECT=	${PORTNAME}-evo
 DESKTOP_ENTRIES="NXEngine" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;AdventureGame;" ""
 
-do-install:
+post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/nx ${STAGEDIR}${DATADIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/nxengine ${STAGEDIR}${PREFIX}/bin
 	(cd ${WRKSRC}/data; ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/data)
 	(cd ${WRKDIR}/CaveStory; ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps
-	(cd ${STAGEDIR}${DATADIR}; ${WRKSRC}/bin/extract)
+	(cd ${STAGEDIR}${DATADIR}; ${STAGEDIR}${PREFIX}/bin/nxextract)
 
 .include <bsd.port.mk>
diff --git a/games/nxengine/distinfo b/games/nxengine/distinfo
index 624891be375a..772781f4b137 100644
--- a/games/nxengine/distinfo
+++ b/games/nxengine/distinfo
@@ -1,11 +1,7 @@
-TIMESTAMP = 1588756473
+TIMESTAMP = 1625483649
 SHA256 (nxengine.png) = d6d8866939c10342bd3feebef311648586bed38f0390acbe16fd42f5240ff4e7
 SIZE (nxengine.png) = 536
 SHA256 (cavestoryen.zip) = aa87fa30bee9b4980640c7e104791354e0f1f6411ee0d45a70af70046aa0685f
 SIZE (cavestoryen.zip) = 1136575
-SHA256 (nxengine-nxengine-evo-v2.6.4_GH0.tar.gz) = 482bb96ae0a778e17856a041237a5c53b581c0ed0e3b7da8bff9e70d283939f6
-SIZE (nxengine-nxengine-evo-v2.6.4_GH0.tar.gz) = 3329255
-SHA256 (d38fcaf80ac5c4b1a2da51b5d1a605ed408a192f.patch) = 48567b5c53f1ae6006fb1ce17b7dbcaaeaee57d756585b43b699abd8b6f76ce1
-SIZE (d38fcaf80ac5c4b1a2da51b5d1a605ed408a192f.patch) = 730
-SHA256 (f6bbeb2555e7c10dfdc04be57f20fedfc9f401af.patch) = 658c03445dd5141b60fd6b37ff4642ff8f342381474b9260dae872f8d152f851
-SIZE (f6bbeb2555e7c10dfdc04be57f20fedfc9f401af.patch) = 4061
+SHA256 (nxengine-nxengine-evo-v2.6.5_GH0.tar.gz) = d28c4b780cc463c9f17dedaa0ce3f85cecc07b40fba45423785d23a3a1257658
+SIZE (nxengine-nxengine-evo-v2.6.5_GH0.tar.gz) = 3890723
diff --git a/games/nxengine/files/nxengine.in b/games/nxengine/files/nxengine.in
deleted file mode 100644
index 474fa490c78a..000000000000
--- a/games/nxengine/files/nxengine.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# Wrap nx: it finds game data files
-#  relative to itself
-
-if [ ! -d "$HOME"/.nxengine ]; then
-	mkdir -p "$HOME"/.nxengine
-	ln -s %%DATADIR%%/* "$HOME"/.nxengine/
-fi
-cd "$HOME"/.nxengine && exec ./nx "$@"
-
diff --git a/games/nxengine/files/patch-libc++7 b/games/nxengine/files/patch-libc++7
deleted file mode 100644
index 70366f3d42ba..000000000000
--- a/games/nxengine/files/patch-libc++7
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/common/json.hpp.orig	2019-04-08 14:37:06 UTC
-+++ src/common/json.hpp
-@@ -878,6 +878,16 @@ struct is_compatible_object_type_impl<true, RealType, 
-         and std::is_constructible<typename RealType::mapped_type, typename CompatibleObjectType::mapped_type>::value;
- };
- 
-+template<bool B, class RealType, class CompatibleStringType>
-+struct is_compatible_string_type_impl : std::false_type {};
-+
-+template<class RealType, class CompatibleStringType>
-+struct is_compatible_string_type_impl<true, RealType, CompatibleStringType>
-+{
-+    static constexpr auto value =
-+        std::is_same<typename RealType::value_type, typename CompatibleStringType::value_type>::value;
-+};
-+
- template <class BasicJsonType, class CompatibleObjectType> struct is_compatible_object_type
- {
-   static auto constexpr value = is_compatible_object_type_impl<
-@@ -886,6 +896,15 @@ template <class BasicJsonType, class CompatibleObjectT
-       typename BasicJsonType::object_t, CompatibleObjectType>::value;
- };
- 
-+template<class BasicJsonType, class CompatibleStringType>
-+struct is_compatible_string_type
-+{
-+    static auto constexpr value = is_compatible_string_type_impl <
-+                                  conjunction<negation<std::is_same<void, CompatibleStringType>>,
-+                                  has_value_type<CompatibleStringType>>::value,
-+                                  typename BasicJsonType::string_t, CompatibleStringType >::value;
-+};
-+
- template <typename BasicJsonType, typename T> struct is_basic_json_nested_type
- {
-   static auto constexpr value = std::is_same<T, typename BasicJsonType::iterator>::value
-@@ -1137,6 +1156,25 @@ template <typename BasicJsonType> void from_json(const
-   {
-     JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
-   }
-+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-+}
-+
-+template <
-+    typename BasicJsonType, typename CompatibleStringType,
-+    enable_if_t <
-+        is_compatible_string_type<BasicJsonType, CompatibleStringType>::value and
-+        not std::is_same<typename BasicJsonType::string_t,
-+                         CompatibleStringType>::value and
-+        std::is_constructible <
-+            BasicJsonType, typename CompatibleStringType::value_type >::value,
-+        int > = 0 >
-+void from_json(const BasicJsonType& j, CompatibleStringType& s)
-+{
-+    if (JSON_UNLIKELY(not j.is_string()))
-+    {
-+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
-+    }
-+
-   s = *j.template get_ptr<const typename BasicJsonType::string_t *>();
- }
- 
diff --git a/games/nxengine/pkg-plist b/games/nxengine/pkg-plist
index eb4be383b9e5..6add8fb1c0e5 100644
--- a/games/nxengine/pkg-plist
+++ b/games/nxengine/pkg-plist
@@ -1,4 +1,8 @@
-bin/nxengine
+bin/nxengine-evo
+bin/nxextract
+share/applications/org.nxengine.nxengine_evo.desktop
+share/icons/hicolor/256x256/apps/org.nxengine.nxengine_evo.png
+share/metainfo/org.nxengine.nxengine_evo.appdata.xml
 %%DATADIR%%/Config.dat
 %%DATADIR%%/DoConfig.exe
 %%DATADIR%%/Doukutsu.exe
@@ -471,6 +475,7 @@ bin/nxengine
 %%DATADIR%%/data/StageMeta/Shelt.json
 %%DATADIR%%/data/StageMeta/Start.json
 %%DATADIR%%/data/StageMeta/Statue.json
+%%DATADIR%%/data/StageMeta/WeedB.json
 %%DATADIR%%/data/StageMeta/WeedD.json
 %%DATADIR%%/data/StageMeta/WeedS.json
 %%DATADIR%%/data/StageMeta/e_Malc.json
@@ -661,10 +666,9 @@ bin/nxengine
 %%DATADIR%%/data/pxt/fx99.pxt
 %%DATADIR%%/data/pxt/fx9a.pxt
 %%DATADIR%%/data/pxt/fx9b.pxt
+%%DATADIR%%/data/spot.png
 %%DATADIR%%/data/sprites.sif
 %%DATADIR%%/data/stage.dat
 %%DATADIR%%/data/system.json
 %%DATADIR%%/data/tilekey.dat
 %%DATADIR%%/data/wavetable.dat
-%%DATADIR%%/nx
-share/pixmaps/nxengine.png