diff --git a/net/libcharon/Makefile b/net/libcharon/Makefile index 92cdba880ba4..5485f479fe62 100644 --- a/net/libcharon/Makefile +++ b/net/libcharon/Makefile @@ -1,25 +1,26 @@ 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 MAINTAINER= db@FreeBSD.org COMMENT= File metadata and streaming library WWW= https://github.com/Ultimaker/libCharon LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake python 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 @@ -1,23 +1,21 @@ %%PYTHON_SITELIBDIR%%/Charon/Client/DBusInterface.py %%PYTHON_SITELIBDIR%%/Charon/Client/Request.py %%PYTHON_SITELIBDIR%%/Charon/Client/__init__.py %%PYTHON_SITELIBDIR%%/Charon/Client/test_glib.py %%PYTHON_SITELIBDIR%%/Charon/Client/test_qt.py %%PYTHON_SITELIBDIR%%/Charon/FileInterface.py %%PYTHON_SITELIBDIR%%/Charon/OpenMode.py %%PYTHON_SITELIBDIR%%/Charon/ReadOnlyError.py %%PYTHON_SITELIBDIR%%/Charon/Service/FileService.py %%PYTHON_SITELIBDIR%%/Charon/Service/RequestQueue.py %%PYTHON_SITELIBDIR%%/Charon/Service/__init__.py %%PYTHON_SITELIBDIR%%/Charon/Service/main.py %%PYTHON_SITELIBDIR%%/Charon/VirtualFile.py %%PYTHON_SITELIBDIR%%/Charon/WriteOnlyError.py %%PYTHON_SITELIBDIR%%/Charon/__init__.py %%PYTHON_SITELIBDIR%%/Charon/filetypes/GCodeFile.py %%PYTHON_SITELIBDIR%%/Charon/filetypes/GCodeGzFile.py %%PYTHON_SITELIBDIR%%/Charon/filetypes/GCodeSocket.py %%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