6 files changed, 32 insertions, 26 deletions

diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index 254ce80b3f4f..01db1da6a937 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	warzone2100
-PORTVERSION=	4.2.7
+PORTVERSION=	4.3.2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/releases/${PORTVERSION}/
 DISTNAME=	${PORTNAME}_src
@@ -24,7 +24,9 @@ LIB_DEPENDS=	libphysfs.so:devel/physfs \
 		libsodium.so:security/libsodium \
 		libcurl.so:ftp/curl \
 		libsqlite3.so:databases/sqlite3 \
-		libminiupnpc.so:net/miniupnpc
+		libminiupnpc.so:net/miniupnpc \
+		libopusfile.so:audio/opusfile \
+		libopus.so:audio/opus
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 
 USES=		cmake bison compiler:c++11-lib gl openal:al pkgconfig \
@@ -35,15 +37,16 @@ CMAKE_ARGS=	-DWZ_DISTRIBUTOR="FreeBSD ports" \
 		-DCMAKE_DISABLE_FIND_PACKAGE_Asciidoctor=TRUE \
 	       	-DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE \
 		-DWZ_ENABLE_WARNINGS_AS_ERRORS=FALSE \
-		-DFETCHCONTENT_FULLY_DISCONNECTED=TRUE
+		-DFETCHCONTENT_FULLY_DISCONNECTED=TRUE \
+		-DWZ_FORCE_MINIMAL_OPUSFILE=FALSE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTDOCS=	*
 PORTDATA=	*
 
-OPTIONS_DEFINE=	VULKAN DOCS NLS
-OPTIONS_DEFAULT=VULKAN
+OPTIONS_DEFINE=	VULKAN FRIBIDI DOCS NLS
+OPTIONS_DEFAULT=VULKAN FRIBIDI
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
@@ -55,6 +58,9 @@ VULKAN_BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers \
 			${LOCALBASE}/bin/glslc:graphics/shaderc
 VULKAN_CMAKE_BOOL=	WZ_ENABLE_BACKEND_VULKAN
 
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
+FRIBIDI_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Fribidi=TRUE
+
 post-patch:
 	@${FIND} ${WRKSRC} -type f -iname "*cmake*" -exec \
 		${REINPLACE_CMD} -i '' -e '/find_package(Git/d' {} \;
@@ -63,5 +69,6 @@ post-extract:
 .for bundled in miniupnp SQLiteCpp/sqlite3
 	@${RM} -rf ${WRKSRC}/3rdparty/${bundled}
 .endfor
+	@${RM} -rf ${WRKSRC}/lib/sound/3rdparty
 
 .include <bsd.port.mk>
diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo
index 3023ce14ec9a..562d2b60f2e7 100644
--- a/games/warzone2100/distinfo
+++ b/games/warzone2100/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646821447
-SHA256 (warzone2100-4.2.7/warzone2100_src.tar.xz) = 7f527ce00eda44099b1a7e3c303ede276f835f6d6ad945b0600a175ddabb00b0
-SIZE (warzone2100-4.2.7/warzone2100_src.tar.xz) = 338687576
+TIMESTAMP = 1670933579
+SHA256 (warzone2100-4.3.2/warzone2100_src.tar.xz) = 45ca4793ea7d01dbbdce4776279e21b297a8959affc6c06c63c7941cb198d31c
+SIZE (warzone2100-4.3.2/warzone2100_src.tar.xz) = 320455376
diff --git a/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt b/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt
index 466265d6a4df..6f307e792659 100644
--- a/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt
+++ b/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt
@@ -1,13 +1,13 @@
---- lib/sdl/CMakeLists.txt.orig	2022-11-03 17:44:55 UTC
+--- lib/sdl/CMakeLists.txt.orig	2022-11-02 16:53:49 UTC
 +++ lib/sdl/CMakeLists.txt
