git: 0b7a09168040 - main - databases/mongosh: pet portlint and portclippy

The branch main has been updated by ronald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0b7a091680405c7837b41d6a7432a119240f7678

commit 0b7a091680405c7837b41d6a7432a119240f7678
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2024-12-03 22:51:37 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2024-12-19 09:56:59 +0000

    databases/mongosh: pet portlint and portclippy
    
    No functional change intended.
    
    PR:     283109
    Approved by:    maintainer timeout
---
 databases/mongosh/Makefile | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/databases/mongosh/Makefile b/databases/mongosh/Makefile
index ded337db4633..1d09297026a7 100644
--- a/databases/mongosh/Makefile
+++ b/databases/mongosh/Makefile
@@ -6,13 +6,13 @@ MASTER_SITES=	https://registry.npmjs.org/mongodb-client-encryption/-/:mongocrypt
 		https://registry.npmjs.org/kerberos/-/:kerberos \
 		https://registry.npmjs.org/os-dns-native/-/:dns \
 		https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/${DISTVERSIONFULL}/:modules
-		# https://nodejs.org/dist/latest-v${NODEJS_VERSION}.x/:node
+#		https://nodejs.org/dist/latest-v${NODEJS_VERSION}.x/:node
 DISTFILES=	mongodb-client-encryption-${MONGO_CRYPT_VER}.tgz:mongocrypt \
 		kerberos-${KERBEROS_VER}.tgz:kerberos \
 		os-dns-native-${OSDNSNATIVE_VER}.tgz:dns \
 		${NODE_MODULES_TARBALL}:modules \
-		# ${NODEJS_TARBALL}:node \
-		# SHASUMS256.txt:node
+#		${NODEJS_TARBALL}:node \
+#		SHASUMS256.txt:node
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTFILE_DEFAULT}
 
@@ -34,12 +34,12 @@ BUILD_DEPENDS=	bash>0:shells/bash \
 		libuv>=1.42.0:devel/libuv \
 		objdump:devel/binutils \
 		git>0:devel/git
-RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 LIB_DEPENDS=	libmongocrypt.so:databases/libmongocrypt \
 		libbrotlidec.so:archivers/brotli \
 		libcares.so:dns/c-ares \
 		libnghttp2.so:www/libnghttp2 \
 		libuv.so:devel/libuv
+RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		compiler:c++11-lib gmake gssapi:mit localbase pkgconfig nodejs:20,build python:build ssl
 
@@ -47,18 +47,18 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	VultureProject
 GH_PROJECT=	mongosh
 
-MPROTECT_DISABLE=	bin/mongosh
-
-CXXFLAGS+=	-DNODE_API_EXPERIMENTAL \
-		-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT
-
 CUSTOM_ENV=	SEGMENT_API_KEY=dummy BUILD_TYPE=dynamic
 CONFIGURE_ENV=	${CUSTOM_ENV}
 MAKE_ENV=	${CUSTOM_ENV} \
 		NODE_JS_VERSION=file://${_DISTDIR}/${NODEJS_TARBALL} \
 		BOXEDNODE_CONFIGURE_ARGS="--shared-brotli,--shared-cares,--shared-libuv,--shared-nghttp2,--shared-zlib,--shared-openssl,--openssl-use-def-ca-store,--without-npm"
+CXXFLAGS+=	-DNODE_API_EXPERIMENTAL \
+		-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT
+
 REINPLACE_ARGS=	-i ''
 
+MPROTECT_DISABLE=	bin/mongosh
+
 MONGO_CRYPT_VER=6.0.0
 KERBEROS_VER=	2.1.0
 OSDNSNATIVE_VER=1.2.0
@@ -105,7 +105,7 @@ do-build:
 	cd ${NODE_MODULES_DIR}/${module} && ${MAKE_ENV} ${MAKE_CMD} BUILDTYPE=Release -C build -d
 .endfor
 	${REINPLACE_CMD} 's/"version": "0.0.0-dev.0"/"version": "${DISTVERSION}"/g' ${WRKSRC}/packages/cli-repl/package.json
-	cd ${WRKSRC} && ${MAKE_ENV} /usr/local/bin/npm run compile-exec
+	cd ${WRKSRC} && ${MAKE_ENV} ${LOCALBASE}/bin/npm run compile-exec
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dist/mongosh ${STAGEDIR}${PREFIX}/bin
@@ -121,7 +121,7 @@ npm-pkg-list: extract
 		> ${FILESDIR}/npm-pkg.list
 
 .for module in mongodb-client-encryption kerberos os-dns-native mongodb-crypt-library-version glibc-version
-	cd ${NODE_MODULES_DIR}/${module} && /usr/local/bin/npm list 2>/dev/null \
+	cd ${NODE_MODULES_DIR}/${module} && ${LOCALBASE}/bin/npm list 2>/dev/null \
 		| ${GREP} UNMET \
 		| ${AWK} 'BEGIN{FS="UNMET DEPENDENCY "}{print $$2}' \
 		> ${FILESDIR}/npm-pkg-${module}.list
@@ -133,17 +133,18 @@ node-modules-archive: build
 	${MKDIR} -v ${NODE_MODULES_DIR}/${module}
 	${TAR} -xzf ${_DISTDIR}/${module}-*.tgz -C ${NODE_MODULES_DIR}/${module} --strip-components 1
 .endfor
-	for f in ${FILESDIR}/node-modules-patches/*; do patch -N -d ${WRKSRC} < $$f; done
+	for f in ${FILESDIR}/node-modules-patches/*; do ${PATCH} -N -d ${WRKSRC} < $$f; done
 
-	cd ${WRKSRC} && npx cross-env PUPPETEER_SKIP_DOWNLOAD=1 /usr/local/bin/npm install --cache ${NPM_CACHE_DIR}
+	cd ${WRKSRC} && npx cross-env PUPPETEER_SKIP_DOWNLOAD=1 ${LOCALBASE}/bin/npm install --cache ${NPM_CACHE_DIR}
 
 .for module in mongodb-client-encryption kerberos os-dns-native mongodb-crypt-library-version glibc-version
-	/usr/local/bin/npm cache add $$(cat ${FILESDIR}/npm-pkg-${module}.list) --cache ${NPM_CACHE_DIR} || true
-	cd ${NODE_MODULES_DIR}/${module} && ${CONFIGURE_ENV} /usr/local/bin/npm install --ignore-scripts --cache ${NPM_CACHE_DIR}
+	${LOCALBASE}/bin/npm cache add $$(cat ${FILESDIR}/npm-pkg-${module}.list) --cache ${NPM_CACHE_DIR} || true
+	cd ${NODE_MODULES_DIR}/${module} && ${CONFIGURE_ENV} ${LOCALBASE}/bin/npm install --ignore-scripts --cache ${NPM_CACHE_DIR}
 .endfor
 	${FIND} ${WRKSRC} -name "*.orig" -or -name "*.bak" -delete
 
 	cd ${WRKSRC} && ${TAR} -cJf /tmp/${NODE_MODULES_TARBALL} node_modules
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/node${NODEJS_VERSION}/Makefile.version"
+.include <bsd.port.post.mk>