git: 40fcc6ca7e75 - main - devel/godot: Update to 4.4.1

From: Zsolt Udvari <uzsolt_at_FreeBSD.org>
Date: Tue, 08 Jul 2025 14:10:04 UTC
The branch main has been updated by uzsolt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=40fcc6ca7e75ee07a1148bf2e8e7e200e11f6c13

commit 40fcc6ca7e75ee07a1148bf2e8e7e200e11f6c13
Author:     Shane <FreeBSD@ShaneWare.Biz>
AuthorDate: 2025-07-08 14:07:56 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2025-07-08 14:09:39 +0000

    devel/godot: Update to 4.4.1
    
    Fix do-test target.
    Pet portfmt.
    
    Changelog:
    https://godotengine.github.io/godot-interactive-changelog/#4.4.1
    
    PR:             285973
    Approved by:    FreeBSD@ShaneWare.Biz (maintainer)
---
 devel/godot/Makefile                               | 61 ++++++++++++----------
 devel/godot/distinfo                               |  6 +--
 .../godot/files/patch-platform_linuxbsd_detect.py  |  6 +--
 .../patch-platform_linuxbsd_libudev-so__wrap.c     |  4 +-
 ...atch-thirdparty_linuxbsd_headers_udev_libudev.h |  4 +-
 5 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/devel/godot/Makefile b/devel/godot/Makefile
index 95f2d7256dd5..c06436a61a74 100644
--- a/devel/godot/Makefile
+++ b/devel/godot/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	godot
-DISTVERSION=	4.4
+DISTVERSION=	4.4.1
 DISTVERSIONSUFFIX=	-stable
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	devel games
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT?=	Game runtime engine
 WWW=		https://godotengine.org/
 
-LICENSE=		MIT CC-BY-3.0
-LICENSE_COMB=		multi
+LICENSE=	CC-BY-3.0 MIT
+LICENSE_COMB=	multi
 LICENSE_FILE_CC-BY-3.0=	${WRKSRC}/LOGO_LICENSE.txt
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	yasm:devel/yasm
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgraphite2.so:graphics/graphite2 \
-		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
+		libharfbuzz.so:print/harfbuzz \
 		libpcre2-8.so:devel/pcre2 \
 		libpng.so:graphics/png \
 		libvpx.so:multimedia/libvpx
-RUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
-		xdg-open:devel/xdg-utils \
+RUN_DEPENDS=	xdg-open:devel/xdg-utils \
+		xdg-user-dir:devel/xdg-user-dirs \
 		xmessage:x11/xmessage
 
 USES=		compiler:c++17-lang cpe gl pkgconfig scons xorg
