- Update to 0.40

- Add LuaJIT option, which is now default
- Cleanup plist

3 files changed, 27 insertions, 38 deletions

diff --git a/games/corsix-th/Makefile b/games/corsix-th/Makefile
index c2db3cf38c56..cdada8a99a14 100644
--- a/games/corsix-th/Makefile
+++ b/games/corsix-th/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	corsixth
-PORTVERSION=	0.30
-PORTREVISION=	3
+PORTVERSION=	0.40
 CATEGORIES=	games
 
 MAINTAINER=	madpilot@FreeBSD.org
@@ -13,7 +12,7 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 
-USES=		cmake compiler:c++11-lang dos2unix lua:51 pkgconfig
+USES=		cmake compiler:c++11-lang dos2unix pkgconfig
 USE_SDL=	mixer
 DOS2UNIX_FILES=	CMake/FindFFmpeg.cmake \
 		CorsixTH/CMakeLists.txt \
@@ -22,21 +21,21 @@ DOS2UNIX_FILES=	CMake/FindFFmpeg.cmake \
 USE_GITHUB=	yes
 GH_ACCOUNT=     CorsixTH
 GH_PROJECT=     CorsixTH
-GH_COMMIT=	69a3ed8
+GH_TAGNAME=	v0.40
+GH_COMMIT=	a4aa387
 
-OPTIONS_DEFINE=	MOVIES
-OPTIONS_DEFAULT=	MOVIES
+OPTIONS_DEFINE=	LUAJIT MOVIES
+OPTIONS_DEFAULT=	LUAJIT MOVIES
+LUAJIT_DESC=	Use LUAJIT compiler
 MOVIES_DESC=	Play in-game movies
 
 MOVIES_CMAKE_ON=	-DWITH_MOVIES=ON
 MOVIES_CMAKE_OFF=	-DWITH_MOVIES=OFF
 MOVIES_LIB_DEPENDS=	libswresample.so:${PORTSDIR}/multimedia/ffmpeg
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMOVIES} && ${OSVERSION} < 900014
-FAVORITE_COMPILER=	gcc
-.endif
+LUAJIT_CMAKE_ON=	-DWITH_LUAJIT=ON
+LUAJIT_CMAKE_OFF=	-DWITH_LUAJIT=OFF
+LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LUAJIT_USES_OFF=	lua:51
 
 post-patch:
 # Allow the game to find its resources without wrapper scripts
diff --git a/games/corsix-th/distinfo b/games/corsix-th/distinfo
index 986371ba61c4..1c25d4da70ba 100644
--- a/games/corsix-th/distinfo
+++ b/games/corsix-th/distinfo
@@ -1,2 +1,2 @@
-SHA256 (corsixth-0.30.tar.gz) = e84bc61ddb48ae609908ff8241cbb10c3c91d58b2ac4e59089636554280c4766
-SIZE (corsixth-0.30.tar.gz) = 4346264
+SHA256 (corsixth-0.40.tar.gz) = d62cf9d5c4f74f859f43b09ac8e3a57ba3d34774ab402b259ca8cf495564095d
+SIZE (corsixth-0.40.tar.gz) = 4425993
diff --git a/games/corsix-th/pkg-plist b/games/corsix-th/pkg-plist
index 099b84eddd59..20b6217f4557 100644
--- a/games/corsix-th/pkg-plist
+++ b/games/corsix-th/pkg-plist
@@ -54,20 +54,23 @@ bin/CorsixTH
 %%DATADIR%%/Bitmap/tree_leaf.bmp
 %%DATADIR%%/Bitmap/tree_level.bmp
 %%DATADIR%%/Bitmap/undo32.png
+%%DATADIR%%/CorsixTH.lua
 %%DATADIR%%/Levels/Example.map
 %%DATADIR%%/Levels/avatar.level
 %%DATADIR%%/Levels/avatar.map
-%%DATADIR%%/Levels/confined_v5.map
 %%DATADIR%%/Levels/confined_v5.level
+%%DATADIR%%/Levels/confined_v5.map
 %%DATADIR%%/Levels/demo.level
 %%DATADIR%%/Levels/example.level
-%%DATADIR%%/Levels/finisham.map
 %%DATADIR%%/Levels/finisham.level
+%%DATADIR%%/Levels/finisham.map
 %%DATADIR%%/Levels/original05.level
 %%DATADIR%%/Levels/original07.level
 %%DATADIR%%/Levels/original08.level
 %%DATADIR%%/Levels/original11.level
 %%DATADIR%%/Levels/original12.level
+%%DATADIR%%/Levels/st.peter's.level
+%%DATADIR%%/Levels/st.peter's.map
 %%DATADIR%%/Lua/api_version.lua
 %%DATADIR%%/Lua/app.lua
 %%DATADIR%%/Lua/audio.lua
@@ -80,6 +83,7 @@ bin/CorsixTH
 %%DATADIR%%/Lua/commands/set_map_cell.lua
 %%DATADIR%%/Lua/commands/set_map_cell_flags.lua
 %%DATADIR%%/Lua/config_finder.lua
