Merge branch 'freebsd/main' into hardenedbsd/main

devel/pyenv/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	pyenv
-PORTVERSION=	2.4.4
+PORTVERSION=	2.4.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel python
 

devel/pyenv/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1719650062
-SHA256 (pyenv-pyenv-v2.4.4_GH0.tar.gz) = 8e3e916ac8bcfa534ef91c1abb364a0c7814d03d20e4b84227d3f78077163d86
-SIZE (pyenv-pyenv-v2.4.4_GH0.tar.gz) = 798854
+TIMESTAMP = 1719819111
+SHA256 (pyenv-pyenv-v2.4.5_GH0.tar.gz) = 24f3671a92492f49fa6f61dea861323ad853877c5cb2686c95bfa76339aa1301
+SIZE (pyenv-pyenv-v2.4.5_GH0.tar.gz) = 798909

devel/pyenv/pkg-plist

@@ -117,7 +117,7 @@ libexec/pyenv-plugins/python-build/share/python-build/3.12.2
 libexec/pyenv-plugins/python-build/share/python-build/3.12.3
 libexec/pyenv-plugins/python-build/share/python-build/3.12.4
 libexec/pyenv-plugins/python-build/share/python-build/3.13-dev
-libexec/pyenv-plugins/python-build/share/python-build/3.13.0b2
+libexec/pyenv-plugins/python-build/share/python-build/3.13.0b3
 libexec/pyenv-plugins/python-build/share/python-build/3.13t-dev
 libexec/pyenv-plugins/python-build/share/python-build/3.14-dev
 libexec/pyenv-plugins/python-build/share/python-build/3.14t-dev

devel/tclxml/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	tclxml
 PORTVERSION=	3.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel tcl
 MASTER_SITES=	LOCAL/bf SF/tclxml/TclXML/${PORTVERSION}
 

devel/tclxml/files/patch-Makefile.in

@@ -1,6 +1,17 @@
 --- Makefile.in.orig	2013-03-30 17:17:07 UTC
 +++ Makefile.in
-@@ -423,13 +423,15 @@
+@@ -136,10 +136,6 @@ TCLLIBPATH      = $(top_builddir)
+ EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR)
+ #EXTRA_PATH     = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR)
+ TCLLIBPATH      = $(top_builddir)
+-TCLSH_ENV	= TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \
+-		  @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
+-		  PATH="$(EXTRA_PATH):$(PATH)" \
+-		  TCLLIBPATH="$(TCLLIBPATH)"
+ #                 TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library`
+
+ TCLSH_PROG	= @TCLSH_PROG@
+@@ -423,13 +419,15 @@ install-lib-binaries:
  	@mkdir -p $(DESTDIR)$(pkglibdir)
  	@list='$(lib_BINARIES)'; for p in $$list; do \
  	  if test -f $$p; then \

devel/tclxml/files/patch-configure

@@ -1,7 +1,11 @@
---- configure.orig	2022-03-16 21:59:50 UTC
+--- configure.orig	2013-03-30 17:17:07 UTC
 +++ configure
-@@ -8580,14 +8580,14 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6; }
- 	FreeBSD-*|DragonFly-*)
+@@ -8577,17 +8577,17 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6; }
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
  	    # FreeBSD 3.* and greater have ELF.
  	    SHLIB_CFLAGS="-fPIC"
 -	    SHLIB_LD="ld -Bshareable -x"
@@ -18,3 +22,12 @@
  	    if test "${TCL_THREADS}" = "1" ; then
  		# The -pthread needs to go in the CFLAGS, not LIBS
  		LIBS=`echo $LIBS | sed s/-pthread//`
+@@ -9267,7 +9267,7 @@ fi
+ 		    ;;
+ 		IRIX*)
+ 		    ;;
+-		NetBSD-*|FreeBSD-*)
++		NetBSD-*|FreeBSD-*|DragonFly-*)
+ 		    ;;
+ 		Darwin-*)
+ 		    ;;

devel/tclxml/files/patch-docObj.c

