git: 607dc303e452 - main - x11/hamclock: Update 2.80 => 4.21

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Älven <alven_at_FreeBSD.org>
Date: Sat, 13 Sep 2025 16:03:16 UTC
The branch main has been updated by alven:

URL: https://cgit.FreeBSD.org/ports/commit/?id=607dc303e45242ba723ce3fa1cae21ef363be34a

commit 607dc303e45242ba723ce3fa1cae21ef363be34a
Author:     wen <wenheping2000@hotmail.com>
AuthorDate: 2025-09-13 10:23:27 +0000
Commit:     Älven <alven@FreeBSD.org>
CommitDate: 2025-09-13 16:02:50 +0000

    x11/hamclock: Update 2.80 => 4.21
    
    Changelogs:
    * https://www.clearskyinstitute.com/ham/HamClock/#tab-download
    
    * Pet portfmt(1) and portlint(1)
    
    PR:             289479
    Approved by:    hamradio@ (alven@)
    Approved by:    yuri@ (Mentor)
---
 x11/hamclock/Makefile                      | 26 +++++++++++-----------
 x11/hamclock/distinfo                      |  6 ++---
 x11/hamclock/files/patch-ESPHamClock.ino   | 21 ------------------
 x11/hamclock/files/patch-Makefile          | 35 ++++++++++++------------------
 x11/hamclock/files/patch-liveweb.cpp       | 11 ++++++++++
 x11/hamclock/files/patch-wsServer_Makefile | 11 ++++++++++
 x11/hamclock/files/patch-zlib-hc_Makefile  |  8 +++++++
 7 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/x11/hamclock/Makefile b/x11/hamclock/Makefile
index 6d0e53377343..745bf81c5b00 100644
--- a/x11/hamclock/Makefile
+++ b/x11/hamclock/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	hamclock
-PORTVERSION=	2.80
+DISTVERSION=	4.21
 CATEGORIES=	x11 hamradio
 MASTER_SITES=	https://www.clearskyinstitute.com/ham/HamClock/
 DISTNAME=	ESPHamClock
@@ -8,7 +8,7 @@ MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Handy clock with features for amateur radio operators
 WWW=		https://www.clearskyinstitute.com/ham/HamClock/
 
-LICENSE=        MIT
+LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
@@ -16,23 +16,23 @@ LIB_DEPENDS=	libcurl.so:ftp/curl
 USES=		desktop-file-utils gmake xorg zip
 USE_XORG=	x11
 
-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
-OPTIONS_DEFAULT=	SIZE1
+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
 
-PLIST_FILES=	bin/hamclock \
-		share/applications/hamclock.desktop \
-		share/icons/hicolor/48x48/apps/hamclock.png
-
 post-patch:
 	${REINPLACE_CMD} -e 's|CXX =|CXX ?=|g' ${WRKSRC}/ArduinoLib/Makefile
 	${REINPLACE_CMD} -e 's|/home/pi/.hamclock/||g' ${WRKSRC}/${PORTNAME}.desktop
