From nobody Thu Dec 19 09:57:37 2024 X-Original-To: dev-commits-ports-all@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 4YDQvk1WBmz5gwq7; Thu, 19 Dec 2024 09:57:38 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YDQvj5LSrz4FbV; Thu, 19 Dec 2024 09:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734602257; 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=JbySsBfwAKNfsblQedJoACM+PO4SaJ0M2DOLTEk78us=; b=F4kuwBFx0nPMsQAwRUVDYmtpIrOwAISvJrZ3Gs5xhl07hZomp5XXUBz0eqJYw/0Oigx6KY aKC4YRgbstKzR+k8CiX80yuAHD6ww5qKMg7lbxWnZdxA2bwiL0eHLlIa6/CawYWsS3S5+f +XK2Q3wmKb3gIs91NVEAp5WHTLc4OjBqrS3HOG0WNKQXzN3ccXgwsGJ8oUNwPxY1Ole/qB UqOVJcFxhdv2ApFD4rsyDf6uDSANDcLo5b2i5B0kiuEj7nPtdH+5vUsd4jMOxyxY0clKHU fxSPvDaobWJcO9gI91ulOPDfpxNSdaEpBZTV9sEggyi3xVa7AOAvlAzRuNOxwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734602257; 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=JbySsBfwAKNfsblQedJoACM+PO4SaJ0M2DOLTEk78us=; b=QszJXCgjqy3kt9WuRHkgrl4afgY66M/0+XrCmqB43yfz9DufKutQ2+jl+1PrnwS+l1Bl7D 7Eo4+Sgi4NoHLXTzbHDidPMwEKIpNsA8aDJvty5iOOqEZ+ECX3kFyUZ4GCrW6ygdKhUtpM RC0JRA0/Wj+4JWvM2noDnVt35wkGanRBEAwhSNO0z3qgcoiDnM+bNKkQWAZPnAvl8U4qFx qq11wxMTY4Dh2xSMusOqQcrKnyESFK1JWiUi4Au+mmle8bIv55e3OVmf1U/hBCBrMlvRyF bz8RE6knlFeufnpdxfQMaL15RJMzF1QdbKsrB6FSeZ+iXbsZc+KCdwbmN+5FDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734602257; a=rsa-sha256; cv=none; b=cxl2yCWQF547l7iKZo0wJ1UCxNyx3gdBb+sS0iAqlHlIqX0sVjsJdjgISIhDV36++owNgn 2mqLZJ9aezR8uYabnWoXi2jFO55/AxBMwEtsalhCiDb13PS3tMXnVifQl0BTRfHXKJC4XD w25RHcywCKPzIEk2sUNJf9aiw9yfDdhka7aJzo0vLniO5azxy9Ox4FeBDra7Xi7gTIt7ju J1IDXelHTy8O6recLi2zBsz4bHgQd6kbr1kku2+MYeV5AAisNqvitEkWS8xtXcQfmUCmDe gV0VLKM+WVlS6PI8PycPjSoXbwj/LwJb00XmTv76EwykhWRusySsUGPDOR4GSA== 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 4YDQvj4YBCzpl2; Thu, 19 Dec 2024 09:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BJ9vbEu079552; Thu, 19 Dec 2024 09:57:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BJ9vbHG079549; Thu, 19 Dec 2024 09:57:37 GMT (envelope-from git) Date: Thu, 19 Dec 2024 09:57:37 GMT Message-Id: <202412190957.4BJ9vbHG079549@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: 0b7a09168040 - main - databases/mongosh: pet portlint and portclippy List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b7a091680405c7837b41d6a7432a119240f7678 Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b7a091680405c7837b41d6a7432a119240f7678 commit 0b7a091680405c7837b41d6a7432a119240f7678 Author: Ronald Klop AuthorDate: 2024-12-03 22:51:37 +0000 Commit: Ronald Klop 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 +.include .include "${PORTSDIR}/www/node${NODEJS_VERSION}/Makefile.version" +.include