From nobody Sat Aug 10 07:07:51 2024 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 4WgsLJ1MVcz5S7WP; Sat, 10 Aug 2024 07:07:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WgsLH6Vyhz4W1c; Sat, 10 Aug 2024 07:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723273671; 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=aAP+VxuSpyr+ylFKtWRNHgKgSL5ls/QOmdV0pUPae+k=; b=mCOyu1ThnYaB2xOOCYKMgNFj1r+XHDXk/G0ddBVmB/DlJLrYigqEeuu1jTf9PS4qmDoZ2d aisnSrHiUAAbctFsmXkdKFIyHvi04bM/Ajnrez47LHB4SJxLW8pbaXYfTxuq3ANxZ6THUu i3wXfnedKc84BviTWHX+EzldsLowRQ4QbSGntySjHPCSZr9jpWBb6jP1X3i/ZtjHvGYozX czaN84VlQg5EWy4EqEdLbeUmnvqDlnprqgufkyJaPEmCMzf8jkjOL2QNwy8awdyQxgtrY0 GTwahEG7xFIqsAL6dj/NvnasueLu0iuc6t9u74X4hGz2J4aFNCp802039awTgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723273671; a=rsa-sha256; cv=none; b=tHJLSuKog4nwOe/1p89H1Vw2ntnqheRWEjiaEowfq/MlWr+zaVNgYQR9zlJR0M7QpJKKCN hsDxfOvI+jrdGMIkNl3KnjeyW9twYZReft6oPRoLFXxNPXU3JhtPVMRB0uK9OwkzmQMTgd e0/uWQanIW63DxYtq2ofaUe2N0RHzuWAVyVe2MS4dLgeDhfmKkmObuDXaT0Kk3xp7TbmqT uXz321GiDrmt7HLZyrl+68SklJg5Bhvvh5iG4uEWuJisBX+WkmVP5DMSWolj+kNt3vcRxr yFN2hCjI3uvI/L+lq23JkiSUijCsmESEubS6gesiAk7oJsoQBq/+oRMl12Ba+g== 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=1723273671; 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=aAP+VxuSpyr+ylFKtWRNHgKgSL5ls/QOmdV0pUPae+k=; b=KBvVAJVWA+8WbqhPNVp2NcjqV1+FuQk6mJ7QEfiva93SkTGVBbiAqJNYtJN58OKaeRk/F0 QUwdLujbmnEOr1CR9L2QOSs9eqqdY0rmljldp2Mtc05fKc4uTOJHq1fBnbxFhXYHyblGQn Zc44VZwb4G2VrG3uEr7XdRkwjqAMHT7BtUbkC6Cnf2Hna5Tc+ZOAdzdY17zE/BCbXTd2v8 iAM26YpERwiQYGLRB+Oa/MEDfUvHOBAoJT1HCfDMzantmTTDN/MSqIuKGeA9TyS3Ri3p6J Da5ACx9pQav0SgHdOKBrxYm06Tt0oVHNyoz9pMVinbOpkKODCX5a85wTKsD0Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WgsLH5QbXzr2g; Sat, 10 Aug 2024 07:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47A77pNS073708; Sat, 10 Aug 2024 07:07:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47A77pnB073705; Sat, 10 Aug 2024 07:07:51 GMT (envelope-from git) Date: Sat, 10 Aug 2024 07:07:51 GMT Message-Id: <202408100707.47A77pnB073705@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: e73ddfead08a - main - misc/ollama: add CONFLICTS_BUILD 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: e73ddfead08ab84bf7497bce15a608da068030cb Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=e73ddfead08ab84bf7497bce15a608da068030cb commit e73ddfead08ab84bf7497bce15a608da068030cb Author: Yuri Victorovich AuthorDate: 2024-08-10 07:06:17 +0000 Commit: Yuri Victorovich CommitDate: 2024-08-10 07:07:35 +0000 misc/ollama: add CONFLICTS_BUILD --- misc/ollama/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/misc/ollama/Makefile b/misc/ollama/Makefile index 30490ace662f..1995935ddfae 100644 --- a/misc/ollama/Makefile +++ b/misc/ollama/Makefile @@ -22,6 +22,8 @@ LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader USES= go:1.22,modules pkgconfig +CONFLICTS_BUILD= llama-cpp + GO_MODULE= github.com/${PORTNAME}/${PORTNAME} GO_TARGET= .