diff --git a/x11/hamclock/distinfo b/x11/hamclock/distinfo
index 63b04516e08f..4c9ce98b08ab 100644
--- a/x11/hamclock/distinfo
+++ b/x11/hamclock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659656620
-SHA256 (ESPHamClock.zip) = 1e80ec6b45de087676e5c393c7be96af28552759f9422a8c2058d9051a16c9b5
-SIZE (ESPHamClock.zip) = 1763734
+TIMESTAMP = 1757637797
+SHA256 (ESPHamClock.zip) = 8ad3593d64c23f98c946486f3a74519cffeea3fc568f702bab8a1c0cbe8cb7c0
+SIZE (ESPHamClock.zip) = 2023767
diff --git a/x11/hamclock/files/patch-ESPHamClock.ino b/x11/hamclock/files/patch-ESPHamClock.ino
deleted file mode 100644
index ab69d7320c20..000000000000
--- a/x11/hamclock/files/patch-ESPHamClock.ino
+++ /dev/null
@@ -1,21 +0,0 @@
---- ESPHamClock.ino.orig	2022-07-02 11:59:16 UTC
-+++ ESPHamClock.ino
-@@ -1,6 +1,9 @@
- /* HamClock
-  */
- 
-+#if defined(__FreeBSD__)
-+#include <execinfo.h>
-+#endif
- 
- // glue
- #include "HamClock.h"
-@@ -1605,7 +1608,7 @@ static void drawUptime(bool force)
-     // draw two most significant units if change
-     if (upsecs < 60) {
-         prepUptime();
--        tft.print(upsecs); tft.print(F("s "));
-+        tft.print((long)upsecs); tft.print(F("s "));
-     } else if (upsecs < 3600) {
-         prepUptime();
-         tft.print(mins); tft.print(F("m "));
diff --git a/x11/hamclock/files/patch-Makefile b/x11/hamclock/files/patch-Makefile
index 2ca33b392167..5d70d53d6be9 100644
--- a/x11/hamclock/files/patch-Makefile
+++ b/x11/hamclock/files/patch-Makefile
@@ -1,28 +1,21 @@
---- Makefile.orig	2022-03-30 19:58:30.000000000 -0500
-+++ Makefile	2022-04-30 15:52:35.521899000 -0500
-@@ -8,10 +8,11 @@
- .PHONY: clean clobber help
+--- 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 -I. -g -O2 -Wall -DARDUINO=100 -pthread -std=c++0x
+-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
- LDXXFLAGS = -LArduinoLib -g -pthread
- LIBS = -lpthread -larduino
--CXX = g++
-+CXX ?= g++
- 
+ # CXXFLAGS += -Wextra -pedantic -Werror -Wno-attributes -Wno-unknown-pragmas
  
- # macOS does not have X11 by default; this assumes XQuartz has been installed
-@@ -20,6 +21,11 @@
-     LDXXFLAGS += -L/opt/X11/lib
- endif
+ # add explicit framebuffer depth as _FB_DEPTH if defined
+@@ -28,7 +29,7 @@ LIBS = -lpthread -larduino -lzlib-hc -lws
  
-+ifeq ($(shell uname -s), FreeBSD)
-+    CXXFLAGS += -I$(LOCALBASE)/include
-+    LDXXFLAGS += -L$(LOCALBASE)/lib
-+    LIBS = -pthread -larduino -lexecinfo
-+endif
+ LDXXFLAGS = -LArduinoLib -LwsServer -Lzlib-hc -g -pthread
+ LIBS = -lpthread -larduino -lzlib-hc -lws
+-CXX = g++
++CXX ?= g++
  
- # FreeBSD needs libgpio
- ifeq ($(shell [ -r /usr/include/libgpio.h ]; echo $$?), 0)
+ # 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-liveweb.cpp b/x11/hamclock/files/patch-liveweb.cpp
new file mode 100644
index 000000000000..2e75073c1409
--- /dev/null
+++ b/x11/hamclock/files/patch-liveweb.cpp
@@ -0,0 +1,11 @@
+--- liveweb.cpp.orig	2025-09-12 01:16:46 UTC
++++ liveweb.cpp
+@@ -12,7 +12,7 @@
+ #include "HamClock.h"
+ 
+ // web socket library
+-#include "ws.h"
++#include "wsServer/include/ws.h"
+ 
+ 
+ // import png writer -- complete implementation in a header file -- amazing.
diff --git a/x11/hamclock/files/patch-wsServer_Makefile b/x11/hamclock/files/patch-wsServer_Makefile
new file mode 100644
index 000000000000..d7e661f185c5
--- /dev/null
+++ b/x11/hamclock/files/patch-wsServer_Makefile
@@ -0,0 +1,11 @@
+--- wsServer/Makefile.orig	2025-09-12 01:18:14 UTC
++++ wsServer/Makefile
+@@ -13,7 +13,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>
+ 
+-CC        = g++
++CC       ?= g++
+ AR        = ar
+ ARFLAGS   = r
+ CXXFLAGS  += -Iinclude
diff --git a/x11/hamclock/files/patch-zlib-hc_Makefile b/x11/hamclock/files/patch-zlib-hc_Makefile
new file mode 100644
index 000000000000..c35648db1702
--- /dev/null
+++ b/x11/hamclock/files/patch-zlib-hc_Makefile
@@ -0,0 +1,8 @@
+--- zlib-hc/Makefile.orig	2025-09-12 01:19:05 UTC
++++ zlib-hc/Makefile
+@@ -1,4 +1,4 @@
+-CXX=g++
++CXX?=	g++
+ 
+ LIBOBJ =  \
+ 	adler32.o \