diff --git a/misc/comfy-cli/Makefile b/misc/comfy-cli/Makefile index a907d698f379..1568d2bc9d7f 100644 --- a/misc/comfy-cli/Makefile +++ b/misc/comfy-cli/Makefile @@ -1,47 +1,47 @@ PORTNAME= comfy-cli DISTVERSIONPREFIX= v -DISTVERSION= 1.6.0 +DISTVERSION= 1.7.2 CATEGORIES= misc python # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= CLI for ComfyUI, a node-based workflow system for AI image generation WWW= https://docs.comfy.org/comfy-cli/getting-started \ https://github.com/Comfy-Org/comfy-cli LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}charset-normalizer>=3:textproc/py-charset-normalizer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cookiecutter>0:devel/py-cookiecutter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gitpython>0:devel/py-gitpython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httpx>0:www/py-httpx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mixpanel>0:misc/py-mixpanel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pathspec>0:devel/py-pathspec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}questionary>0:devel/py-questionary@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rich>0:textproc/py-rich@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ruff>0:devel/py-ruff@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}semver>=3.0.2:devel/py-semver@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tomlkit>0:textproc/py-tomlkit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typer>=0.12.5:devel/py-typer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.7:devel/py-typing-extensions@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}uv>=0.6.9:devel/py-uv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${PY_FLAVOR} USES= python USE_PYTHON= pep517 concurrent autoplist USE_GITHUB= yes GH_ACCOUNT= Comfy-Org NO_ARCH= yes post-patch: # fix version in pyproject.toml @${REINPLACE_CMD} -e 's|version = "0.0.0"|version = "${DISTVERSION}"|' ${WRKSRC}/pyproject.toml .include diff --git a/misc/comfy-cli/distinfo b/misc/comfy-cli/distinfo index 4344bea1da2e..72331a1f486e 100644 --- a/misc/comfy-cli/distinfo +++ b/misc/comfy-cli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1774123313 -SHA256 (Comfy-Org-comfy-cli-v1.6.0_GH0.tar.gz) = 04d120ff34ab4020fce8ce21502275ae9423099bab2616f8170fa07fc6777aa4 -SIZE (Comfy-Org-comfy-cli-v1.6.0_GH0.tar.gz) = 4501799 +TIMESTAMP = 1776097166 +SHA256 (Comfy-Org-comfy-cli-v1.7.2_GH0.tar.gz) = 7e5148c66e84a784fe7b51a57f8a408757611da4e64a1f5d9ea8d61700547f4f +SIZE (Comfy-Org-comfy-cli-v1.7.2_GH0.tar.gz) = 4564884 diff --git a/misc/comfy-cli/files/patch-comfy__cli_constants.py b/misc/comfy-cli/files/patch-comfy__cli_constants.py index f3a6d2481d4a..6f1e0c7a0cf1 100644 --- a/misc/comfy-cli/files/patch-comfy__cli_constants.py +++ b/misc/comfy-cli/files/patch-comfy__cli_constants.py @@ -1,25 +1,25 @@ ---- comfy_cli/constants.py.orig 2026-03-22 01:40:43 UTC +--- comfy_cli/constants.py.orig 2026-04-12 14:28:25 UTC +++ comfy_cli/constants.py @@ -6,6 +6,7 @@ class OS(str, Enum): WINDOWS = "windows" MACOS = "macos" LINUX = "linux" + FREEBSD = "freebsd" class PROC(str, Enum): -@@ -21,12 +22,14 @@ DEFAULT_COMFY_WORKSPACE = { +@@ -22,12 +23,14 @@ DEFAULT_COMFY_WORKSPACE = { OS.WINDOWS: os.path.join(os.path.expanduser("~"), "Documents", "comfy", "ComfyUI"), OS.MACOS: os.path.join(os.path.expanduser("~"), "Documents", "comfy", "ComfyUI"), OS.LINUX: os.path.join(os.path.expanduser("~"), "comfy", "ComfyUI"), + OS.FREEBSD: os.path.join(os.path.expanduser("~"), "comfy", "ComfyUI"), } DEFAULT_CONFIG = { OS.WINDOWS: os.path.join(os.path.expanduser("~"), "AppData", "Local", "comfy-cli"), OS.MACOS: os.path.join(os.path.expanduser("~"), "Library", "Application Support", "comfy-cli"), OS.LINUX: os.path.join(os.path.expanduser("~"), ".config", "comfy-cli"), + OS.FREEBSD: os.path.join(os.path.expanduser("~"), ".config", "comfy-cli"), } CONTEXT_KEY_WORKSPACE = "workspace" diff --git a/misc/comfy-cli/files/patch-comfy__cli_standalone.py b/misc/comfy-cli/files/patch-comfy__cli_standalone.py index 4a8e8568972a..65c841c6b114 100644 --- a/misc/comfy-cli/files/patch-comfy__cli_standalone.py +++ b/misc/comfy-cli/files/patch-comfy__cli_standalone.py @@ -1,17 +1,14 @@ ---- comfy_cli/standalone.py.orig 2026-03-22 01:45:24 UTC +--- comfy_cli/standalone.py.orig 2026-04-12 14:28:25 UTC +++ comfy_cli/standalone.py -@@ -68,7 +68,12 @@ def download_standalone_python( - """grab a pre-built distro from the python-build-standalone project. See +@@ -69,6 +69,11 @@ def download_standalone_python( https://gregoryszorc.com/docs/python-build-standalone/main/""" platform = get_os() if platform is None else platform proc = get_proc() if proc is None else proc -- target = _platform_targets[(platform, proc)] + if (platform, proc) not in _platform_targets: + raise NotImplementedError( + f"Standalone Python download is not supported on {platform.value}/{proc.value}. " + "The python-build-standalone project does not provide builds for this platform." + ) -+ target = _platform_targets[(platform, proc)] + target = _platform_targets[(platform, proc)] if tag == "latest": - # try to fetch json with info about latest release diff --git a/misc/comfy-cli/files/patch-comfy__cli_utils.py b/misc/comfy-cli/files/patch-comfy__cli_utils.py index 087888127a8f..6a5a66769524 100644 --- a/misc/comfy-cli/files/patch-comfy__cli_utils.py +++ b/misc/comfy-cli/files/patch-comfy__cli_utils.py @@ -1,21 +1,20 @@ ---- comfy_cli/utils.py.orig 2026-03-22 01:45:24 UTC +--- comfy_cli/utils.py.orig 2026-04-12 14:28:25 UTC +++ comfy_cli/utils.py @@ -49,6 +49,8 @@ def get_os(): return OS.WINDOWS elif platform_system == "linux": return OS.LINUX + elif platform_system == "freebsd": + return OS.FREEBSD else: raise ValueError(f"Running on unsupported os {platform.system()}") -@@ -57,5 +59,7 @@ def get_proc(): +@@ -57,6 +59,8 @@ def get_proc(): + proc = platform.machine() if proc == "x86_64" or proc == "AMD64": - return PROC.X86_64 -+ elif proc == "amd64": + return PROC.X86_64 ++ elif proc == "amd64": + return PROC.X86_64 elif "arm" in proc: return PROC.ARM - else: - diff --git a/misc/comfy-cli/files/patch-comfy__cli_workspace_manager.py b/misc/comfy-cli/files/patch-comfy__cli_workspace_manager.py deleted file mode 100644 index 89a1f1e6aaab..000000000000 --- a/misc/comfy-cli/files/patch-comfy__cli_workspace_manager.py +++ /dev/null @@ -1,13 +0,0 @@ ---- comfy_cli/workspace_manager.py.orig 2026-03-22 01:45:24 UTC -+++ comfy_cli/workspace_manager.py -@@ -260,9 +260,9 @@ class WorkspaceManager: - if self.use_recent is None: - recent_workspace = self.config_manager.get(constants.CONFIG_KEY_RECENT_WORKSPACE) - if recent_workspace and check_comfy_repo(recent_workspace)[0]: - return recent_workspace, WorkspaceType.RECENT -- else: -+ elif recent_workspace: - print( - f"[bold red]warn: The recent workspace {recent_workspace} is not a valid ComfyUI path.[/bold red]" - ) -