games/cdogs-sdl: update to 0.9.0

5 files changed, 70 insertions, 31 deletions

diff --git a/games/cdogs-sdl/Makefile b/games/cdogs-sdl/Makefile
index 71657c2a1fa6..81efb0474b73 100644
--- a/games/cdogs-sdl/Makefile
+++ b/games/cdogs-sdl/Makefile
@@ -1,21 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	cdogs-sdl
-PORTVERSION=	0.8.0
+PORTVERSION=	0.9.0
 CATEGORIES=	games
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Classic overhead run-and-gun game
 
-USES=		cmake compiler:c++11-lang gnome pkgconfig sdl
-USE_SDL=	sdl2 image2 mixer2
-USE_GNOME=	gtk30
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>=3,1:devel/py-protobuf@${PY_FLAVOR} \
+		protoc:devel/protobuf
+
+USES=		cmake compiler:c++11-lang gnome localbase:ldflags pkgconfig \
+		python:3.6+ sdl
+
+USE_SDL=	image2 mixer2 sdl2
+USE_GNOME=	cairo gdkpixbuf2 gtk30
+USE_GL=		gl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cxong
 CMAKE_ARGS=	-DCDOGS_DATA_DIR=${DATADIR}/
 
+BINARY_ALIAS=	python=${PYTHON_VERSION}
+
 # Fix with clang11
 CFLAGS+=	-fcommon
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cdogs-sdl
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cdogs-sdl-editor
+
 .include <bsd.port.mk>
diff --git a/games/cdogs-sdl/distinfo b/games/cdogs-sdl/distinfo
index e1672434ed85..efdbafaf870e 100644
--- a/games/cdogs-sdl/distinfo
+++ b/games/cdogs-sdl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592311567
-SHA256 (cxong-cdogs-sdl-0.8.0_GH0.tar.gz) = ae5f493cfbbb5809824af79b164bd9a2ab7f7cfeb32468ff48f36b4a14982aba
-SIZE (cxong-cdogs-sdl-0.8.0_GH0.tar.gz) = 22479452
+TIMESTAMP = 1600720183
+SHA256 (cxong-cdogs-sdl-0.9.0_GH0.tar.gz) = db1fc06f3a7ee49a5ed1505faeb7d3c8fd11d385dcb6c1042870e524839737bc
+SIZE (cxong-cdogs-sdl-0.9.0_GH0.tar.gz) = 23541673
diff --git a/games/cdogs-sdl/files/patch-CMakeLists.txt b/games/cdogs-sdl/files/patch-CMakeLists.txt
index cb4a3e68a25e..e596f09295ea 100644
--- a/games/cdogs-sdl/files/patch-CMakeLists.txt
+++ b/games/cdogs-sdl/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2020-06-16 15:27:08 UTC
+--- CMakeLists.txt.orig	2020-09-21 20:35:03 UTC
 +++ CMakeLists.txt
-@@ -134,7 +134,7 @@ else()
+@@ -119,7 +119,7 @@ else()
  		endif()
  	endif()
  	if(NOT BEOS AND NOT HAIKU)
diff --git a/games/cdogs-sdl/files/patch-src_cdogs_enet_unix.c b/games/cdogs-sdl/files/patch-src_cdogs_enet_unix.c
deleted file mode 100644
index 948dc84ce174..000000000000
--- a/games/cdogs-sdl/files/patch-src_cdogs_enet_unix.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cdogs/enet/unix.c.orig	2020-06-16 13:26:23 UTC
-+++ src/cdogs/enet/unix.c
-@@ -300,7 +300,7 @@ enet_socket_listen (ENetSocket socket, int backlog)
- ENetSocket
- enet_socket_create (ENetSocketType type)
- {
--    return socket (PF_INET, type == ENET_SOCKET_TYPE_DATAGRAM ? SOCK_DGRAM : SOCK_STREAM, 0);
-+    return socket (AF_INET, type == ENET_SOCKET_TYPE_DATAGRAM ? SOCK_DGRAM : SOCK_STREAM, 0);
- }
- 
- int
diff --git a/games/cdogs-sdl/pkg-plist b/games/cdogs-sdl/pkg-plist
index fb59440decaa..1fd851f733f8 100644
--- a/games/cdogs-sdl/pkg-plist
+++ b/games/cdogs-sdl/pkg-plist
@@ -1,7 +1,5 @@
 bin/cdogs-sdl
 bin/cdogs-sdl-editor
