diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 815ddc85b796..73bfd812c5ed 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	hamlib
-PORTVERSION=	4.6.2
+PORTVERSION=	4.6.4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Shared libraries for Amateur Radio Equipment Control Applications
 WWW=		https://sourceforge.net/projects/hamlib/
 
 LICENSE=	LGPL20
 
 BUILD_DEPENDS=	swig:devel/swig
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		autoreconf gnome libtool:keepla localbase:ldflags pathfix perl5 pkgconfig python \
 		readline shebangfix tcl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PERL5=	build run
 USE_PYTHON=	py3kplist
 
 # $TCL_INCLUDE_SPEC
 SHEBANG_FILES=	bindings/perltest.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-perl-binding \
 		--with-tcl-binding --with-tcl=${TCL_LIBDIR} \
 		--with-libusb \
 		--with-python-binding
 CONFIGURE_ENV=	LIBUSB_LIBS="-lusb" cf_with_cxx=yes
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 PLIST_SUB=	TCL_VER=${TCL_VER}
 OPTIONS_DEFINE=	DOCS
 
 post-build:
 	${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' \
 		${WRKSRC}/bindings/Hamlib-pl.mk
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Hamlib/Hamlib.so
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for d in ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB \
 		${WRKSRC}/ChangeLog ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE \
 		${WRKSRC}/NEWS ${WRKSRC}/PLAN ${WRKSRC}/README \
 		${WRKSRC}/README.betatester ${WRKSRC}/README.osx \
 		${WRKSRC}/README.developer ${WRKSRC}/README.freqranges \
 		${WRKSRC}/README.multicast ${WRKSRC}/THANKS
 	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/comms/hamlib/distinfo b/comms/hamlib/distinfo
index 1819c1b60421..bffbec620322 100644
--- a/comms/hamlib/distinfo
+++ b/comms/hamlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740612702
-SHA256 (hamlib-4.6.2.tar.gz) = b2ac73f44dd1161e95fdee6c95276144757647bf92d7fdb369ee2fe41ed47ae8
-SIZE (hamlib-4.6.2.tar.gz) = 2909790
+TIMESTAMP = 1752936628
+SHA256 (hamlib-4.6.4.tar.gz) = 5a92e93e805b2263c63da40028d67580fda15752b5389c68b237203f29b592bb
+SIZE (hamlib-4.6.4.tar.gz) = 2923171
diff --git a/comms/hamlib/files/patch-tests_rigtestlibusb.c b/comms/hamlib/files/patch-tests_rigtestlibusb.c
new file mode 100644
index 000000000000..b653eb405f97
--- /dev/null
+++ b/comms/hamlib/files/patch-tests_rigtestlibusb.c
@@ -0,0 +1,43 @@
+--- tests/rigtestlibusb.c.orig	2025-07-18 18:31:35 UTC
++++ tests/rigtestlibusb.c
+@@ -116,8 +116,12 @@ static void print_ss_usb_cap(const struct
+     printf("      bmAttributes:          %02xh\n", ss_usb_cap->bmAttributes);
+     printf("      wSpeedSupported:       %u\n", ss_usb_cap->wSpeedSupported);
+     printf("      bFunctionalitySupport: %u\n", ss_usb_cap->bFunctionalitySupport);
+-    printf("      bU1devExitLat:         %u\n", ss_usb_cap->bU1DevExitLat);
++    printf("      wU1devExitLat:         %u\n", ss_usb_cap->bU1DevExitLat);
++#ifdef __FreeBSD__
++    printf("      wU2devExitLat:         %u\n", ss_usb_cap->wU2DevExitLat);
++#else
+     printf("      bU2devExitLat:         %u\n", ss_usb_cap->bU2DevExitLat);
++#endif
+ }
+ 
+ static void print_bos(libusb_device_handle *handle)
+@@ -133,11 +137,17 @@ static void print_bos(libusb_device_handle *handle)
+         return;
+     }
+ 
++
+     printf("  Binary Object Store (BOS):\n");
+     printf("    wTotalLength:            %u\n", bos->wTotalLength);
++#ifdef __FreeBSD__
++    printf("    bNumDeviceCapabilities:          %u\n", bos->bNumDeviceCapabilities);
++    for (i = 0; i < bos->bNumDeviceCapabilities; i++)
++#else
+     printf("    bNumDeviceCaps:          %u\n", bos->bNumDeviceCaps);
+-
+     for (i = 0; i < bos->bNumDeviceCaps; i++)
++#endif
++
+     {
+         struct libusb_bos_dev_capability_descriptor *dev_cap = bos->dev_capability[i];
+ 
+@@ -172,7 +182,6 @@ static void print_bos(libusb_device_handle *handle)
+             libusb_free_ss_usb_device_capability_descriptor(ss_dev_cap);
+         }
+     }
+-
+     libusb_free_bos_descriptor(bos);
+ }
+