diff -Nru devel/godot.orig/Makefile devel/godot/Makefile --- devel/godot.orig/Makefile 2020-10-30 15:59:06.174345000 +1030 +++ devel/godot/Makefile 2020-10-30 15:58:33.051184000 +1030 @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= godot -DISTVERSION= 3.2.2 +DISTVERSION= 3.2.3 DISTVERSIONSUFFIX= -stable CATEGORIES= devel games @@ -21,22 +21,21 @@ xdg-open:devel/xdg-utils \ xmessage:x11/xmessage -USES= compiler:c++14-lang gl pkgconfig scons ssl xorg +USES= compiler:c++14-lang gl pkgconfig scons xorg USE_XORG= x11 xcursor xi xinerama xrandr xrender USE_GL= gl glew glu USE_GITHUB= yes GH_ACCOUNT= godotengine -MAKE_ARGS+= platform=x11 builtin_libpng=False \ - builtin_openssl=False verbose=True +MAKE_ARGS+= platform=x11 builtin_libpng=False verbose=True MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}} -MAKE_ARGS_clang= use_llvm=True +MAKE_ARGS_clang= use_llvm=True use_lld=True CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}} CXXFLAGS_i386_gcc= -march=i586 # option MONO doesn't build (needs 5.12+) so for now leave it out as an option -OPTIONS_DEFINE= EXAMPLES TOOLS +OPTIONS_DEFINE= EXAMPLES TOOLS UDEV OPTIONS_DEFAULT= ALSA # Moved to devel/godot-tools OPTIONS_EXCLUDE?= EXAMPLES TOOLS @@ -47,8 +46,8 @@ ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_MAKE_ARGS= alsa=True ALSA_MAKE_ARGS_OFF= alsa=False -# master at 2/4 tagged for 3.2 -EXAMPLES_GH_TUPLE= godotengine:godot-demo-projects:57baf0a1b5d1:DEMOS +# master at 10/7 tagged for 3.2 +EXAMPLES_GH_TUPLE= godotengine:godot-demo-projects:8d9d58f112d8:DEMOS EXAMPLES_PORTEXAMPLES= * # mono support doesn't build at present MONO_BUILD_DEPENDS= msbuild:devel/msbuild @@ -67,6 +66,10 @@ "${GODOTFILE}" "Development;IDE;" "" TOOLS_PLIST_FILES= share/pixmaps/${GODOTFILE}.png \ share/pixmaps/${GODOTFILE}.svg +UDEV_DESC= Libudev support (Joystick) +UDEV_LIB_DEPENDS= libudev.so:devel/libudev-devd +UDEV_MAKE_ARGS= udev=True +UDEV_MAKE_ARGS_OFF= udev=False GODOTFILE= ${PORTNAME}${PKGNAMESUFFIX} PLIST_FILES= bin/${GODOTFILE} diff -Nru devel/godot.orig/distinfo devel/godot/distinfo --- devel/godot.orig/distinfo 2020-10-30 15:59:06.174239000 +1030 +++ devel/godot/distinfo 2020-10-30 09:42:35.403772000 +1030 @@ -1,9 +1,9 @@ -TIMESTAMP = 1593941797 +TIMESTAMP = 1601266507 SHA256 (dotnet.glob.2.1.1.nupkg) = 8fa01b1928a9c4b70a4803226dcd2ec942474daf2876b80e35a0380d72f8fc1a SIZE (dotnet.glob.2.1.1.nupkg) = 73782 -SHA256 (godotengine-godot-3.2.2-stable_GH0.tar.gz) = 9a071aba23fc912976203d35212a94207b7cb667c0b5353b3525f9b7e6899017 -SIZE (godotengine-godot-3.2.2-stable_GH0.tar.gz) = 22299965 -SHA256 (godotengine-godot-demo-projects-57baf0a1b5d1_GH0.tar.gz) = 20f020a8593d9cf6f44ec9331675fe5ac015573491f408ecd364663a7e95df89 -SIZE (godotengine-godot-demo-projects-57baf0a1b5d1_GH0.tar.gz) = 159067937 +SHA256 (godotengine-godot-3.2.3-stable_GH0.tar.gz) = 4c2a8e7da1ad05c6223b0ff6cf2be124dad6708b56a8ec9910dc2aaf82a553ae +SIZE (godotengine-godot-3.2.3-stable_GH0.tar.gz) = 22459811 +SHA256 (godotengine-godot-demo-projects-8d9d58f112d8_GH0.tar.gz) = b57a0604355bffee9e4fdc037866cd46ed47f120527ce398160c014afd017842 +SIZE (godotengine-godot-demo-projects-8d9d58f112d8_GH0.tar.gz) = 162463588 SHA256 (mono-nuget-binary-ebedbf8_GH0.tar.gz) = a0362e65a381c99f222ce141012f5a0663b4a4ae22f27f638198f7414464bf1a SIZE (mono-nuget-binary-ebedbf8_GH0.tar.gz) = 2778322 diff -Nru devel/godot.orig/files/patch-platform_x11_detect.py devel/godot/files/patch-platform_x11_detect.py --- devel/godot.orig/files/patch-platform_x11_detect.py 1970-01-01 09:30:00.000000000 +0930 +++ devel/godot/files/patch-platform_x11_detect.py 2020-10-30 15:17:32.200470000 +1030 @@ -0,0 +1,11 @@ +--- platform/x11/detect.py.orig 2020-10-30 01:48:18 UTC ++++ platform/x11/detect.py +@@ -311,7 +311,7 @@ def configure(env): + else: + print("PulseAudio development libraries not found, disabling driver") + +- if platform.system() == "Linux": ++ if platform.system() == "FreeBSD": + env.Append(CPPDEFINES=["JOYDEV_ENABLED"]) + + if env["udev"]: