Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Jan 2024 19:52:18 GMT
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 474a16b79d35 - main - devel/mongo-c-driver: Use USE_GITHUB helper and always use (lib)utf8proc from ports
Message-ID:  <202401031952.403JqIdi053235@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=474a16b79d35866ad09a29454ef26fb7bd2cd841

commit 474a16b79d35866ad09a29454ef26fb7bd2cd841
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2024-01-03 19:48:00 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2024-01-03 19:52:14 +0000

    devel/mongo-c-driver: Use USE_GITHUB helper and always use (lib)utf8proc from ports
    
    * Use USE_GITHUB helper instead of working around it
    * Always unbundle (lib)utf8proc as per Porters Handbook
    * Partially fix USES= pathfix
    
    PR:             276062
    Reviewed by:    Krzysztof <ports@bsdserwis.com> (maintainer)
---
 devel/mongo-c-driver/Makefile | 18 ++++++++++--------
 devel/mongo-c-driver/distinfo |  6 +++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/devel/mongo-c-driver/Makefile b/devel/mongo-c-driver/Makefile
index b709a97de6e1..d85e29f4d3d6 100644
--- a/devel/mongo-c-driver/Makefile
+++ b/devel/mongo-c-driver/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mongo-c-driver
 DISTVERSION=	1.25.3
+PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	https://codeload.github.com/mongodb/${PORTNAME}/tar.gz/${DISTVERSION}?dummy=/
 
 MAINTAINER=	ports@bsdserwis.com
 COMMENT=	C Driver for MongoDB
@@ -11,12 +11,18 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libbson-1.0.so:devel/libbson \
+		libutf8proc.so:textproc/utf8proc \
 		libzstd.so:archivers/zstd
 
 USES=		cmake cpe pathfix pkgconfig python:env
 CPE_VENDOR=	mongodb
+PATHFIX_WRKSRC=	${WRKSRC}/src/libmongoc
 USE_LDCONFIG=	yes
 
+USE_GITHUB=    yes
+GH_ACCOUNT=    mongodb
+GH_PROJECT=    mongo-c-driver
+
 CMAKE_ARGS=	-DENABLE_ZLIB=SYSTEM
 CMAKE_ON=	ENABLE_MONGOC \
 		ENABLE_ZSTD \
@@ -24,10 +30,11 @@ CMAKE_ON=	ENABLE_MONGOC \
 CMAKE_OFF=	BUILD_TESTING \
 		ENABLE_EXAMPLES \
 		ENABLE_TESTS \
-		ENABLE_UNINSTALL
+		ENABLE_UNINSTALL \
+		USE_BUNDLED_UTF8PROC
 
 OPTIONS_DEFINE=		CRYPTOPROFILE DOCS ICU MONGODBAWS RDTSCP SASL SNAPPY \
-			SRV SSL UTF8PROC ZSTD
+			SRV SSL ZSTD
 OPTIONS_DEFAULT=	SSL
 OPTIONS_SUB=		yes
 
@@ -35,7 +42,6 @@ CRYPTOPROFILE_DESC=	Use system crypto profile (requires OpenSSL)
 MONGODBAWS_DESC=	Enable support for the MONGODB-AWS authentication mechanism
 RDTSCP_DESC=		Fast performance counters on Intel using the RDTSCP instruction
 SRV_DESC=		Enable support for mongodb+srv URIs
-UTF8PROC_DESC=		SCRAM-SHA-256 authentication with non-ASCII passwords (Use system utf8proc instead of bundled one)
 
 CRYPTOPROFILE_CMAKE_ON=	-DENABLE_CRYPTO_SYSTEM_PROFILE=ON
 CRYPTOPROFILE_CMAKE_OFF=	-DENABLE_CRYPTO_SYSTEM_PROFILE=OFF
@@ -69,10 +75,6 @@ SRV_CMAKE_OFF=		-DENABLE_SRV=OFF
 SSL_USES=		ssl
 SSL_CMAKE_OFF=		-DENABLE_SSL=OFF
 
-UTF8PROC_LIB_DEPENDS=	libutf8proc.so:textproc/utf8proc
-UTF8PROC_CMAKE_ON=	-DUSE_BUNDLED_UTF8PROC=OFF
-UTF8PROC_CMAKE_OFF=	-DUSE_BUNDLED_UTF8PROC=ON
-
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_CMAKE_ON=		-DENABLE_ZSTD=ON
 ZSTD_CMAKE_OFF=		-DENABLE_ZSTD=OFF
diff --git a/devel/mongo-c-driver/distinfo b/devel/mongo-c-driver/distinfo
index a4e44411fab8..f7d046fd237c 100644
--- a/devel/mongo-c-driver/distinfo
+++ b/devel/mongo-c-driver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1703795554
-SHA256 (mongo-c-driver-1.25.3.tar.gz) = d7cdedc5164b7b8ca39bb45bee789da44097052c882fa84996e4d90eec6fe8d3
-SIZE (mongo-c-driver-1.25.3.tar.gz) = 7306922
+TIMESTAMP = 1704141051
+SHA256 (mongodb-mongo-c-driver-1.25.3_GH0.tar.gz) = d7cdedc5164b7b8ca39bb45bee789da44097052c882fa84996e4d90eec6fe8d3
+SIZE (mongodb-mongo-c-driver-1.25.3_GH0.tar.gz) = 7306922



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