-share/appdata/io.github.cxong.cdogs-sdl.appdata.xml
-share/applications/io.github.cxong.cdogs-sdl.desktop
 %%DATADIR%%/README.md
 %%DATADIR%%/data/README.md
 %%DATADIR%%/data/ammo.json
@@ -186,7 +184,6 @@ share/applications/io.github.cxong.cdogs-sdl.desktop
 %%DATADIR%%/graphics/chair_wreck.png
 %%DATADIR%%/graphics/chars/README.md
 %%DATADIR%%/graphics/chars/bodies/README.md
-%%DATADIR%%/graphics/chars/bodies/base/body_arms_legs_16x16.png
 %%DATADIR%%/graphics/chars/bodies/base/data.json
 %%DATADIR%%/graphics/chars/bodies/base/legs_idle_24x24.png
 %%DATADIR%%/graphics/chars/bodies/base/legs_run_24x24.png
@@ -203,15 +200,19 @@ share/applications/io.github.cxong.cdogs-sdl.desktop
 %%DATADIR%%/graphics/chars/guns/knife_16x20.png
 %%DATADIR%%/graphics/chars/hairs/beard_10x10.png
 %%DATADIR%%/graphics/chars/hairs/beret_10x10.png
+%%DATADIR%%/graphics/chars/hairs/combat_helmet_12x12.png
 %%DATADIR%%/graphics/chars/hairs/cyber_shades_10x10.png
 %%DATADIR%%/graphics/chars/hairs/cyborg_10x10.png
+%%DATADIR%%/graphics/chars/hairs/donut_10x10.png
 %%DATADIR%%/graphics/chars/hairs/dutch_10x10.png
 %%DATADIR%%/graphics/chars/hairs/eye_patch_10x10.png
 %%DATADIR%%/graphics/chars/hairs/flattop_10x10.png
 %%DATADIR%%/graphics/chars/hairs/goggles_10x10.png
-%%DATADIR%%/graphics/chars/hairs/helmet_10x10.png
+%%DATADIR%%/graphics/chars/hairs/hazmat_10x12.png
+%%DATADIR%%/graphics/chars/hairs/helmet_10x12.png
 %%DATADIR%%/graphics/chars/hairs/hogan_10x10.png
 %%DATADIR%%/graphics/chars/hairs/horns_10x12.png
+%%DATADIR%%/graphics/chars/hairs/license.txt
 %%DATADIR%%/graphics/chars/hairs/mohawk_10x14.png
 %%DATADIR%%/graphics/chars/hairs/ponytail_14x12.png
 %%DATADIR%%/graphics/chars/hairs/professor_10x10.png
@@ -1178,6 +1179,7 @@ share/applications/io.github.cxong.cdogs-sdl.desktop
 %%DATADIR%%/graphics/rocket_blue_12x12.png
 %%DATADIR%%/graphics/rocket_wreck.png
 %%DATADIR%%/graphics/rockets.png
+%%DATADIR%%/graphics/rockets.txt
 %%DATADIR%%/graphics/rod.png
 %%DATADIR%%/graphics/rod.png.txt
 %%DATADIR%%/graphics/rod_wreck.png
@@ -1681,7 +1683,6 @@ share/applications/io.github.cxong.cdogs-sdl.desktop
 %%DATADIR%%/missions/Sand.cdogscpn/missions.json
 %%DATADIR%%/missions/Sand.cdogscpn/particles.json
 %%DATADIR%%/missions/Sand.cdogscpn/pickups.json
-%%DATADIR%%/missions/Sand.cdogscpn/players.json
 %%DATADIR%%/missions/Sand.cdogscpn/sounds/inkvine.ogg
 %%DATADIR%%/missions/Sand.cdogscpn/sounds/inkvine.txt
 %%DATADIR%%/missions/Sand.cdogscpn/sounds/inkvine_r.ogg
@@ -1724,7 +1725,6 @@ share/applications/io.github.cxong.cdogs-sdl.desktop
 %%DATADIR%%/missions/bem.cdogscpn/campaign.json
 %%DATADIR%%/missions/bem.cdogscpn/characters.json
 %%DATADIR%%/missions/bem.cdogscpn/missions.json
-%%DATADIR%%/missions/bem.cdogscpn/players.json
 %%DATADIR%%/missions/custom/Wuzzy/gungame.cdogscpn/bullets.json
 %%DATADIR%%/missions/custom/Wuzzy/gungame.cdogscpn/campaign.json
 %%DATADIR%%/missions/custom/Wuzzy/gungame.cdogscpn/characters.json
