Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Feb 2022 21:30:43 GMT
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1a275d42624d - main - security/boringssl: make portfmt(1) happy
Message-ID:  <202202172130.21HLUhQn074652@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1a275d42624dbd0c5453306139ddc22137d74e8b

commit 1a275d42624dbd0c5453306139ddc22137d74e8b
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2022-02-17 21:30:03 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2022-02-17 21:30:03 +0000

    security/boringssl: make portfmt(1) happy
    
    No functional changes.
---
 security/boringssl/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile
index fdb88be7b003..040beae0960a 100644
--- a/security/boringssl/Makefile
+++ b/security/boringssl/Makefile
@@ -10,10 +10,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:insource cpe go:no_targets localbase perl5
 
-CONFLICTS_INSTALL=	security/libressl \
-			security/libressl-devel \
-			security/openssl \
-			security/openssl-devel \
+CONFLICTS_INSTALL=	security/libressl security/libressl-devel \
+			security/openssl security/openssl-devel \
 			security/openssl-quictls
 
 CPE_VENDOR=	google
@@ -30,7 +28,9 @@ CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=1 \
 USE_LDCONFIG=	yes
 LDFLAGS+=	-Wl,-rpath,${LOCALBASE}/lib
 TEST_TARGET=	run_tests
-MAKE_ENV+=	GOPATH=${WRKSRC}/vendor GOPROXY=off GOFLAGS=-mod=vendor
+MAKE_ENV+=	GOFLAGS=-mod=vendor \
+		GOPATH=${WRKSRC}/vendor \
+		GOPROXY=off
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tool/bssl ${STAGEDIR}${PREFIX}/bin/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202172130.21HLUhQn074652>