Index: head/net/libcharon/Makefile =================================================================== --- head/net/libcharon/Makefile (revision 561521) +++ head/net/libcharon/Makefile (revision 561522) @@ -1,22 +1,25 @@ # $FreeBSD$ PORTNAME= libCharon -DISTVERSION= 4.7.1 +DISTVERSION= 4.8.0 CATEGORIES= net devel cad DIST_SUBDIR= Ultimaker MAINTAINER= db@FreeBSD.org COMMENT= File metadata and streaming library LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake python:3.4+ STRIP= USE_GITHUB= yes GH_ACCOUNT= Ultimaker -GH_TAGNAME= c34738dd +#GH_TAGNAME= c34738d +CMAKE_ARGS+= -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD} \ + -DPYTHONPREFIX_SITELIBDIR:STRING=${PYTHONPREFIX_SITELIBDIR} NO_ARCH= yes + .include Index: head/net/libcharon/distinfo =================================================================== --- head/net/libcharon/distinfo (revision 561521) +++ head/net/libcharon/distinfo (revision 561522) @@ -1,3 +1,3 @@ -TIMESTAMP = 1600557973 -SHA256 (Ultimaker/Ultimaker-libCharon-4.7.1-c34738dd_GH0.tar.gz) = cea1dd86c54cfdbe6e1d996fa01083d4c7c4b26301c523a2294d69ea53d7f109 -SIZE (Ultimaker/Ultimaker-libCharon-4.7.1-c34738dd_GH0.tar.gz) = 151232 +TIMESTAMP = 1610491353 +SHA256 (Ultimaker/Ultimaker-libCharon-4.8.0_GH0.tar.gz) = 94ce4e3ac2a8fe63a698feef190bf06fc6f617710b7df61cbe91cd7d0b49c0bf +SIZE (Ultimaker/Ultimaker-libCharon-4.8.0_GH0.tar.gz) = 151223 Index: head/net/libcharon/files/patch-CMakeLists.txt =================================================================== --- head/net/libcharon/files/patch-CMakeLists.txt (nonexistent) +++ head/net/libcharon/files/patch-CMakeLists.txt (revision 561522) @@ -0,0 +1,30 @@ +--- 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) Property changes on: head/net/libcharon/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property