From owner-svn-ports-head@freebsd.org Fri Feb 5 10:49:31 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 2B891544244; Fri, 5 Feb 2021 10:49:31 +0000 (UTC) (envelope-from se@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DXBxl0mggz4qdW; Fri, 5 Feb 2021 10:49:31 +0000 (UTC) (envelope-from se@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 0D5CE1D699; Fri, 5 Feb 2021 10:49:31 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 115AnUbp065656; Fri, 5 Feb 2021 10:49:30 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 115AnUpL065654; Fri, 5 Feb 2021 10:49:30 GMT (envelope-from se@FreeBSD.org) Message-Id: <202102051049.115AnUpL065654@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: =?UTF-8?Q?Stefan_E=c3=9fer?= Date: Fri, 5 Feb 2021 10:49:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564105 - in head/security/rnp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: se X-SVN-Commit-Paths: in head/security/rnp: . files X-SVN-Commit-Revision: 564105 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: Fri, 05 Feb 2021 10:49:31 -0000 Author: se Date: Fri Feb 5 10:49:30 2021 New Revision: 564105 URL: https://svnweb.freebsd.org/changeset/ports/564105 Log: Fix build in poudriere Fetching a cmake helper file was (rightfully) blocked when building with poudriere, leding to an abort in the configure phase. Instead of fetching the cmake helper as an additional distfile, provide the relevant functionality in a local version that uses port system information instead of trying to obtain the version number from the sources. Reported by: kai Added: head/security/rnp/files/ head/security/rnp/files/version.cmake (contents, props changed) Modified: head/security/rnp/Makefile Modified: head/security/rnp/Makefile ============================================================================== --- head/security/rnp/Makefile Fri Feb 5 10:31:49 2021 (r564104) +++ head/security/rnp/Makefile Fri Feb 5 10:49:30 2021 (r564105) @@ -16,8 +16,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md LICENSE_PERMS_OCB_Patent= dist-mirror dist-sell pkg-mirror pkg-sell \ auto-accept -BROKEN= Not yet diagnosed pkg-fallout errors in configure phase, local builds succeed - LIB_DEPENDS= libbotan-2.so:security/botan2 \ libjson-c.so:devel/json-c @@ -27,5 +25,10 @@ GH_ACCOUNT= rnpgp CMAKE_ARGS= -DBUILD_SHARED_LIBS=on \ -DBUILD_TESTING=off + +pre-configure: + ${CP} ${FILESDIR}/version.cmake ${WRKSRC}/cmake/ + ${REINPLACE_CMD} 's/%%DISTVERSION%%/${DISTVERSION}/' \ + ${WRKSRC}/cmake/version.cmake .include Added: head/security/rnp/files/version.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/rnp/files/version.cmake Fri Feb 5 10:49:30 2021 (r564105) @@ -0,0 +1,9 @@ +function(determine_version source_dir var_prefix) + set(RNP_VERSION %%DISTVERSION%% PARENT_SCOPE) + set(RNP_VERSION_NCOMMITS 0 PARENT_SCOPE) + set(RNP_VERSION_GIT_REV 0 PARENT_SCOPE) + set(RNP_VERSION_IS_DIRTY FALSE PARENT_SCOPE) + set(RNP_VERSION_COMMIT_TIMESTAMP 0 PARENT_SCOPE) + set(RNP_VERSION_SUFFIX "" PARENT_SCOPE) + set(RNP_VERSION_FULL %%DISTVERSION%% PARENT_SCOPE) +endfunction()