From nobody Wed Sep 04 19:25:35 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 4WzXWz4Dbbz5VDJv; Wed, 04 Sep 2024 19:25:35 +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 4WzXWz3j9rz43ry; Wed, 4 Sep 2024 19:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725477935; 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=bNJ7zE65KzE9PBZs16awWz0GnOHzNIkKhZ4AlZUI15E=; b=SiVD3fIDxHOMHm2KwSDJBwg5DQACzlgJ7kR8Xsr8Z+mP2fUZ07XXelFkMbVEbh0NmUyELQ Qx+E1Rt7j63/bVmomGiw56S/41Tk0nwxdjvmrRhC3l+JcQk6nimtAC1p1dcStp6KxwScBg TOu7o357/P6f+THWuQknbbNbeaPUyJPTOKsdKyF/bSOwgivEQfu0ziNMLk3azaKt/U5UD0 DpBtz49djYXsahEPsp3B7phxlmCnbHDVPWkSYgQpDRVW7PaFWPt0N/prqt0sEI4F5bN3UG Xb2g/tp0ulyW1WBqGXyXDSOT3Kzm0VgzILthjsvnvlNJkXyPjnn6vVzM1koRSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725477935; a=rsa-sha256; cv=none; b=cSQNWDe8UTW//pPyeC9tL4JFGXr9TrXMO7NWyOKARKpsWHDH/6Z4mBHp68X2OS6OiknEXw 4D7d58I39AY7dxotMBvRbP9ctG/wtzzvRcWLATOpfmg7eikyZFLA4LUJqcPgGy1GLssWp8 Vd8Lld2LAr0Am/9WMY1yKbQ2/1GtTnfc68tFHRwMkIhIL/mKNAC0gLAsXzmskb8LE2iCes Hr/aary6wwTttxUbv8F56LCzX0oasdgdvV++gSWIPYUc6J7pE2plOlSMzHrVAClIYBqk7v Okd24FquaDQRsj+wt1jHzKyrD2+VSfiYcg4iUFJLZXkc3kUgSgTFaQ7XOVkmNA== 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=1725477935; 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=bNJ7zE65KzE9PBZs16awWz0GnOHzNIkKhZ4AlZUI15E=; b=AQuGtgkC+Mq8zpn7JGn0zeRyKmOqoiiw7tADNZLyy4ZiMXdoMGy5Ek2OkIccke/lsFqRay ZGfx6LIYVT++Knt97UqpDXrLsipbEAfj3/XnNLzLhd61zxu1Ol3KAVqx8EZwZiHZVB6ch/ ZgwlIEB0KLYmx/qQspazErVYERnVs5vLiRLvmdK63xj7qe/oc1sVcfDSFqhDdtMMwi8x8R p8GsofxZOFUBOQ951J7uKByZ676N4S8P4jyqvzkObxjp0w+6X6zt9wXCKZdf1ARnz5hIcB UnJ87PWiEJdlxwTneOl/rb/N+5PhlPz1Mniaub4FJgxsjeTp2KfQTEpcjlMmxQ== 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 4WzXWz3Bcqzd6R; Wed, 4 Sep 2024 19:25:35 +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 484JPZ0Y078373; Wed, 4 Sep 2024 19:25:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484JPZKR078370; Wed, 4 Sep 2024 19:25:35 GMT (envelope-from git) Date: Wed, 4 Sep 2024 19:25:35 GMT Message-Id: <202409041925.484JPZKR078370@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Diane Bruce Subject: git: ea4068713c1d - main - net/libcharon: Upgrade for cura 5.7 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: db X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea4068713c1d8bec35bcf3bd3a6d998c75f2efc9 Auto-Submitted: auto-generated The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=ea4068713c1d8bec35bcf3bd3a6d998c75f2efc9 commit ea4068713c1d8bec35bcf3bd3a6d998c75f2efc9 Author: Matthieu Volat AuthorDate: 2024-09-04 19:23:20 +0000 Commit: Diane Bruce CommitDate: 2024-09-04 19:23:20 +0000 net/libcharon: Upgrade for cura 5.7 - upgrade need for cura - N.B. -DPython_VERSION:STRING=${PYTHON_VER} \ Why lower case?? --- net/libcharon/Makefile | 9 +++++---- net/libcharon/distinfo | 6 +++--- net/libcharon/files/patch-CMakeLists.txt | 30 ------------------------------ net/libcharon/pkg-plist | 2 -- 4 files changed, 8 insertions(+), 39 deletions(-) diff --git a/net/libcharon/Makefile b/net/libcharon/Makefile index 92cdba880ba4..5485f479fe62 100644 --- a/net/libcharon/Makefile +++ b/net/libcharon/Makefile @@ -1,7 +1,5 @@ PORTNAME= libCharon -# XXX there is no 4.13.1 -# https://github.com/Ultimaker/libCharon/tags -DISTVERSION= 4.13.0 +DISTVERSION= 5.0.0 CATEGORIES= net devel cad DIST_SUBDIR= Ultimaker @@ -18,8 +16,11 @@ STRIP= USE_GITHUB= yes GH_ACCOUNT= Ultimaker +# Python_VERSION in CMakeFile.txt WHY!? CMAKE_ARGS+= -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD} \ - -DPYTHONPREFIX_SITELIBDIR:STRING=${PYTHONPREFIX_SITELIBDIR} + -DPython_VERSION:STRING=${PYTHON_VER} \ + -DPYTHONPREFIX_SITELIBDIR:STRING=${PYTHONPREFIX_SITELIBDIR} \ + -DINSTALL_SERVICE:BOOL=OFF NO_ARCH= yes .include diff --git a/net/libcharon/distinfo b/net/libcharon/distinfo index 1dc6363013a5..438d1c63646e 100644 --- a/net/libcharon/distinfo +++ b/net/libcharon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1645699385 -SHA256 (Ultimaker/Ultimaker-libCharon-4.13.0_GH0.tar.gz) = efccb04a84b9a80fe4e154aa4b44c56b59061aeba25937be804277a5f21259ec -SIZE (Ultimaker/Ultimaker-libCharon-4.13.0_GH0.tar.gz) = 151775 +TIMESTAMP = 1713945967 +SHA256 (Ultimaker/Ultimaker-libCharon-5.0.0_GH0.tar.gz) = 7b58b921c6fd78329badc83de4b9987c058d048b6a450313be23756415372fbf +SIZE (Ultimaker/Ultimaker-libCharon-5.0.0_GH0.tar.gz) = 151686 diff --git a/net/libcharon/files/patch-CMakeLists.txt b/net/libcharon/files/patch-CMakeLists.txt deleted file mode 100644 index 28ed16869cd8..000000000000 --- a/net/libcharon/files/patch-CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ ---- CMakeLists.txt.orig 2020-04-16 10:34:42 UTC -+++ CMakeLists.txt -@@ -15,13 +15,27 @@ else() - find_package(Python3 3.4 REQUIRED COMPONENTS Interpreter) - endif() - -+if (NOT PYTHON_EXECUTABLE STREQUAL "" ) -+ set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) -+ message("Using given PYTHON_EXECUTABLE") -+endif() -+if (NOT PYTHONPREFIX_SITELIBDIR STREQUAL "") -+ set(PYTHONPREFIX_SITELIBDIR ${PYTHONPREFIX_SITELIBDIR}) -+ message("Using given PYTHONPREFIX_SITELIBDIR") -+endif() -+ - option(INSTALL_SERVICE "Install the Charon DBus-service" ON) - option(INSTALL_CLIENT "Install the Charon Client library" ON) - -+if ( NOT PYTHONPREFIX_SITELIBDIR STREQUAL "") -+ message("Using given PYTHONPREFIX_SITELIBDIR for CHARON_INSTALL_PATH") -+ set(CHARON_INSTALL_PATH ${PYTHONPREFIX_SITELIBDIR}) -+else() - if(EXISTS /etc/debian_version) - set(CHARON_INSTALL_PATH lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}/dist-packages) - else() - set(CHARON_INSTALL_PATH lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages) -+endif() - endif() - - set(_excludes PATTERN __pycache__ EXCLUDE) diff --git a/net/libcharon/pkg-plist b/net/libcharon/pkg-plist index 6fb0cd9f0419..36697b23c10d 100644 --- a/net/libcharon/pkg-plist +++ b/net/libcharon/pkg-plist @@ -19,5 +19,3 @@ %%PYTHON_SITELIBDIR%%/Charon/filetypes/OpenPackagingConvention.py %%PYTHON_SITELIBDIR%%/Charon/filetypes/UltimakerFormatPackage.py %%PYTHON_SITELIBDIR%%/Charon/filetypes/__init__.py -@comment lib/systemd/system/charon.service -share/dbus-1/system.d/nl.ultimaker.charon.conf