From nobody Wed Aug 09 20:06:11 2023 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 4RLgzl5FmSz4mDpm; Wed, 9 Aug 2023 20:06:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLgzl4gcxz3dTh; Wed, 9 Aug 2023 20:06:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691611571; 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=19ZZTnfFc1YjZSMKns/9Tfd/DSdFSmv8O4ffiUpDUP0=; b=YH4iRLh1Av4Qp/6nAg4eAJQ1C18biuuw7C4Xn3QaxQ7WeVR/QfV/gv6uD1kAdHqdYmcGpv YwdKAz/lY/rZj7D7f+Ti7hA3UpnM43N8SmrQjKNLDuViiy3skDSQSTKwSNjk/A2Wb+rwEh k66968OV2J9XP3ZpxeNXQLZWBAYhzeMtxuXPU5eBYwOUHFyDUMIbQIrioeRZtWcCOBGOHe zYAHHWVIcLZi/30UR8MExmVsoERPUc3xWk9F5AEpdFBV6VKUrKW9jWSa5+9R8ZB6HXWhdP 6bcTOrtRSm6MKNTVjjfHdxwEy881hxy+fSSGvcmHuUnwuaanslYpvD7eV6a3gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691611571; 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=19ZZTnfFc1YjZSMKns/9Tfd/DSdFSmv8O4ffiUpDUP0=; b=Ela2HpRyVKLS1Yp6IeKldhucxWimlb4BteEZb/0q5xTAI1tUWQFhwKY6l9ilTNG6jU4XbG wOf1wnYmHhJThwW8PRxgHkDas0y4ewnoBmaGQISJRGZI47hle8XU0OonHIGHDrufCivAvK GUaVnnZt8gTjKkDbnLDMvs9ZtMsPVgosj64y14CR9pmhv7dDO8KAAY3JCUPpCg1igkAN4a SigbP+OudqDjHoBreYBwbMKC/6GwRol6caNB25m6THbQvW9N2EAJni0vwRhx8EGMnmqOxh AeO7ZLeUaIiuGIttdNX3vUR/ko/hgI8Av0YiNYUM/67Mf43ioqlwx1/Mqr3yig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691611571; a=rsa-sha256; cv=none; b=cvjKt5ZckZB5nIBvBWnvLSgyiQluR57xVZ8KimC4NIwQtAPvM0D/5dbsBTPUBTH/RYuqtd 3FUP3DNAw8bwWE3+3UEz95koFC1QeloM2XJ9XNFn5O2uzUO4q41oPHPavAUfM3yncyOPF+ x2ksaS5AR3hrAwjnAOFhTaBlDYWOSy232FK80FIKgZxlWTFPXfcg2gvcSk2XAXMQvwMXgk psorvpJpvyoecZP5pNwRV43G+U39bYmfSBjULDZCZTAtKPMFccReZvJxFfVoR1gep28gEp 0X25y8+Z7MbfjjN3A9xlq465J2W2BHp+QZsxXD7e/i2exMdGHz1BSxFuTyp13A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RLgzl3kqHzTJT; Wed, 9 Aug 2023 20:06:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379K6Brd094139; Wed, 9 Aug 2023 20:06:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379K6B5Q094136; Wed, 9 Aug 2023 20:06:11 GMT (envelope-from git) Date: Wed, 9 Aug 2023 20:06:11 GMT Message-Id: <202308092006.379K6B5Q094136@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 57a2c4c7d1f0 - main - security/boringssl: use CMAKE_INSTALL_PREFIX (+) 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57a2c4c7d1f0a02aa115501c8ee9c30c605cea7c Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=57a2c4c7d1f0a02aa115501c8ee9c30c605cea7c commit 57a2c4c7d1f0a02aa115501c8ee9c30c605cea7c Author: Sergey A. Osokin AuthorDate: 2023-08-09 20:05:45 +0000 Commit: Sergey A. Osokin CommitDate: 2023-08-09 20:06:05 +0000 security/boringssl: use CMAKE_INSTALL_PREFIX (+) CMAKE_INSTALL_PREFIX usage helps to fix an issue with the RUNPATH. Also, it's possible to use native installation procedure for the package, our do-install target can be safely removed. Bump PORTREVISION. --- security/boringssl/Makefile | 16 ++++++---------- security/boringssl/pkg-plist | 3 +++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile index fe073e822441..15084b61dced 100644 --- a/security/boringssl/Makefile +++ b/security/boringssl/Makefile @@ -1,5 +1,6 @@ PORTNAME= boringssl PORTVERSION= 0.0.0.0.2023.08.05.01 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES+= https://proxy.golang.org/:gomods DISTFILES+= golang.org/x/crypto/@v/v0.10.0.zip:gomods \ @@ -30,21 +31,16 @@ USE_GITHUB= yes GH_ACCOUNT= google GH_TAGNAME= e28988e CMAKE_ARGS+= -DBUILD_SHARED_LIBS=1 \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${PREFIX} USE_LDCONFIG= yes LDFLAGS+= -Wl,-rpath,${LOCALBASE}/lib TEST_TARGET= run_tests MAKE_ENV+= GOFLAGS=-mod=readonly \ GOPROXY=file://${DISTDIR} -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/tool/bssl ${STAGEDIR}${PREFIX}/bin/ - (cd ${WRKSRC}/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include) - ${INSTALL_LIB} ${WRKSRC}/crypto/libcrypto.so ${STAGEDIR}${PREFIX}/lib/libcrypto.so.1.0.0 - ${INSTALL_LIB} ${WRKSRC}/ssl/libssl.so ${STAGEDIR}${PREFIX}/lib/libssl.so.1.0.0 - ${LN} -sf libcrypto.so.1 ${STAGEDIR}${PREFIX}/lib/libcrypto.so - ${LN} -sf libcrypto.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libcrypto.so.1 - ${LN} -sf libssl.so.1 ${STAGEDIR}${PREFIX}/lib/libssl.so - ${LN} -sf libssl.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libssl.so.1 +post-install: + ${LN} -sf libcrypto.so.1 ${STAGEDIR}${PREFIX}/lib/libcrypto.so.1.0.0 + ${LN} -sf libssl.so.1 ${STAGEDIR}${PREFIX}/lib/libssl.so.1.0.0 .include diff --git a/security/boringssl/pkg-plist b/security/boringssl/pkg-plist index 3175d612e22e..9c9205e8e554 100644 --- a/security/boringssl/pkg-plist +++ b/security/boringssl/pkg-plist @@ -85,6 +85,9 @@ include/openssl/type_check.h include/openssl/x509.h include/openssl/x509_vfy.h include/openssl/x509v3.h +lib/cmake/OpenSSL/OpenSSLConfig.cmake +lib/cmake/OpenSSL/OpenSSLTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/OpenSSL/OpenSSLTargets.cmake lib/libcrypto.so lib/libcrypto.so.1 lib/libcrypto.so.1.0.0