@@ -1867,16 +1867,23 @@ share/applications/io.github.cxong.cdogs-sdl.desktop
 %%DATADIR%%/missions/distress.cdogscpn/campaign.json
 %%DATADIR%%/missions/distress.cdogscpn/characters.json
 %%DATADIR%%/missions/distress.cdogscpn/missions.json
-%%DATADIR%%/missions/distress.cdogscpn/players.json
 %%DATADIR%%/missions/doom.cdogscpn/bullets.json
 %%DATADIR%%/missions/doom.cdogscpn/campaign.json
 %%DATADIR%%/missions/doom.cdogscpn/characters.json
+%%DATADIR%%/missions/doom.cdogscpn/graphics/armor.png
+%%DATADIR%%/missions/doom.cdogscpn/graphics/armor.txt
+%%DATADIR%%/missions/doom.cdogscpn/graphics/armor_bonus.png
+%%DATADIR%%/missions/doom.cdogscpn/graphics/armor_bonus.txt
 %%DATADIR%%/missions/doom.cdogscpn/graphics/barrel_nukage.txt
 %%DATADIR%%/missions/doom.cdogscpn/graphics/barrel_nukage_16x22.png
 %%DATADIR%%/missions/doom.cdogscpn/graphics/barrel_nukage_wreck.png
 %%DATADIR%%/missions/doom.cdogscpn/graphics/barrel_nukage_wreck.txt
+%%DATADIR%%/missions/doom.cdogscpn/graphics/bullet_pickup2.png
+%%DATADIR%%/missions/doom.cdogscpn/graphics/bullet_pickup2.txt
 %%DATADIR%%/missions/doom.cdogscpn/graphics/candelabra.txt
 %%DATADIR%%/missions/doom.cdogscpn/graphics/candelabra_16x24.png
+%%DATADIR%%/missions/doom.cdogscpn/graphics/candle.txt
+%%DATADIR%%/missions/doom.cdogscpn/graphics/candle_9x14.png
 %%DATADIR%%/missions/doom.cdogscpn/graphics/fireball.txt
 %%DATADIR%%/missions/doom.cdogscpn/graphics/fireball_16x16.png
 %%DATADIR%%/missions/doom.cdogscpn/graphics/fireball_green.txt
@@ -1887,13 +1894,25 @@ share/applications/io.github.cxong.cdogs-sdl.desktop
 %%DATADIR%%/missions/doom.cdogscpn/graphics/fireball_hit_32x32.png
 %%DATADIR%%/missions/doom.cdogscpn/graphics/firestick.txt
 %%DATADIR%%/missions/doom.cdogscpn/graphics/firestick_11x30.png
+%%DATADIR%%/missions/doom.cdogscpn/graphics/health_bonus.png
+%%DATADIR%%/missions/doom.cdogscpn/graphics/health_bonus.txt
+%%DATADIR%%/missions/doom.cdogscpn/graphics/megaarmor.png
+%%DATADIR%%/missions/doom.cdogscpn/graphics/megaarmor.txt
 %%DATADIR%%/missions/doom.cdogscpn/graphics/pillar.png
+%%DATADIR%%/missions/doom.cdogscpn/graphics/rockets2.png
+%%DATADIR%%/missions/doom.cdogscpn/graphics/rockets2.txt
+%%DATADIR%%/missions/doom.cdogscpn/graphics/shells2.png
+%%DATADIR%%/missions/doom.cdogscpn/graphics/shells2.txt
+%%DATADIR%%/missions/doom.cdogscpn/graphics/stimpack.png
+%%DATADIR%%/missions/doom.cdogscpn/graphics/stimpack.txt
+%%DATADIR%%/missions/doom.cdogscpn/graphics/supercharge.png
+%%DATADIR%%/missions/doom.cdogscpn/graphics/supercharge.txt
 %%DATADIR%%/missions/doom.cdogscpn/graphics/warning_sign.png
 %%DATADIR%%/missions/doom.cdogscpn/guns.json
 %%DATADIR%%/missions/doom.cdogscpn/map_objects.json
 %%DATADIR%%/missions/doom.cdogscpn/missions.json
 %%DATADIR%%/missions/doom.cdogscpn/particles.json
