diff --git a/x11/hamclock/Makefile b/x11/hamclock/Makefile
index 745bf81c5b00..a10e243de426 100644
--- a/x11/hamclock/Makefile
+++ b/x11/hamclock/Makefile
@@ -1,46 +1,40 @@
 PORTNAME=	hamclock
-DISTVERSION=	4.21
+DISTVERSION=	4.22
 CATEGORIES=	x11 hamradio
 MASTER_SITES=	https://www.clearskyinstitute.com/ham/HamClock/
 DISTNAME=	ESPHamClock
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Handy clock with features for amateur radio operators
 WWW=		https://www.clearskyinstitute.com/ham/HamClock/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcurl.so:ftp/curl
-
-USES=		desktop-file-utils gmake xorg zip
-USE_XORG=	x11
+USES=		gmake xorg zip desktop-file-utils
+USE_XORG=	x11 xorgproto
 
 PLIST_FILES=	bin/hamclock \
 		share/applications/hamclock.desktop \
 		share/icons/hicolor/48x48/apps/hamclock.png
 
 OPTIONS_DEFAULT=		SIZE1
 OPTIONS_SINGLE=			RESOLUTION
 OPTIONS_SINGLE_RESOLUTION=	SIZE1 SIZE2 SIZE3 SIZE4
 SIZE1_DESC=			Use 800x440 resolution
 SIZE2_DESC=			Use 1600x960 resolution
 SIZE3_DESC=			Use 2400x1440 resolution
 SIZE4_DESC=			Use 3200x1920 resolution
 
 SIZE1_ALL_TARGET=	hamclock-800x480
 SIZE2_ALL_TARGET=	hamclock-1600x960
 SIZE3_ALL_TARGET=	hamclock-2400x1440
 SIZE4_ALL_TARGET=	hamclock-3200x1920
 
-post-patch:
-	${REINPLACE_CMD} -e 's|CXX =|CXX ?=|g' ${WRKSRC}/ArduinoLib/Makefile
-	${REINPLACE_CMD} -e 's|/home/pi/.hamclock/||g' ${WRKSRC}/${PORTNAME}.desktop
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps
 	${INSTALL_PROGRAM} ${WRKSRC}/${ALL_TARGET} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/
 
 .include <bsd.port.mk>
diff --git a/x11/hamclock/distinfo b/x11/hamclock/distinfo
index 4c9ce98b08ab..f946bfde8b69 100644
--- a/x11/hamclock/distinfo
+++ b/x11/hamclock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1757637797
-SHA256 (ESPHamClock.zip) = 8ad3593d64c23f98c946486f3a74519cffeea3fc568f702bab8a1c0cbe8cb7c0
-SIZE (ESPHamClock.zip) = 2023767
+TIMESTAMP = 1768903148
+SHA256 (ESPHamClock.zip) = 863e9f56fa2a6788d11b329dfd04ee60ce851933f6f5bebcccb7e7cd098a41e0
+SIZE (ESPHamClock.zip) = 2021657
diff --git a/x11/hamclock/files/patch-ArduinoLib_Makefile b/x11/hamclock/files/patch-ArduinoLib_Makefile
new file mode 100644
index 000000000000..0767b02fa74e
--- /dev/null
+++ b/x11/hamclock/files/patch-ArduinoLib_Makefile
@@ -0,0 +1,11 @@
+--- ArduinoLib/Makefile.orig	2025-04-11 14:48:58 UTC
++++ ArduinoLib/Makefile
+@@ -4,7 +4,7 @@
+ 
+ .PHONY: default
+ 
+-CXX = g++
++CXX ?= g++
+ 
+ OBJS = \
+ 	Adafruit_BME280.o \
diff --git a/x11/hamclock/files/patch-Makefile b/x11/hamclock/files/patch-Makefile
index 5d70d53d6be9..fe97389e060d 100644
--- a/x11/hamclock/files/patch-Makefile
+++ b/x11/hamclock/files/patch-Makefile
@@ -1,21 +1,21 @@
 --- Makefile.orig	2025-09-12 00:49:22 UTC
 +++ Makefile
 @@ -13,7 +13,8 @@
  .PHONY: clean clobber help hclibs
  
  # build flags common to all options and architectures
 -CXXFLAGS = -IArduinoLib -IwsServer/include -Izlib-hc -I. -g -O2 -Wall -pthread -std=c++17
 +CXXFLAGS ?= -g -O2 -Wall
-+CXXFLAGS += -IArduinoLib -I. -DARDUINO=100 -std=c++0x
++CXXFLAGS += -IArduinoLib -IwsServer/include -Izlib-hc -I. -std=c++17
  # CXXFLAGS += -Wextra -pedantic -Werror -Wno-attributes -Wno-unknown-pragmas
  
  # add explicit framebuffer depth as _FB_DEPTH if defined
 @@ -28,7 +29,7 @@ LIBS = -lpthread -larduino -lzlib-hc -lws
  
  LDXXFLAGS = -LArduinoLib -LwsServer -Lzlib-hc -g -pthread
  LIBS = -lpthread -larduino -lzlib-hc -lws
 -CXX = g++
 +CXX ?= g++
  
  # macOS does not have X11 by default; this assumes XQuartz or macports xorg has been installed
  ifeq ($(shell uname -s), Darwin)
diff --git a/x11/hamclock/files/patch-hamclock.desktop b/x11/hamclock/files/patch-hamclock.desktop
new file mode 100644
index 000000000000..108add5bf9d9
--- /dev/null
+++ b/x11/hamclock/files/patch-hamclock.desktop
@@ -0,0 +1,11 @@
+--- hamclock.desktop.orig	2025-05-18 12:15:40 UTC
++++ hamclock.desktop
+@@ -1,7 +1,7 @@ Exec=/usr/local/bin/hamclock
+ [Desktop Entry]
+ Name=HamClock
+ Exec=/usr/local/bin/hamclock
+-Icon=/home/pi/.hamclock/hamclock.png
++Icon=hamclock.png
+ Terminal=false
+ Type=Application
+ Categories=HamRadio