From nobody Sat Mar 14 07:37:38 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXtVV3ltrz6VPPB for ; Sat, 14 Mar 2026 07:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXtVV2p4nz3Zds for ; Sat, 14 Mar 2026 07:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773473858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uUGk6vcvCuNO3cgdKKfIGaSH7Q/CgBKX5a3VGUMXbpE=; b=OsTkDAaufqDGVs85YhaP3xX1RHJ+IVTGtiHeD37Ank4Hv4rWswbN4A2z9Fbl4/5QE8VVsi gp317N8NtIxALOrpkNrYLLtWCraHW8igWPiqrVQUkKvfKzhA5uo2/wKMS9yfbfNgHxbJUr iNsrMHYE8+p1rwKp1pRc5aE/ZOUqyZWhlsi+cYNcm5MYrnP/hWMpm/BXtpyMWqBQFz2AZE xvTxzwDkYm5QwHxZ1rFu+Rs/pctsDQXVF3ZVn/Q1aiacLHU4JQ0sCRESirDCFgRtsYt2tm oixND+UPJJ9Dc1eWvbBnCXgwvYtE34Qp1vxAvMTpHU2Ftm/Xy8x5DvnT/rGroQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773473858; a=rsa-sha256; cv=none; b=Dh52i8Q47FMh0E968dDbmKpZ13QxqNgMJ2svQy4hMohnC2Gg+LwHRMWc5ddHhPpreseWkh sufXq4rE30HpSiqO6ywaKrWRe83UCtNd4Nl3t8H2U12LNwHyr+kXt1zG85c6nqXds3ROLp pzKZQ7wgG/bWc5gnTURujGX/mxtr2LE1IH2/WXqhyBMQicJO3Vmg/nnkuf+damBwEiX55/ d1rr2eWvmsbkBAYP9N8sEEjTQ98w9LodugR82+VduVfg4DnWQIwtDyhhNnngM7ZBDGHoeq U+nYbZM4UvUWryw1ASZykGbM1tLMygmIbABt7FJiqqPwmzNHRLqvRzjuU2fzeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773473858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uUGk6vcvCuNO3cgdKKfIGaSH7Q/CgBKX5a3VGUMXbpE=; b=T80X2r8CafS8Yx851rXjEsTXqq+9+WqEGO6sWFD+ah5QjtXInmiZeSAAYI9RZAHqRaq/jP AlCw4Cqk7v5OWmlfQxxaEVFQMop2YfCI1ACBnC1boxbMsvajIy7UadQp20bAH0VHx1Wz00 +Vv9DOQWqwCISuVXKH9Ck6z6t3iasxDOSNKGVI9siqt8TOIlLbSOKy1Shg7C5hyzS15qZO 7NUUvJO6viNX+YCIfMce3IagiPoDMtE4haYMdKNiQFtFleMRrTHxeJ6q1z89d+2lv/zDxd LdtMj2JFOjCx1iMO5/KSt+GpuKx08B0n1WUTidSW0Vq4bz7R649xm3ELXIWpKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXtVV23Djz17r9 for ; Sat, 14 Mar 2026 07:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31dd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 07:37:38 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 5aa0e65825d7 - main - misc/ollama: update 0.17.=?utf-8?Q?7 =E2=86=92 0.?=18.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5aa0e65825d78eff5754f8da1d87def867a878d9 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 07:37:38 +0000 Message-Id: <69b51042.31dd6.1688937b@gitrepo.freebsd.org> The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=5aa0e65825d78eff5754f8da1d87def867a878d9 commit 5aa0e65825d78eff5754f8da1d87def867a878d9 Author: Yuri Victorovich AuthorDate: 2026-03-14 05:14:58 +0000 Commit: Yuri Victorovich CommitDate: 2026-03-14 07:37:32 +0000 misc/ollama: update 0.17.7 → 0.18.0 --- misc/ollama/Makefile | 39 +++++++++++++++++++++++++++++++++++---- misc/ollama/distinfo | 10 +++++----- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/misc/ollama/Makefile b/misc/ollama/Makefile index 92ccee958795..a2ac9b7b35e8 100644 --- a/misc/ollama/Makefile +++ b/misc/ollama/Makefile @@ -1,6 +1,6 @@ PORTNAME= ollama DISTVERSIONPREFIX= v -DISTVERSION= 0.17.7 +DISTVERSION= 0.18.0 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -22,11 +22,17 @@ GO_MODULE= github.com/yurivict/${PORTNAME} # fork with FreeBSD patches GO_TARGET= . GO_ENV+= CGO_CXXFLAGS="${CXXFLAGS}" +.include + +.if ${PORT_OPTIONS:MMLX} +GO_BUILDFLAGS+= -tags mlx +.endif + PLIST_FILES= bin/${PORTNAME} \ bin/ollama-limit-gpu-layers OPTIONS_GROUP= BACKENDS -OPTIONS_GROUP_BACKENDS= CPU VULKAN +OPTIONS_GROUP_BACKENDS= CPU VULKAN MLX OPTIONS_DEFAULT= CPU VULKAN CPU_DESC= Build CPU backend shared libraries @@ -45,7 +51,10 @@ VULKAN_BUILD_DEPENDS= glslc:graphics/shaderc \ VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_PLIST_FILES= lib/ollama/libggml-vulkan.so -.include +MLX_DESC= Build MLX backend for image generation (CPU) +MLX_PLIST_FILES= lib/ollama/libmlx.so \ + lib/ollama/libmlxc.so +MLX_CMAKE_ON= -DMLX_ENGINE:BOOL=ON _CMAKE_FLAGS= -DCMAKE_BUILD_TYPE=Release -DGGML_BACKEND_DL=ON -DGGML_BACKEND_DIR=${PREFIX}/lib/ollama @@ -64,7 +73,7 @@ pre-build-CPU-on: ${MAKE_CMD} ggml-cpu pre-build-VULKAN-on: -.if !${PORT_OPTIONS:MCPU} +.if !${PORT_OPTIONS:MCPU} && !${PORT_OPTIONS:MMLX} @${MKDIR} ${WRKSRC}/build && \ cd ${WRKSRC}/build && \ ${CMAKE_BIN} ${_CMAKE_FLAGS} .. @@ -72,6 +81,21 @@ pre-build-VULKAN-on: @cd ${WRKSRC}/build && \ ${MAKE_CMD} ggml-vulkan +pre-build-MLX-on: +.if !${PORT_OPTIONS:MCPU} && !${PORT_OPTIONS:MVULKAN} + @${MKDIR} ${WRKSRC}/build && \ + cd ${WRKSRC}/build && \ + ${CMAKE_BIN} ${_CMAKE_FLAGS} -DMLX_ENGINE:BOOL=ON .. +.endif + # Patch MLX after it's fetched by CMake (FreeBSD compatibility fix) + @if [ -f ${WRKSRC}/build/_deps/mlx-src/mlx/distributed/ring/ring.cpp ]; then \ + ${REINPLACE_CMD} -i '' -e '/^#include /a\\ +#include ' \ + ${WRKSRC}/build/_deps/mlx-src/mlx/distributed/ring/ring.cpp; \ + fi + @cd ${WRKSRC}/build && \ + ${MAKE_CMD} mlx mlxc + post-install: # pending https://github.com/ollama/ollama/issues/6407 ${INSTALL_SCRIPT} ${FILESDIR}/ollama-limit-gpu-layers ${STAGEDIR}${PREFIX}/bin @@ -88,6 +112,13 @@ post-install-VULKAN-on: ${INSTALL_LIB} ${WRKSRC}/build/lib/ollama/libggml-vulkan.so \ ${STAGEDIR}${PREFIX}/lib/ollama/ +post-install-MLX-on: + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ollama + ${INSTALL_LIB} ${WRKSRC}/build/lib/ollama/libmlx.so \ + ${STAGEDIR}${PREFIX}/lib/ollama/ + ${INSTALL_LIB} ${WRKSRC}/build/lib/ollama/libmlxc.so \ + ${STAGEDIR}${PREFIX}/lib/ollama/ + do-test: @cd ${WRKSRC} && \ ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ./... diff --git a/misc/ollama/distinfo b/misc/ollama/distinfo index a9cb3d9ef11b..fd2e6f5f81c2 100644 --- a/misc/ollama/distinfo +++ b/misc/ollama/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1773220298 -SHA256 (go/misc_ollama/ollama-v0.17.7/v0.17.7.mod) = e660ffa37ad33611a4c1248967204e578f07ada9941e63ffe6a6fe3e95ac5039 -SIZE (go/misc_ollama/ollama-v0.17.7/v0.17.7.mod) = 4757 -SHA256 (go/misc_ollama/ollama-v0.17.7/v0.17.7.zip) = 7af9768594e0428adc2d7169fc42a034c1388ed1ae2a0d4f6f4f940dd0620476 -SIZE (go/misc_ollama/ollama-v0.17.7/v0.17.7.zip) = 23379864 +TIMESTAMP = 1773459514 +SHA256 (go/misc_ollama/ollama-v0.18.0/v0.18.0.mod) = e660ffa37ad33611a4c1248967204e578f07ada9941e63ffe6a6fe3e95ac5039 +SIZE (go/misc_ollama/ollama-v0.18.0/v0.18.0.mod) = 4757 +SHA256 (go/misc_ollama/ollama-v0.18.0/v0.18.0.zip) = 87dcd0b0ed4f8e3a73b31a7853edb2bc8e27acbbaf5a1456f8fc59538ae2edf4 +SIZE (go/misc_ollama/ollama-v0.18.0/v0.18.0.zip) = 23447832