-@@ -49,14 +49,6 @@ if(NOT DEFINED WZ_FINDSDL2_NOCONFIG OR NOT WZ_FINDSDL2
+@@ -55,14 +55,6 @@ if(NOT DEFINED WZ_FINDSDL2_NOCONFIG OR NOT WZ_FINDSDL2
  	find_package(SDL2 ${SDL2_MIN_VERSION} CONFIG QUIET)
  endif()
  if(SDL2_FOUND)
 -	if (TARGET SDL2::SDL2-static)
 -		# Check for INTERFACE_INCLUDE_DIRECTORIES to ignore the "aliased" target that vcpkg creates
 -		get_target_property(_sdl2_include_dir SDL2::SDL2-static INTERFACE_INCLUDE_DIRECTORIES)
--		test_link_to_sdl_target(SDL2::SDL2-static LINK_SUCCESS_SDL2_SDL2STATIC_TARGET)
+-		test_link_to_sdl_target(SDL2::SDL2-static FALSE LINK_SUCCESS_SDL2_SDL2STATIC_TARGET)
 -		if (_sdl2_include_dir AND LINK_SUCCESS_SDL2_SDL2STATIC_TARGET)
 -			set(_sdl2_library SDL2::SDL2-static)
 -		endif()
diff --git a/games/warzone2100/files/patch-lib_sound_CMakeLists.txt b/games/warzone2100/files/patch-lib_sound_CMakeLists.txt
new file mode 100644
index 000000000000..28ce3a1b046c
--- /dev/null
+++ b/games/warzone2100/files/patch-lib_sound_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- lib/sound/CMakeLists.txt.orig	2022-11-02 16:53:49 UTC
++++ lib/sound/CMakeLists.txt
+@@ -47,7 +47,7 @@ target_link_libraries(sound PRIVATE Ogg::ogg Opus::opu
+ target_link_libraries(sound PUBLIC optional-lite)
+ 
+ # Opusfile
+-find_package(Opusfile QUIET)
++find_package(Opusfile REQUIRED)
+ if (NOT WZ_FORCE_MINIMAL_OPUSFILE AND Opusfile_FOUND)
+ 	# Link the found Opusfile
+ 	message(STATUS "Found Opusfile library: ${OPUSFILE_LIBRARY}")
diff --git a/games/warzone2100/files/patch-src_CMakeLists.txt b/games/warzone2100/files/patch-src_CMakeLists.txt
deleted file mode 100644
index 6b218103529a..000000000000
--- a/games/warzone2100/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/CMakeLists.txt.orig	2021-07-12 15:03:29 UTC
-+++ src/CMakeLists.txt
-@@ -611,9 +611,6 @@ endif()
- # Install
- install(TARGETS warzone2100 COMPONENT Core DESTINATION "${WZ_APP_INSTALL_DEST}")
- 
--# For Portable packages only, copy the ".portable" file that triggers portable mode (Windows-only)
--install(FILES "${CMAKE_SOURCE_DIR}/pkg/portable.in" COMPONENT PortableConfig DESTINATION "${WZ_APP_INSTALL_DEST}" RENAME ".portable")
--
- #####################
- # Installing Required Runtime Dependencies
- 
diff --git a/games/warzone2100/pkg-plist b/games/warzone2100/pkg-plist
index 2552059831cc..cfb61995ecfe 100644
--- a/games/warzone2100/pkg-plist
+++ b/games/warzone2100/pkg-plist
@@ -1,7 +1,7 @@
 bin/warzone2100
 share/man/man6/warzone2100.6.gz
-share/applications/warzone2100.desktop
-share/icons/warzone2100.png
+share/applications/net.wz2100.warzone2100.desktop
+share/icons/net.wz2100.warzone2100.png
 %%NLS%%share/locale/af_ZA/LC_MESSAGES/warzone2100.mo
 %%NLS%%share/locale/ar_SA/LC_MESSAGES/warzone2100.mo
 %%NLS%%share/locale/bg_BG/LC_MESSAGES/warzone2100.mo
@@ -43,4 +43,4 @@ share/icons/warzone2100.png
 %%NLS%%share/locale/uk_UA/LC_MESSAGES/warzone2100.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/warzone2100.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/warzone2100.mo
-share/metainfo/warzone2100.appdata.xml
+share/metainfo/net.wz2100.warzone2100.appdata.xml