@@ -0,0 +1,19 @@
+--- docObj.c.orig	2013-03-30 17:17:07 UTC
++++ docObj.c
+@@ -1852,9 +1852,13 @@ void
+ }
+
+ void
+-TclXML_libxml2_ErrorHandler (ctx, error)
+-     void *ctx; /* ignore - depends on context */
+-     xmlErrorPtr error;
++TclXML_libxml2_ErrorHandler (void *ctx,
++#if LIBXML_VERSION >= 21200
++        const xmlError *error
++#else
++        xmlError *error
++#endif
++        )
+ {
+   ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+   Tcl_Obj *objPtr;

devel/tclxml/files/patch-include_tclxml-libxml2_tclxml-libxml2Decls.h

@@ -0,0 +1,31 @@
+--- include/tclxml-libxml2/tclxml-libxml2Decls.h.orig	2013-03-30 17:17:07 UTC
++++ include/tclxml-libxml2/tclxml-libxml2Decls.h
+@@ -55,7 +55,12 @@ EXTERN void		TclXML_libxml2_ErrorHandler _ANSI_ARGS_((
+ 				TclXML_libxml2_DocumentHandling keep));
+ /* 10 */
+ EXTERN void		TclXML_libxml2_ErrorHandler _ANSI_ARGS_((void * ctx, 
+-				xmlErrorPtr error));
++#if LIBXML_VERSION >= 21200
++				const xmlError *error));
++#else
++				xmlError *error));
++#endif
++
+ /* 11 */
+ EXTERN void		TclXML_libxml2_ResetError _ANSI_ARGS_((
+ 				Tcl_Interp * interp));
+@@ -93,7 +98,13 @@ typedef struct Tclxml_libxml2Stubs {
+     int (*tclXML_libxml2_GetTclDocFromNode) _ANSI_ARGS_((Tcl_Interp * interp, xmlNodePtr nodePtr, TclXML_libxml2_Document ** tDocPtrPtr)); /* 7 */
+     void (*tclXML_libxml2_DestroyDocument) _ANSI_ARGS_((TclXML_libxml2_Document * tDocPtr)); /* 8 */
+     void (*tclXML_libxml2_DocKeep) _ANSI_ARGS_((Tcl_Obj * objPtr, TclXML_libxml2_DocumentHandling keep)); /* 9 */
+-    void (*tclXML_libxml2_ErrorHandler) _ANSI_ARGS_((void * ctx, xmlErrorPtr error)); /* 10 */
++    void (*tclXML_libxml2_ErrorHandler) _ANSI_ARGS_((void * ctx,
++#if LIBXML_VERSION >= 21200
++                const xmlError * error
++#else
++                xmlError * error
++#endif
++                )); /* 10 */
+     void (*tclXML_libxml2_ResetError) _ANSI_ARGS_((Tcl_Interp * interp)); /* 11 */
+     Tcl_Obj * (*tclXML_libxml2_GetErrorObj) _ANSI_ARGS_((Tcl_Interp * interp)); /* 12 */
+     void (*tclXML_libxml2_SetErrorNodeFunc) _ANSI_ARGS_((Tcl_Interp * interp, TclXML_ErrorNodeHandlerProc * proc)); /* 13 */

devel/tclxml/files/patch-tclxml.c

@@ -0,0 +1,11 @@
+--- tclxml.c.orig	2013-03-30 17:17:07 UTC
++++ tclxml.c
+@@ -20,6 +20,8 @@
+ #include <tclxslt/tclxslt.h>
+ #include <string.h>
+
++int Tcldom_libxml2_Init ( Tcl_Interp *interp );
++
+ #define TCL_DOES_STUBS \
+     (TCL_MAJOR_VERSION > 8 || TCL_MAJOR_VERSION == 8 && (TCL_MINOR_VERSION > 1 || \
+     (TCL_MINOR_VERSION == 1 && TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE)))

emulators/wine-devel/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	wine
 DISTVERSION=	9.11
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://dl.winehq.org/wine/source/9.x/

emulators/wine-devel/files/wine.sh

@@ -2,9 +2,12 @@
 
 TARGET="$(realpath "$0")"
 
-if [ -z "$WINESERVER" ] && [ -f "${TARGET}server32" ]
-then
-  export WINESERVER="${TARGET}server32"
+if [ -z "$WINESERVER" ]; then
+  if [ -f "${TARGET%/*}/wineserver32" ]; then
+    export WINESERVER="${TARGET%/*}/wineserver32"
+  elif [ -f "${TARGET%/*}/wineserver" ]; then
+    export WINESERVER="${TARGET%/*}/wineserver"
+  fi
 fi
 
 # Workaround for https://bugs.winehq.org/show_bug.cgi?id=50257

graphics/libdrm/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	libdrm
-PORTVERSION=	2.4.121
+PORTVERSION=	2.4.122
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://dri.freedesktop.org/libdrm/

graphics/libdrm/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1718002487
-SHA256 (libdrm-2.4.121.tar.xz) = 909084a505d7638887f590b70791b3bbd9069c710c948f5d1f1ce6d080cdfcab
-SIZE (libdrm-2.4.121.tar.xz) = 480840
+TIMESTAMP = 1719406329
+SHA256 (libdrm-2.4.122.tar.xz) = d9f5079b777dffca9300ccc56b10a93588cdfbc9dde2fae111940dfb6292f251
+SIZE (libdrm-2.4.122.tar.xz) = 481012

graphics/mesa-dri/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
@@ -9,68 +10,75 @@ LIB_DEPENDS+=	libglapi.so:graphics/mesa-libs
 
 USES+=		llvm:lib,noexport
 
-OPTIONS_GROUP=			PLATFORM
-OPTIONS_GROUP_PLATFORM=		PLATFORM_X11 PLATFORM_WAYLAND
-PLATFORM_X11_DESC=		Enable X11 support for GBM/EGL
-PLATFORM_WAYLAND_DESC=		Enable Wayland support for GBM/EGL
-PLATFORM_WAYLAND_IMPLIES=	WAYLAND
-
-OPTIONS_DEFINE=		WAYLAND ZSTD
-OPTIONS_DEFAULT=	WAYLAND PLATFORM_X11 PLATFORM_WAYLAND ZSTD
+OPTIONS_DEFINE=		ZSTD
+OPTIONS_GROUP=		GALLIUM PLATFORM VULKAN
+OPTIONS_DEFAULT=	WAYLAND X11 ZSTD
 OPTIONS_SUB=		yes
 
-WAYLAND_DESC=		Enable support for the Wayland platform in Vulkan drivers
-WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.8:graphics/wayland-protocols
-WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
-WAYLAND_IMPLIES=	PLATFORM_WAYLAND
-
 ZSTD_DESC=		Use ZSTD for shader cache
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_MESON_ENABLED=	zstd
 
-.include <bsd.port.options.mk>
-.include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
-
-ALL_GALLIUM_DRIVERS=	CROCUS I915 IRIS PANFROST R300 R600 RADEONSI SVGA \
-			SWRAST ZINK
-ALL_VULKAN_DRIVERS=	INTEL AMD SWRAST
-
-GALLIUM_DRIVERS+=	SWRAST \
-			ZINK
-VULKAN_DRIVERS+=	SWRAST	# lavapipe
+OPTIONS_GROUP_PLATFORM=	X11 WAYLAND
+X11_DESC=		Enable X11 support for GBM/EGL
+WAYLAND_DESC=		Enable Wayland support for GBM/EGL and Vulkan
+WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.8:graphics/wayland-protocols
+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 
-.if ${ARCH} == aarch64
-GALLIUM_DRIVERS+=	PANFROST
-.endif
+OPTIONS_GROUP_GALLIUM=	crocus i915 iris panfrost r300 r600 radeonsi svga swrast zink
+GALLIUM_DESC=		Unified OpenGL drivers
+crocus_DESC=		Intel GPU Gen4 (Broadwater) to Gen7 (Haswell)
+i915_DESC=		Intel GPU Gen3 (Grantsdale to Pineview)
+iris_DESC=		Intel GPU Gen8 (Broadwell) and newer
+panfrost_DESC=		ARM Midgard and Bifrost
+r300_DESC=		AMD/ATI R300, R400 and R500
+r600_DESC=		AMD/ATI R600, R700, Evergreen, Northern Islands
+radeonsi_DESC=		AMD/ATI Southern Islands and newer
+svga_DESC=		VMWare Virtual GPU
+swrast_DESC=		Software Rasterizer
+zink_DESC=		OpenGL on top of Khronos’ Vulkan API
+
+OPTIONS_EXCLUDE+=	${ARCH:Marmv7:C/.+/crocus i915 iris panfrost r300 r600 radeonsi svga zink/}
+OPTIONS_EXCLUDE+=	${ARCH:Naarch64:C/.+/panfrost/}
+OPTIONS_EXCLUDE+=	${ARCH:Namd64:Ni386:Nx86_64:C/.+/crocus i915 iris svga/}
+MESON_ARGS+=		-Dgallium-drivers=${GALLIUM_DRIVERS:ts,}
+. for _gd in ${OPTIONS_GROUP_GALLIUM}
+OPTIONS_DEFAULT+=	${_gd}
+${_gd}_VARS+=		GALLIUM_DRIVERS+=${_gd}
+. endfor
+
+OPTIONS_GROUP_VULKAN=	anv radv swrast_vk
+VULKAN_DESC=		Vulkan drivers
+anv_DESC=		Intel GPU Gen9 and newer Vulkan support
+radv_DESC=		AMD/ATI Southern Islands and newer Vulkan support
+radv_BUILD_DEPENDS=	glslangValidator:graphics/glslang
+swrast_vk_DESC=		Software Rasterizer Vulkan support
+
+OPTIONS_EXCLUDE+=	${ARCH:Marmv7:C/.+/anv radv/}
+OPTIONS_EXCLUDE+=	${ARCH:Namd64:Ni386:Nx86_64:C/.+/anv/}
+MESON_ARGS+=		-Dvulkan-drivers=${VULKAN_DRIVERS:ts,}
+. for _vd in ${OPTIONS_GROUP_VULKAN}
+OPTIONS_DEFAULT+=	${_vd}
+${_vd}_VARS+=		VULKAN_DRIVERS+=${_vd:S/anv/intel/:S/radv/amd/:S/swrast_vk/swrast/}
+. endfor
 
-.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 \
- || ${ARCH:Mpowerpc*} || ${ARCH} == riscv64
-GALLIUM_DRIVERS+=	R300 R600 RADEONSI
-VULKAN_DRIVERS+=	AMD
-BUILD_DEPENDS+=		glslangValidator:graphics/glslang
-.endif
-.if ${ARCH} == amd64 || ${ARCH} == i386
-GALLIUM_DRIVERS+=	CROCUS I915 IRIS SVGA
-VULKAN_DRIVERS+=	INTEL
-.endif
+.include <bsd.port.options.mk>
+.include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
 LDFLAGS_i386=		-Wl,-znotext
 
-.if ${PORT_OPTIONS:MPLATFORM_X11}
+.if ${PORT_OPTIONS:MX11}
 MESA_PLATFORMS+=	x11
-USE_XORG+=		xorgproto x11 xdamage xext xfixes xshmfence xv
-.if defined(VULKAN_DRIVERS)
-USE_XORG+=		xcb xrandr
-.endif
+USE_XORG+=		xcb xorgproto xrandr x11 xdamage xext xfixes xshmfence xv
+.else
+MESON_ARGS+=		-Dxlib-lease=disabled
 .endif
 
-.if ${PORT_OPTIONS:MPLATFORM_WAYLAND}
+.if ${PORT_OPTIONS:MWAYLAND}
 MESA_PLATFORMS+=	wayland
 .endif
 
-MESON_ARGS+=	-Dgallium-drivers="${GALLIUM_DRIVERS:ts,:tl}" \
-		-Dvulkan-drivers="${VULKAN_DRIVERS:ts,:tl}" \
-		-Dplatforms="${MESA_PLATFORMS:ts,:tl}"
+MESON_ARGS+=	-Dplatforms="${MESA_PLATFORMS:ts,:tl}"
 
 # Vulkan Video extensions (keep in sync with mesa-gallium-va)
 MESON_ARGS+=	-Dvideo-codecs="vc1dec,h264dec,h264enc,h265dec,h265enc,av1dec,av1enc,vp9dec"
@@ -89,20 +97,20 @@ MESON_ARGS+=	-Dandroid-libbacktrace=disabled \
 		-Dosmesa=false \
 		-Dvalgrind=disabled
 
-.for _gd in ${ALL_GALLIUM_DRIVERS}
+.for _gd in ${OPTIONS_GROUP_GALLIUM}
 . if defined(GALLIUM_DRIVERS) && ${GALLIUM_DRIVERS:M${_gd}}
-PLIST_SUB+=	${_gd}_GDRIVER=""
+PLIST_SUB+=	${_gd}=""
 . else
-PLIST_SUB+=	${_gd}_GDRIVER="@comment "
+PLIST_SUB+=	${_gd}="@comment "
 . endif
 .endfor
 
 PLIST_SUB += ARCH=${ARCH:S/amd/x86_/}
-.for _vd in ${ALL_VULKAN_DRIVERS}
+.for _vd in ${OPTIONS_GROUP_VULKAN}
 . if defined(VULKAN_DRIVERS) && ${VULKAN_DRIVERS:M${_vd}}
-PLIST_SUB+=	${_vd}_VDRIVER=""
+PLIST_SUB+=	${_vd}=""
 . else
-PLIST_SUB+=	${_vd}_VDRIVER="@comment "
+PLIST_SUB+=	${_vd}="@comment "
 . endif
 .endfor
 

graphics/mesa-dri/Makefile.common

@@ -28,7 +28,7 @@ COMPONENT=	${PORTNAME:tl:C/^lib//:C/mesa-//}
 
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
 .if ${COMPONENT} != clover
-.if ${PORT_OPTIONS:MPLATFORM_X11}
+.if ${PORT_OPTIONS:MX11}
 USES+=	xorg
 .endif
 .endif

graphics/mesa-dri/pkg-plist

@@ -21,18 +21,18 @@ include/GL/internal/dri_interface.h
 @comment include/GLES3/gl3platform.h
 @comment include/KHR/khrplatform.h
 @comment include/gbm.h
-%%CROCUS_GDRIVER%%lib/dri/crocus_dri.so
-%%I915_GDRIVER%%lib/dri/i915_dri.so
-%%IRIS_GDRIVER%%lib/dri/iris_dri.so
-%%PANFROST_GDRIVER%%lib/dri/panfrost_dri.so
-%%PANFROST_GDRIVER%%lib/dri/rockchip_dri.so
-%%SWRAST_GDRIVER%%lib/dri/kms_swrast_dri.so
-%%R300_GDRIVER%%lib/dri/r300_dri.so
-%%R600_GDRIVER%%lib/dri/r600_dri.so
-%%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so
-%%SWRAST_GDRIVER%%lib/dri/swrast_dri.so
-%%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so
-%%ZINK_GDRIVER%%lib/dri/zink_dri.so
+%%crocus%%lib/dri/crocus_dri.so
+%%i915%%lib/dri/i915_dri.so
+%%iris%%lib/dri/iris_dri.so
+%%panfrost%%lib/dri/panfrost_dri.so
+%%panfrost%%lib/dri/rockchip_dri.so
+%%r300%%lib/dri/r300_dri.so
+%%r600%%lib/dri/r600_dri.so
+%%radeonsi%%lib/dri/radeonsi_dri.so
+%%svga%%lib/dri/vmwgfx_dri.so
+%%swrast%%lib/dri/kms_swrast_dri.so
+%%swrast%%lib/dri/swrast_dri.so
+%%zink%%lib/dri/zink_dri.so
 @comment lib/libEGL.so
 @comment lib/libEGL.so.1
 @comment lib/libEGL.so.1.0.0
@@ -48,17 +48,17 @@ include/GL/internal/dri_interface.h
 @comment lib/libGLESv2.so
 @comment lib/libGLESv2.so.2
 @comment lib/libGLESv2.so.2.0.0
-%%INTEL_VDRIVER%%lib/libvulkan_intel.so
-%%AMD_VDRIVER%%lib/libvulkan_radeon.so
-%%SWRAST_VDRIVER%%lib/libvulkan_lvp.so
+%%anv%%lib/libvulkan_intel.so
+%%radv%%lib/libvulkan_radeon.so
+%%swrast_vk%%lib/libvulkan_lvp.so
 libdata/pkgconfig/dri.pc
 @comment libdata/pkgconfig/egl.pc
 @comment libdata/pkgconfig/gbm.pc
 @comment libdata/pkgconfig/glesv1_cm.pc
 @comment libdata/pkgconfig/glesv2.pc
 share/drirc.d/00-mesa-defaults.conf
-%%AMD_VDRIVER%%share/drirc.d/00-radv-defaults.conf
+%%radv%%share/drirc.d/00-radv-defaults.conf
 share/drirc.d/01-freebsd.conf
-%%INTEL_VDRIVER%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json
-%%AMD_VDRIVER%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json
-%%SWRAST_VDRIVER%%share/vulkan/icd.d/lvp_icd.%%ARCH%%.json
+%%anv%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json
+%%radv%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json
+%%swrast_vk%%share/vulkan/icd.d/lvp_icd.%%ARCH%%.json