diff --git a/games/DDNet/Makefile b/games/DDNet/Makefile
index 6e6dba75d2ad..338e445be92f 100644
--- a/games/DDNet/Makefile
+++ b/games/DDNet/Makefile
@@ -1,113 +1,112 @@
 PORTNAME=	DDNet
-PORTVERSION=	17.4
-PORTREVISION=	4
+PORTVERSION=	18.1
 CATEGORIES=	games
 MASTER_SITES=	https://ddnet.tw/downloads/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	DDraceNetwork, a cooperative racing mod of Teeworlds
 WWW=		https://ddnet.tw/ \
 		https://github.com/ddnet/ddnet
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		cargo cmake compiler:c++17-lang pkgconfig python sqlite:3 ssl tar:xz
 CMAKE_ARGS=	-DPYTHON_EXECUTABLE="${PYTHON_CMD}"
 CMAKE_OFF=	AUTOUPDATE DOWNLOAD_GTEST PREFER_BUNDLED_LIBS
 
 CXXFLAGS+=	-DBINARY_DIR="\\\"${PREFIX}/bin\\\""
 
 CARGO_INSTALL=	no
 CARGO_TEST=	no
 CARGO_TARGET_DIR=${BUILD_WRKSRC}
 CARGO_ENV+=	DDNET_TEST_NO_LINK=1
 CARGO_CRATES=	cc-1.0.73 \
 		cxx-1.0.71 \
 		cxxbridge-flags-1.0.71 \
 		cxxbridge-macro-1.0.71 \
 		link-cplusplus-1.0.6 \
 		proc-macro2-1.0.40 \
 		quote-1.0.20 \
 		syn-1.0.98 \
 		unicode-ident-1.0.1
 
 PORTDATA=	*
 DATADIR=	${PREFIX}/share/ddnet
 
 TEST_ENV=	${MAKE_ENV} GTEST_FILTER=-Io.CurrentExe:Jobs.LookupHost:Io.CurrentExe:Jobs.LookupHostWebsocket
 
 OPTIONS_DEFINE=		TEST WEBSOCKETS MYSQL VIDEORECORDER UPNP VULKAN
 OPTIONS_MULTI=		COMPONENTS
 OPTIONS_MULTI_COMPONENTS=CLIENT SERVER
 OPTIONS_DEFAULT=	CLIENT SERVER VIDEORECORDER UPNP VULKAN
 OPTIONS_SUB=		yes
 
 CLIENT_DESC=		Build game client
 CLIENT_CMAKE_BOOL=	CLIENT
 CLIENT_USES=		gettext gl sdl xorg desktop-file-utils
 CLIENT_USE=		GL=gl,glew SDL=sdl2
 CLIENT_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libwavpack.so:audio/wavpack \
 			libopusfile.so:audio/opusfile \
 			libopus.so:audio/opus \
 			libogg.so:audio/libogg \
 			libnotify.so:devel/libnotify \
 			libcurl.so:ftp/curl
 
 SERVER_DESC=		Build game server
 SERVER_CMAKE_BOOL=	SERVER
 # does not build without these libs, but does not need them in
 # runtime either
 SERVER_BUILD_DEPENDS=	glew>=0:graphics/glew \
 			wavpack>=0:audio/wavpack
 
 TEST_BUILD_DEPENDS=	googletest>=0:devel/googletest
 TEST_TEST_TARGET=	run_tests  # tests are broken
 
 WEBSOCKETS_DESC=	Enable WebSocket support for server
 WEBSOCKETS_CMAKE_BOOL=	WEBSOCKETS
 WEBSOCKETS_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
 
 MYSQL_DESC=		Enable MySQL/MariaDB support for server
 MYSQL_CMAKE_BOOL=	MYSQL
 MYSQL_USES=		mysql
 MYSQL_LIB_DEPENDS=	libmysqlcppconn.so:databases/mysql-connector-c++
 
 VIDEORECORDER_DESC=	Video recording support using FFmpeg to the client
 VIDEORECORDER_CMAKE_BOOL=VIDEORECORDER
 VIDEORECORDER_LIB_DEPENDS=libavcodec.so:multimedia/ffmpeg
 
 UPNP_DESC=		UPnP support for the server
 UPNP_CMAKE_BOOL=	UPNP
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_IMPLIES=		SERVER
 
 VULKAN_DESC=		Enable the vulkan backend
 VULKAN_CMAKE_BOOL=	VULKAN
 VULKAN_IMPLIES=		CLIENT
 VULKAN_BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 			${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 
 post-extract:
 # json-parser and md5 are left intact
 .for dep in glew pnglite wavpack zlib
 	@${RM} -r ${WRKSRC}/src/engine/external/${dep}
 .endfor
 
 post-build:
 	@${ECHO_MSG} "===> Returning from cargo build to cmake build"
 	@${FIND} ${BUILD_WRKSRC} -name libddnet_engine_shared.a -exec ${CP} -p {} ${BUILD_WRKSRC}/release/ \;
 	@cd ${BUILD_WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/find_package.*Git/ d' ${WRKSRC}/CMakeLists.txt
 
 post-patch-TEST-off:
 	@${REINPLACE_CMD} -e '/find_package.*GTest/ d' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/games/DDNet/distinfo b/games/DDNet/distinfo
index f85fda578f4d..a713a00b5f92 100644
--- a/games/DDNet/distinfo
+++ b/games/DDNet/distinfo
@@ -1,21 +1,21 @@
-TIMESTAMP = 1700584877
-SHA256 (DDNet-17.4.tar.xz) = dfde3af1f82fd2b9bb676a253e9fd3d31148e7244b936937442908b6857eae66
-SIZE (DDNet-17.4.tar.xz) = 35355808
+TIMESTAMP = 1711738710
+SHA256 (DDNet-18.1.tar.xz) = 16e8cac1c3710239e5d3bec9f31389c169ea123c00a7959a01653cdb54e9f794
+SIZE (DDNet-18.1.tar.xz) = 35458832
 SHA256 (rust/crates/cc-1.0.73.crate) = 2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11
 SIZE (rust/crates/cc-1.0.73.crate) = 57880
 SHA256 (rust/crates/cxx-1.0.71.crate) = 5469a6f42296f4fd40789b397383718f9a0bd75d2f9b7cedbb249996811fba27
 SIZE (rust/crates/cxx-1.0.71.crate) = 195479
 SHA256 (rust/crates/cxxbridge-flags-1.0.71.crate) = 0fef2b4ffdc935c973bc7817d541fc936fdc8a85194cfdd9c761aca8387edd48
 SIZE (rust/crates/cxxbridge-flags-1.0.71.crate) = 5593
 SHA256 (rust/crates/cxxbridge-macro-1.0.71.crate) = 9d3a240a54f5526967ffae81fdcda1fc80564964220d90816960b2eae2eab7f4
 SIZE (rust/crates/cxxbridge-macro-1.0.71.crate) = 59620
 SHA256 (rust/crates/link-cplusplus-1.0.6.crate) = f8cae2cd7ba2f3f63938b9c724475dfb7b9861b545a90324476324ed21dbc8c8
 SIZE (rust/crates/link-cplusplus-1.0.6.crate) = 8150
 SHA256 (rust/crates/proc-macro2-1.0.40.crate) = dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7
 SIZE (rust/crates/proc-macro2-1.0.40.crate) = 40559
 SHA256 (rust/crates/quote-1.0.20.crate) = 3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804
 SIZE (rust/crates/quote-1.0.20.crate) = 28160
 SHA256 (rust/crates/syn-1.0.98.crate) = c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd
 SIZE (rust/crates/syn-1.0.98.crate) = 235451
 SHA256 (rust/crates/unicode-ident-1.0.1.crate) = 5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c
 SIZE (rust/crates/unicode-ident-1.0.1.crate) = 33770
diff --git a/games/DDNet/files/patch-CMakeLists.txt b/games/DDNet/files/patch-CMakeLists.txt
index 042f61282d11..0678467b4696 100644
--- a/games/DDNet/files/patch-CMakeLists.txt
+++ b/games/DDNet/files/patch-CMakeLists.txt
@@ -1,38 +1,36 @@
---- CMakeLists.txt.orig	2023-01-12 00:16:06 UTC
+--- CMakeLists.txt.orig	2024-03-01 18:51:36 UTC
 +++ CMakeLists.txt
-@@ -963,13 +963,6 @@ if(NOT CMAKE_OSX_ARCHITECTURES)
+@@ -929,13 +929,6 @@ if(NOT CMAKE_OSX_ARCHITECTURES)
      )
      list(APPEND RUST_OUTPUTS "${PROJECT_BINARY_DIR}/${CARGO_BUILD_DIR}/${LIBRARY_NAME}")
    endforeach()
 -  add_custom_command(
 -    OUTPUT ${RUST_OUTPUTS}
 -    COMMAND ${CARGO_BUILD}
 -    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 -    USES_TERMINAL
 -    DEPENDS ${RUST_SRC}
 -  )
  else()
    foreach(rust_target ${RUST_TARGETS})
      set(LIBRARY_NAME "${CMAKE_STATIC_LIBRARY_PREFIX}ddnet_${rust_target}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-@@ -3004,11 +2997,17 @@ if(NOT DEV)
+@@ -3086,10 +3079,16 @@ if(NOT DEV)
      install(TARGETS ${TARGET_ANTIBOT} DESTINATION ${CMAKE_INSTALL_LIBDIR}/ddnet COMPONENT server)
    endif()
    install(TARGETS ${TARGETS_TOOLS} DESTINATION ${CMAKE_INSTALL_LIBDIR}/ddnet COMPONENT tools)
 -  install(FILES other/ddnet.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications COMPONENT client)
--  install(FILES other/ddnet.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo COMPONENT client)
-+  if(CLIENT)
++  if(TARGET game-client)
 +    install(FILES other/ddnet.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications COMPONENT client)
-+    install(FILES other/ddnet.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo COMPONENT client)
 +  endif()
    foreach(SIZE 16 32 48 256)
 -    install(FILES other/icons/DDNet_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet.png COMPONENT client)
 -    install(FILES other/icons/DDNet-Server_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet-server.png COMPONENT server)
-+    if(CLIENT)
++    if(TARGET game-client)
 +      install(FILES other/icons/DDNet_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet.png COMPONENT client)
 +    endif()
-+    if(SERVER)
++    if(TARGET game-server)
 +      install(FILES other/icons/DDNet-Server_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet-server.png COMPONENT server)
 +    endif()
    endforeach()
    foreach(file ${VULKAN_SHADER_FILE_LIST})
      install(FILES ${PROJECT_BINARY_DIR}/${file} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ddnet/data/shader/vulkan COMPONENT client)
diff --git a/games/DDNet/pkg-plist b/games/DDNet/pkg-plist
index 0a0be8503c8a..668b214688bc 100644
--- a/games/DDNet/pkg-plist
+++ b/games/DDNet/pkg-plist
@@ -1,32 +1,31 @@
 %%CLIENT%%bin/DDNet
 %%SERVER%%bin/DDNet-Server
 lib/ddnet/config_retrieve
 lib/ddnet/config_store
 lib/ddnet/crapnet
 lib/ddnet/demo_extract_chat
 lib/ddnet/dilate
 lib/ddnet/dummy_map
 lib/ddnet/map_convert_07
 lib/ddnet/map_create_pixelart
 lib/ddnet/map_diff
 lib/ddnet/map_extract
 lib/ddnet/map_find_env
 lib/ddnet/map_optimize
 lib/ddnet/map_replace_area
 lib/ddnet/map_replace_image
 lib/ddnet/map_resave
 lib/ddnet/packetgen
 lib/ddnet/stun
 lib/ddnet/twping
 lib/ddnet/unicode_confusables
 lib/ddnet/uuid
 %%CLIENT%%share/applications/ddnet.desktop
 %%CLIENT%%share/icons/hicolor/16x16/apps/ddnet.png
 %%SERVER%%share/icons/hicolor/16x16/apps/ddnet-server.png
 %%CLIENT%%share/icons/hicolor/256x256/apps/ddnet.png
 %%SERVER%%share/icons/hicolor/256x256/apps/ddnet-server.png
 %%CLIENT%%share/icons/hicolor/32x32/apps/ddnet.png
 %%SERVER%%share/icons/hicolor/32x32/apps/ddnet-server.png
 %%CLIENT%%share/icons/hicolor/48x48/apps/ddnet.png
 %%SERVER%%share/icons/hicolor/48x48/apps/ddnet-server.png
-%%CLIENT%%share/metainfo/ddnet.appdata.xml