-%%DATADIR%%/missions/doom.cdogscpn/players.json
+%%DATADIR%%/missions/doom.cdogscpn/pickups.json
 %%DATADIR%%/missions/doom.cdogscpn/sounds/fireball.txt
 %%DATADIR%%/missions/doom.cdogscpn/sounds/fireball.wav
 %%DATADIR%%/missions/doom.cdogscpn/sounds/marine_shotgun.ogg
@@ -1941,7 +1960,6 @@ share/applications/io.github.cxong.cdogs-sdl.desktop
 %%DATADIR%%/missions/ogre.cdogscpn/campaign.json
 %%DATADIR%%/missions/ogre.cdogscpn/characters.json
 %%DATADIR%%/missions/ogre.cdogscpn/missions.json
-%%DATADIR%%/missions/ogre.cdogscpn/players.json
 %%DATADIR%%/missions/spacepirates.cdogscpn/LICENSE.md
 %%DATADIR%%/missions/spacepirates.cdogscpn/ammo.json
 %%DATADIR%%/missions/spacepirates.cdogscpn/bullets.json
@@ -1955,11 +1973,9 @@ share/applications/io.github.cxong.cdogs-sdl.desktop
 %%DATADIR%%/missions/spacepirates.cdogscpn/graphics/rapidr_11x11.png.txt
 %%DATADIR%%/missions/spacepirates.cdogscpn/guns.json
 %%DATADIR%%/missions/spacepirates.cdogscpn/missions.json
-%%DATADIR%%/missions/spacepirates.cdogscpn/players.json
 %%DATADIR%%/missions/terror.cdogscpn/campaign.json
 %%DATADIR%%/missions/terror.cdogscpn/characters.json
 %%DATADIR%%/missions/terror.cdogscpn/missions.json
-%%DATADIR%%/missions/terror.cdogscpn/players.json
 %%DATADIR%%/missions/zombie.cpn.cdogscpn/campaign.json
 %%DATADIR%%/missions/zombie.cpn.cdogscpn/characters.json
 %%DATADIR%%/missions/zombie.cpn.cdogscpn/missions.json
@@ -2014,6 +2030,26 @@ share/applications/io.github.cxong.cdogs-sdl.desktop
 %%DATADIR%%/sounds/aargh/zombie/4.ogg
 %%DATADIR%%/sounds/aargh/zombie/5.ogg
 %%DATADIR%%/sounds/aargh/zombie/license.txt
+%%DATADIR%%/sounds/alert/alien/0.ogg
+%%DATADIR%%/sounds/alert/alien/1.ogg
+%%DATADIR%%/sounds/alert/alien/license.txt
+%%DATADIR%%/sounds/alert/man/0.ogg
+%%DATADIR%%/sounds/alert/man/1.ogg
+%%DATADIR%%/sounds/alert/man/2.ogg
+%%DATADIR%%/sounds/alert/man/3.ogg
+%%DATADIR%%/sounds/alert/man/license.txt
+%%DATADIR%%/sounds/alert/ogre/0.ogg
+%%DATADIR%%/sounds/alert/ogre/1.ogg
+%%DATADIR%%/sounds/alert/ogre/license.txt
+%%DATADIR%%/sounds/alert/woman/0.ogg
+%%DATADIR%%/sounds/alert/woman/1.ogg
+%%DATADIR%%/sounds/alert/woman/license.txt
+%%DATADIR%%/sounds/alert/zombie/0.ogg
+%%DATADIR%%/sounds/alert/zombie/1.ogg
+%%DATADIR%%/sounds/alert/zombie/2.ogg
+%%DATADIR%%/sounds/alert/zombie/3.ogg
+%%DATADIR%%/sounds/alert/zombie/4.ogg
+%%DATADIR%%/sounds/alert/zombie/license.txt
 %%DATADIR%%/sounds/ammo_low.ogg
 %%DATADIR%%/sounds/ammo_low.txt
 %%DATADIR%%/sounds/ammo_none.ogg
@@ -2258,6 +2294,8 @@ share/applications/io.github.cxong.cdogs-sdl.desktop
 %%DATADIR%%/sounds/victory.txt
 %%DATADIR%%/sounds/whistle.ogg
 %%DATADIR%%/sounds/whistle.txt
+share/metainfo/io.github.cxong.cdogs-sdl.appdata.xml
+share/applications/io.github.cxong.cdogs-sdl.desktop
 share/icons/hicolor/128x128/apps/io.github.cxong.cdogs-sdl.png
 share/icons/hicolor/16x16/apps/io.github.cxong.cdogs-sdl.png
 share/icons/hicolor/22x22/apps/io.github.cxong.cdogs-sdl.png