games/ivan: update to 0.58

games/ivan/Makefile

@@ -1,44 +1,39 @@
 PORTNAME=	ivan
-PORTVERSION=	0.50
-PORTREVISION=	7
+PORTVERSION=	0.58
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/IVAN/IVAN%20${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Graphical roguelike game
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_armv6=		fails to compile: use of overloaded operator '<<' is ambiguous
-BROKEN_armv7=		fails to compile: use of overloaded operator '<<' is ambiguous
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libpcre.so:devel/pcre
 
-USES=		gmake sdl
-USE_SDL=	sdl
-USE_CXXSTD=	c++98
-GNU_CONFIGURE=	yes
+USES=		cmake pkgconfig sdl
+USE_SDL=	sdl2 mixer2
+USE_GITHUB=	yes
+GH_ACCOUNT=	Attnam
+GH_TAGNAME=	v${PORTVERSION:C/\.//}
 
-CONFIGURE_ARGS=	--localstatedir=/var/games
+CFLAGS+=	-DNOSOUND=1
+CXXFLAGS+=	-DNOSOUND=1
+
+PLIST_FILES=	bin/ivan
 
 PORTSCOUT=	skipv:0.301,0.310,0.311,0.401,0.410,0.420,0.430
 
 PORTDATA=	*
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	WIZARD DOCS
+
+WIZARD_DESC=	Enable Wizard mode
+WIZARD_CMAKE_BOOL=	WIZARD
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|IvanSave|.IvanSave|g' ${WRKSRC}/Main/Source/game.cpp
-	@${REINPLACE_CMD} -Ee 's|(fearray<type>::~?fearray)<type>|\1|' \
-		${WRKSRC}/FeLib/Include/fearray.h
-	@${REINPLACE_CMD} -Ee 's|([a-z]+<[a-z ,]+>::~?[a-z]+)<[a-z ,]+>|\1|' \
-		${WRKSRC}/Main/Source/script.cpp
-	@${REINPLACE_CMD} -e 's|truth(|bool(|' ${WRKSRC}/Main/Source/fluid.cpp \
-		${WRKSRC}/Main/Include/char.h ${WRKSRC}/Main/Include/lsquare.h \
-		${WRKSRC}/FeLib/Include/save.h ${WRKSRC}/Main/Include/lsquare.h \
-		${WRKSRC}/Main/Include/human.h ${WRKSRC}/Main/Source/command.cpp \
-		${WRKSRC}/Main/Include/stack.h ${WRKSRC}/Main/Source/lsquare.cpp \
-		${WRKSRC}/Main/Source/lterras.cpp
-
-post-install:
-	${MKDIR} ${STAGEDIR}/var/games/ivan/Bones
-	${TOUCH} ${STAGEDIR}/var/games/ivan/ivan-highscore.scores.sample
+post-install-DOCS-on:
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} "README.md Doc MANUAL" \
+		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

games/ivan/distinfo

@@ -1,2 +1,3 @@
-SHA256 (ivan-0.50.tar.gz) = d8bc588ad902f27906ab34c2f8a9cace03867b45ff6a57025e046931f36ad480
-SIZE (ivan-0.50.tar.gz) = 803651
+TIMESTAMP = 1622830286
+SHA256 (Attnam-ivan-0.58-v058_GH0.tar.gz) = ee2e7a4ec26f8a08fceddebbcbb03af1f42ec95be69f54a84b72e5ea4595cb59
+SIZE (Attnam-ivan-0.58-v058_GH0.tar.gz) = 30393481

games/ivan/files/patch-CMakeLists.txt

@@ -0,0 +1,13 @@
+TODO: On FreeBSD, libexecinfo needs to be linked
+
+--- CMakeLists.txt.orig	2020-03-16 02:04:05 UTC
++++ CMakeLists.txt
+@@ -65,7 +65,7 @@ endif()
+
+ find_path(EXECINFO_INCLUDE_DIR NAMES execinfo.h)
+ if(NOT EXECINFO_INCLUDE_DIR MATCHES "-NOTFOUND$")
+-  add_definitions(-DBACKTRACE)
++	#add_definitions(-DBACKTRACE)
+ endif()
+
+ add_subdirectory(FeLib)

games/ivan/files/patch-audio_CMakeLists.txt

@@ -0,0 +1,21 @@
+--- audio/CMakeLists.txt.orig	2020-03-16 02:04:05 UTC
++++ audio/CMakeLists.txt
+@@ -10,9 +10,10 @@ if(WIN32)
+ endif()
+
+ # Add RtMidi dependencies on Linux
+-if(UNIX AND NOT APPLE)
++if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+   add_definitions(-D__LINUX_ALSA__)
+   find_package(ALSA)
++  set(RTMIDI_INCLUDES ${ALSA_INCLUDE_DIRS})
+   set(RTMIDI_DEPENDENCIES ${ALSA_LIBRARY} pthread)
+ endif()
+
+@@ -30,5 +31,5 @@ target_link_libraries(FeAudio ${RTMIDI_DEPENDENCIES})
+
+ find_package(SDL2 REQUIRED)
+
+-target_include_directories(FeAudio SYSTEM PUBLIC ${SDL2_mixer_INCLUDE_DIR})
++target_include_directories(FeAudio SYSTEM PUBLIC ${SDL2_mixer_INCLUDE_DIR} ${RTMIDI_INCLUDES})
+ target_link_libraries(FeAudio ${SDL2_mixer_LIBRARY})

games/ivan/pkg-descr

@@ -1,11 +1,8 @@
-Iter Vehemens ad Necem (IVAN) is a graphical roguelike game, which
-currently runs in Linux, Windows, and DOS. It features advanced
-bodypart and material handling, multi-colored lighting and, above
-all, deep gameplay.
+Iter Vehemens ad Necem (IVAN) is a graphical roguelike game. It
+features advanced bodypart and material handling, multi-colored
+lighting and, above all, deep gameplay.
 
-From developer's website:
-
-Fellow adventurer, turn back while you can! For here begins the
+"Fellow adventurer, turn back while you can! For here begins the
 roguelike Iter Vehemens ad Necem, a Violent Road to Death. If you
 choose to travel along it, you will dive into countless exciting
 adventures to gain items of great magic, attain powerful equipment
@@ -16,6 +13,8 @@ catch numerous diseases, lose several limbs and transform into
 manifold different kinds of pitiful creatures in the darkest depths
 of hostile dungeons. And, at the end of the road, you are bound to
 perish in a most gruesome and painful way. Don't say we didn't warn
-you.
+you."
 
+WWW: https://attnam.com/
+WWW: https://github.com/Attnam/ivan
 WWW: http://ivan.sourceforge.net/