+%%DATADIR%%/Lua/debug_script.lua
 %%DATADIR%%/Lua/diagnosis/diag_blood_machine.lua
 %%DATADIR%%/Lua/diagnosis/diag_cardiogram.lua
 %%DATADIR%%/Lua/diagnosis/diag_general_diag.lua
@@ -175,13 +179,17 @@ bin/CorsixTH
 %%DATADIR%%/Lua/diseases/tv_personalities.lua
 %%DATADIR%%/Lua/diseases/uncommon_cold.lua
 %%DATADIR%%/Lua/diseases/unexpected_swelling.lua
+%%DATADIR%%/Lua/entities/grim_reaper.lua
 %%DATADIR%%/Lua/entities/humanoid.lua
+%%DATADIR%%/Lua/entities/inspector.lua
 %%DATADIR%%/Lua/entities/machine.lua
 %%DATADIR%%/Lua/entities/object.lua
 %%DATADIR%%/Lua/entities/patient.lua
 %%DATADIR%%/Lua/entities/staff.lua
 %%DATADIR%%/Lua/entities/vip.lua
 %%DATADIR%%/Lua/entity.lua
+%%DATADIR%%/Lua/entity_map.lua
+%%DATADIR%%/Lua/epidemic.lua
 %%DATADIR%%/Lua/filesystem.lua
 %%DATADIR%%/Lua/game_ui.lua
 %%DATADIR%%/Lua/graphics.lua
@@ -193,6 +201,7 @@ bin/CorsixTH
 %%DATADIR%%/Lua/humanoid_actions/falling.lua
 %%DATADIR%%/Lua/humanoid_actions/get_up.lua
 %%DATADIR%%/Lua/humanoid_actions/idle.lua
+%%DATADIR%%/Lua/humanoid_actions/idle_spawn.lua
 %%DATADIR%%/Lua/humanoid_actions/knock_door.lua
 %%DATADIR%%/Lua/humanoid_actions/meander.lua
 %%DATADIR%%/Lua/humanoid_actions/multi_use_object.lua
@@ -212,11 +221,12 @@ bin/CorsixTH
 %%DATADIR%%/Lua/humanoid_actions/use_object.lua
 %%DATADIR%%/Lua/humanoid_actions/use_screen.lua
 %%DATADIR%%/Lua/humanoid_actions/use_staffroom.lua
+%%DATADIR%%/Lua/humanoid_actions/vaccinate.lua
 %%DATADIR%%/Lua/humanoid_actions/vip_go_to_next_room.lua
 %%DATADIR%%/Lua/humanoid_actions/vomit.lua
 %%DATADIR%%/Lua/humanoid_actions/walk.lua
 %%DATADIR%%/Lua/humanoid_actions/yawn.lua
-%%DATADIR%%/Lua/key_mapping.lua
+%%DATADIR%%/Lua/key_mapping.txt
 %%DATADIR%%/Lua/languages/brazilian_portuguese.lua
 %%DATADIR%%/Lua/languages/czech.lua
 %%DATADIR%%/Lua/languages/danish.lua
@@ -261,6 +271,7 @@ bin/CorsixTH
 %%DATADIR%%/Lua/objects/doors/swing_door_right.lua
 %%DATADIR%%/Lua/objects/drinks_machine.lua
 %%DATADIR%%/Lua/objects/fire_extinguisher.lua
+%%DATADIR%%/Lua/objects/gates_to_hell.lua
 %%DATADIR%%/Lua/objects/helicopter.lua
 %%DATADIR%%/Lua/objects/lecture_chair.lua
 %%DATADIR%%/Lua/objects/litter.lua
@@ -339,24 +350,3 @@ bin/CorsixTH
 %%DATADIR%%/Lua/walls/yellow.lua
 %%DATADIR%%/Lua/window.lua
 %%DATADIR%%/Lua/world.lua
-%%DATADIR%%/CorsixTH.lua
-@dirrm %%DATADIR%%/Lua/walls
-@dirrm %%DATADIR%%/Lua/rooms
-@dirrm %%DATADIR%%/Lua/objects/machines
-@dirrm %%DATADIR%%/Lua/objects/doors
-@dirrm %%DATADIR%%/Lua/objects
-@dirrm %%DATADIR%%/Lua/languages
-@dirrm %%DATADIR%%/Lua/humanoid_actions
-@dirrm %%DATADIR%%/Lua/entities
-@dirrm %%DATADIR%%/Lua/diseases
-@dirrm %%DATADIR%%/Lua/dialogs/resizables/menu_list_dialogs
-@dirrm %%DATADIR%%/Lua/dialogs/resizables/file_browsers
-@dirrm %%DATADIR%%/Lua/dialogs/resizables
-@dirrm %%DATADIR%%/Lua/dialogs/fullscreen
-@dirrm %%DATADIR%%/Lua/dialogs
-@dirrm %%DATADIR%%/Lua/diagnosis
-@dirrm %%DATADIR%%/Lua/commands
-@dirrm %%DATADIR%%/Lua
-@dirrm %%DATADIR%%/Levels
-@dirrm %%DATADIR%%/Bitmap
-@dirrm %%DATADIR%%