4 files changed, 10 insertions, 14 deletions

diff --git a/games/DDNet/Makefile b/games/DDNet/Makefile
index 6e6dba75d2ad..338e445be92f 100644
--- a/games/DDNet/Makefile
+++ b/games/DDNet/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	DDNet
-PORTVERSION=	17.4
-PORTREVISION=	4
+PORTVERSION=	18.1
 CATEGORIES=	games
 MASTER_SITES=	https://ddnet.tw/downloads/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/DDNet/distinfo b/games/DDNet/distinfo
index f85fda578f4d..a713a00b5f92 100644
--- a/games/DDNet/distinfo
+++ b/games/DDNet/distinfo
@@ -1,6 +1,6 @@
-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
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,6 +1,6 @@
---- 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()
@@ -14,23 +14,21 @@
  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()
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
@@ -29,4 +29,3 @@ lib/ddnet/uuid
 %%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