@@ -42,40 +42,40 @@ MAKE_ARGS_clang=	use_llvm=True linker=lld
 CXXFLAGS_i386=		${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
 CXXFLAGS_i386_gcc=	-march=i586
 
-GODOTFILE=		${PORTNAME}${PKGNAMESUFFIX}
-PLIST_FILES=		bin/${GODOTFILE}
+GODOTFILE=	${PORTNAME}${PKGNAMESUFFIX}
+PLIST_FILES=	bin/${GODOTFILE}
 
 OPTIONS_DEFINE=		EXAMPLES TEST TOOLS UDEV
 OPTIONS_DEFAULT=	ALSA UDEV
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
 # Moved to devel/godot-tools
-OPTIONS_EXCLUDE?=	EXAMPLES TEST TOOLS
+OPTIONS_EXCLUDE?=	EXAMPLES TOOLS
 
-AUDIO_DESC=		Audio support
-TOOLS_DESC=		Include development tools (IDE)
-UDEV_DESC=		Libudev support (Joystick)
+AUDIO_DESC=	Audio support
+TOOLS_DESC=	Include development tools (IDE)
+UDEV_DESC=	Libudev support (Joystick)
 
-ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-ALSA_MAKE_ARGS=		alsa=True
-ALSA_MAKE_ARGS_OFF=	alsa=False
+ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
+ALSA_MAKE_ARGS=			alsa=True
+ALSA_MAKE_ARGS_OFF=		alsa=False
 # master head at 6/3 - no branch made for 4.4 yet
-EXAMPLES_GH_TUPLE=	godotengine:godot-demo-projects:fdb2f50a2088:DEMOS
-EXAMPLES_PORTEXAMPLES=	*
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-PULSEAUDIO_MAKE_ARGS=	pulseaudio=True
+EXAMPLES_GH_TUPLE=		godotengine:godot-demo-projects:fdb2f50a2088:DEMOS
+EXAMPLES_PORTEXAMPLES=		*
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
+PULSEAUDIO_MAKE_ARGS=		pulseaudio=True
 PULSEAUDIO_MAKE_ARGS_OFF=	pulseaudio=False
-TEST_MAKE_ARGS=		tests=True
-TOOLS_MAKE_ARGS=	target=editor
-TOOLS_MAKE_ARGS_OFF=	target=template_release
+TEST_MAKE_ARGS=			tests=True
+TOOLS_MAKE_ARGS=		target=editor
+TOOLS_MAKE_ARGS_OFF=		target=template_release
 TOOLS_DESKTOP_ENTRIES=	"Godot" "${COMMENT}" "${GODOTFILE}" \
 			"${GODOTFILE}" "Development;IDE;" ""
-TOOLS_PLIST_FILES=	share/pixmaps/${GODOTFILE}.png \
-			share/pixmaps/${GODOTFILE}.svg
-UDEV_BUILD_DEPENDS=	${PREFIX}/include/linux/input.h:devel/evdev-proto
-UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
-UDEV_MAKE_ARGS=		udev=True
-UDEV_MAKE_ARGS_OFF=	udev=False
+TOOLS_PLIST_FILES=		share/pixmaps/${GODOTFILE}.png \
+				share/pixmaps/${GODOTFILE}.svg
+UDEV_BUILD_DEPENDS=		${PREFIX}/include/linux/input.h:devel/evdev-proto
+UDEV_LIB_DEPENDS=		libudev.so:devel/libudev-devd
+UDEV_MAKE_ARGS=			udev=True
+UDEV_MAKE_ARGS_OFF=		udev=False
 
 .ifmake makesum
 # Always include optional distfiles
@@ -112,7 +112,10 @@ do-install-TOOLS-on:
 	${INSTALL_DATA} ${WRKSRC}/icon.svg \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg
 
+.if ${PORT_OPTIONS:MTEST}
 do-test:
+	${MKDIR} ~/.cache/godot
 	cd ${TEST_WRKSRC} && bin/godot.linuxbsd* --verbose --test
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/godot/distinfo b/devel/godot/distinfo
index ee1637190497..fd408ab1b9a8 100644
--- a/devel/godot/distinfo
+++ b/devel/godot/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1741217319
-SHA256 (godotengine-godot-4.4-stable_GH0.tar.gz) = 23b36f704a2fe3bfe5fb2d04db40f2d635435cde079c169836a6f89ee7ca1901
-SIZE (godotengine-godot-4.4-stable_GH0.tar.gz) = 53742226
+TIMESTAMP = 1744162984
+SHA256 (godotengine-godot-4.4.1-stable_GH0.tar.gz) = a486c523494e155b6912a607b5813577f8f39285f8ad43ac76cb9141edad9888
+SIZE (godotengine-godot-4.4.1-stable_GH0.tar.gz) = 55229702
 SHA256 (godotengine-godot-demo-projects-fdb2f50a2088_GH0.tar.gz) = 96faa3844742c9dc6ebc5354df5817c738855b9234931d7057d08ac3c20281f7
 SIZE (godotengine-godot-demo-projects-fdb2f50a2088_GH0.tar.gz) = 215650115
diff --git a/devel/godot/files/patch-platform_linuxbsd_detect.py b/devel/godot/files/patch-platform_linuxbsd_detect.py
index ab0cb61205cb..0deebc9387b2 100644
--- a/devel/godot/files/patch-platform_linuxbsd_detect.py
+++ b/devel/godot/files/patch-platform_linuxbsd_detect.py
@@ -1,6 +1,6 @@
---- platform/linuxbsd/detect.py.orig	2025-02-19 15:17:58.330499000 +0100
-+++ platform/linuxbsd/detect.py	2025-02-19 15:20:19.837955000 +0100
-@@ -370,7 +370,7 @@
+--- platform/linuxbsd/detect.py.orig	2025-03-25 23:11:16 UTC
++++ platform/linuxbsd/detect.py
+@@ -373,7 +373,7 @@ def configure(env: "SConsEnvironment"):
      else:
          env.Append(CPPDEFINES=["XKB_ENABLED"])
  
diff --git a/devel/godot/files/patch-platform_linuxbsd_libudev-so__wrap.c b/devel/godot/files/patch-platform_linuxbsd_libudev-so__wrap.c
index 1becd49b36cc..6f50b34142d9 100644
--- a/devel/godot/files/patch-platform_linuxbsd_libudev-so__wrap.c
+++ b/devel/godot/files/patch-platform_linuxbsd_libudev-so__wrap.c
@@ -1,5 +1,5 @@
---- platform/linuxbsd/libudev-so_wrap.c.orig	2025-02-19 15:17:47.002070000 +0100
-+++ platform/linuxbsd/libudev-so_wrap.c	2025-02-19 15:19:37.278257000 +0100
+--- platform/linuxbsd/libudev-so_wrap.c.orig	2025-02-19 15:17:47 UTC
++++ platform/linuxbsd/libudev-so_wrap.c
 @@ -281,7 +281,7 @@
  int initialize_libudev(int verbose) {
    void *handle;
diff --git a/devel/godot/files/patch-thirdparty_linuxbsd_headers_udev_libudev.h b/devel/godot/files/patch-thirdparty_linuxbsd_headers_udev_libudev.h
index 7ce8d19a4a13..5720c06187c2 100644
--- a/devel/godot/files/patch-thirdparty_linuxbsd_headers_udev_libudev.h
+++ b/devel/godot/files/patch-thirdparty_linuxbsd_headers_udev_libudev.h
@@ -1,5 +1,5 @@
---- thirdparty/linuxbsd_headers/udev/libudev.h.orig	2025-02-19 15:18:28.842768000 +0100
-+++ thirdparty/linuxbsd_headers/udev/libudev.h	2025-02-19 15:18:40.913920000 +0100
+--- thirdparty/linuxbsd_headers/udev/libudev.h.orig	2025-02-15 07:16:26 UTC
++++ thirdparty/linuxbsd_headers/udev/libudev.h
 @@ -22,7 +22,7 @@
  #define _LIBUDEV_H_