git: 992d8c6095c0 - main - cad/k40-whisperer: Update 0.59 => 0.70, take maintainership

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Älven <alven_at_FreeBSD.org>
Date: Sun, 19 Oct 2025 21:03:05 UTC
The branch main has been updated by alven:

URL: https://cgit.FreeBSD.org/ports/commit/?id=992d8c6095c080a85646c422f84effdeec03fea6

commit 992d8c6095c080a85646c422f84effdeec03fea6
Author:     Älven <alven@FreeBSD.org>
AuthorDate: 2025-10-18 23:06:35 +0000
Commit:     Älven <alven@FreeBSD.org>
CommitDate: 2025-10-19 21:02:53 +0000

    cad/k40-whisperer: Update 0.59 => 0.70, take maintainership
    
    Changelogs:
    * https://www.scorchworks.com/K40whisperer/k40whisperer_change_log.html
    
    * Make DOCS option actually work
    * Pet portclippy(1) and portfmt(1)
    
    Approved by:            yuri@ (Mentor)
    Differential Revision:  https://reviews.freebsd.org/D53192
---
 cad/k40-whisperer/Makefile  | 23 +++++++++++++----------
 cad/k40-whisperer/distinfo  |  6 +++---
 cad/k40-whisperer/pkg-plist |  6 +++---
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/cad/k40-whisperer/Makefile b/cad/k40-whisperer/Makefile
index 33da3eede4b5..8b93a07254a8 100644
--- a/cad/k40-whisperer/Makefile
+++ b/cad/k40-whisperer/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	k40-whisperer
-DISTVERSION=	0.59
-PORTREVISION=	3
+DISTVERSION=	0.70
 CATEGORIES=	cad python
-MASTER_SITES=	http://www.scorchworks.com/K40whisperer/
+MASTER_SITES=	https://www.scorchworks.com/K40whisperer/
 DISTNAME=	K40_Whisperer-${DISTVERSION}_src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alven@FreeBSD.org
 COMMENT=	GUI control software for the stock K40 laser cutter controller
 WWW=		https://www.scorchworks.com/K40whisperer/k40whisperer.html
 
@@ -13,10 +12,11 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/gpl-3.0.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyusb>0:devel/py-pyusb@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyusb>0:devel/py-pyusb@${PY_FLAVOR}
 
 USES=		python:run shebangfix zip
+
 SHEBANG_FILES=	*.py
 
 DESKTOP_ENTRIES=	"K40 Whisperer" \
@@ -30,9 +30,11 @@ NO_BUILD=	yes
 SUB_FILES=	${_WHISPERER_COMMAND} pkg-message
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		WHISPERER_COMMAND=${_WHISPERER_COMMAND}
+
 PLIST_SUB=	WHISPERER_COMMAND=${_WHISPERER_COMMAND}
 
 OPTIONS_DEFINE=	DOCS
+OPTIONS_SUB=	yes
 
 _DOCS=			Change_Log.txt README_Linux.txt README_MacOS.md
 _NON_DATA_FILES=	${_DOCS} ${LICENSE_FILE:S,${WRKSRC}/,,} build_exe.bat \
@@ -41,10 +43,11 @@ _WHISPERER_COMMAND=	${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${_WHISPERER_COMMAND} ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} . \
-		${STAGEDIR}${DATADIR} "${_NON_DATA_FILES:S,^,! -name &,}")
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${DATADIR} "${_NON_DATA_FILES:S,^,! -name &,}"
+
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${_DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/k40-whisperer/distinfo b/cad/k40-whisperer/distinfo
index 3154b22c9676..41c8625432e9 100644
--- a/cad/k40-whisperer/distinfo
+++ b/cad/k40-whisperer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642969006
-SHA256 (K40_Whisperer-0.59_src.zip) = b005d96e45d5cffcf7cf3680a77b5fc49429fc928acfd3be5db7ae5351759c47
-SIZE (K40_Whisperer-0.59_src.zip) = 202288
+TIMESTAMP = 1760826757
+SHA256 (K40_Whisperer-0.70_src.zip) = 43e0395081f0cad42f391d61d2c9cb427edbcd10c9fcb895b42d1409335d45da
+SIZE (K40_Whisperer-0.70_src.zip) = 207089
diff --git a/cad/k40-whisperer/pkg-plist b/cad/k40-whisperer/pkg-plist
index 55d4ad0e741f..582578814114 100644
--- a/cad/k40-whisperer/pkg-plist
+++ b/cad/k40-whisperer/pkg-plist
@@ -1,7 +1,7 @@
 bin/%%WHISPERER_COMMAND%%
-%%PORTDOCS%%%%DOCSDIR%%/Change_Log.txt
-%%PORTDOCS%%%%DOCSDIR%%/README_Linux.txt
-%%PORTDOCS%%%%DOCSDIR%%/README_MacOS.md
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Change_Log.txt
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README_Linux.txt
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README_MacOS.md
 %%DATADIR%%/LaserSpeed.py
 %%DATADIR%%/bezmisc.py
 %%DATADIR%%/convex_hull.py