From owner-svn-ports-head@freebsd.org Wed Jan 13 23:19:07 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 99F4D4EB780; Wed, 13 Jan 2021 23:19:07 +0000 (UTC) (envelope-from db@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DGNgH3yczz3vmr; Wed, 13 Jan 2021 23:19:07 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7AB1C1FB34; Wed, 13 Jan 2021 23:19:07 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10DNJ7gq072437; Wed, 13 Jan 2021 23:19:07 GMT (envelope-from db@FreeBSD.org) Received: (from db@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10DNJ6Lr072434; Wed, 13 Jan 2021 23:19:06 GMT (envelope-from db@FreeBSD.org) Message-Id: <202101132319.10DNJ6Lr072434@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: db set sender to db@FreeBSD.org using -f From: Diane Bruce Date: Wed, 13 Jan 2021 23:19:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561522 - in head/net/libcharon: . files X-SVN-Group: ports-head X-SVN-Commit-Author: db X-SVN-Commit-Paths: in head/net/libcharon: . files X-SVN-Commit-Revision: 561522 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2021 23:19:07 -0000 Author: db Date: Wed Jan 13 23:19:06 2021 New Revision: 561522 URL: https://svnweb.freebsd.org/changeset/ports/561522 Log: Really update libcharon to 4.8 N.B. the wrinkle in cmake build here. find_package(Pythoninterp 3.4 REQUIRED) can find your install Python 3.9 instead of the DEFAULT Python. Force the correct one with a few patches. PR: ports/251236 Submitted by: sko@rostwald.de Reported by: trombik1973@gmail.com Added: head/net/libcharon/files/ head/net/libcharon/files/patch-CMakeLists.txt (contents, props changed) Modified: head/net/libcharon/Makefile head/net/libcharon/distinfo Modified: head/net/libcharon/Makefile ============================================================================== --- head/net/libcharon/Makefile Wed Jan 13 23:17:51 2021 (r561521) +++ head/net/libcharon/Makefile Wed Jan 13 23:19:06 2021 (r561522) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libCharon -DISTVERSION= 4.7.1 +DISTVERSION= 4.8.0 CATEGORIES= net devel cad DIST_SUBDIR= Ultimaker @@ -16,7 +16,10 @@ 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 Modified: head/net/libcharon/distinfo ============================================================================== --- head/net/libcharon/distinfo Wed Jan 13 23:17:51 2021 (r561521) +++ head/net/libcharon/distinfo Wed Jan 13 23:19:06 2021 (r561522) @@ -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 Added: head/net/libcharon/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libcharon/files/patch-CMakeLists.txt Wed Jan 13 23:19:06 2021 (r561522) @@ -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)