From nobody Wed Jul 19 17:14:37 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 4R5j9g60Nmz4nlTH; Wed, 19 Jul 2023 17:14:47 +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 4R5j9V2kHmz4YmM; Wed, 19 Jul 2023 17:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689786878; 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=D+8S2XppMTmHVvAIzU3m+R8gY5lUkdgZPmY4WCck0JU=; b=xStIuVJMqQBCLn/Zq8fZAtGSfnKXoEljsI1O4ObQEUPu0Kp0miWbfexl0gUhVqb3QJvxmh z/aPk48VEQFXcWYrVfifrzUynW56nV0fuLONrfvo4O3/XTPOTOHwtqsb/PJ52JYM6X+iul NKTP8eJrSB4a2P62AWFSL6CRQG1UaA39f/TKJx7YIdjohtx/5FLs6P9VBL+0fyDTRyAjh6 TwQoXgNgqd9YZpLjGm9r+J4ok4ggmH+PfbGv0aCKnUfanu8QwgdgbOx1g+Zc3kHoLmfXUC 6jccNUVIh1Q12GpipPYiv+n43te3UkxSYpK6AHRezTWJ8pUG81AQpJW67+G45g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689786878; 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=D+8S2XppMTmHVvAIzU3m+R8gY5lUkdgZPmY4WCck0JU=; b=PDKtAjQdTnmaWMdeOJ4KUbwi9iPrhTONknGxMgwOkTSL2vE2dhG3WFnay8MxBa7gKzwKsy j1QsOA2BkV+nUBB24PQsCV4R+nMr/Au9Ql6L55V6qt2KhkpR9v+mCNELQp+iyO/Kz9GQZ1 SYO5BJ6tld6Dme/pZfSNry9tndjoFf4gzZe61Qq2Zg8nSWjJzrYtRZayC7bgrXoP6BDojD cp80aq2T8awFabnuHwTFLdoV4iNtfkvmcsC+T4Z7PbgUkFgUTw12bFg3/kc5Zr6KGo/4PS c1OviKRgvzX2a8n2e5AvdWmtEl7U7/u1D57nKkNwdPUmgiTJ4rAGYDMT4gszNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689786878; a=rsa-sha256; cv=none; b=l1JdQvHMpwEf1aCWwCi8HrAb7fflxCO6+EiWC0PjrSlFx9FI7vutdzT/jTNa+5DhloYw2c WMk0Sx1FBy6SizZeSAbpOcfjEn36v7sQ8yf1FlI1kYh7N/MF35p6bKSN/gE4Gy7XRL/964 sTkJ7q++sWIttk+2p0EQMOnVpRFiF0E9eYwmSGn3P12EM+FUW1hH+TtU/IdWpOCy3+Vgdr jqUUpJH4ZKzfDd6uaIkkVU80yugdzClSeQ1qI/nbYP5u7sNttjfKdUyOfTbXW9sRLao6hz 6aPOhq8CYms4KI8nBMYWVAWbc+QjDAFPeeGv6OmrrgYgciWzxfvi9Wh3FfXtbA== 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 4R5j9V19K2zwtr; Wed, 19 Jul 2023 17:14:37 +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 36JHEbu0000557; Wed, 19 Jul 2023 17:14:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36JHEbvY000556; Wed, 19 Jul 2023 17:14:37 GMT (envelope-from git) Date: Wed, 19 Jul 2023 17:14:37 GMT Message-Id: <202307191714.36JHEbvY000556@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 3ff054290d0d - main - www/onlyoffice-documentserver: Fix build after npm update 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ff054290d0d14b560434b5128c6636183f6763e Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ff054290d0d14b560434b5128c6636183f6763e commit 3ff054290d0d14b560434b5128c6636183f6763e Author: Mikael Urankar AuthorDate: 2023-07-19 17:14:17 +0000 Commit: Mikael Urankar CommitDate: 2023-07-19 17:14:17 +0000 www/onlyoffice-documentserver: Fix build after npm update --- www/onlyoffice-documentserver/Makefile | 20 +++++--------------- www/onlyoffice-documentserver/distinfo | 6 +----- www/onlyoffice-documentserver/files/npm | 2 +- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile index fa6b61855387..e8a6c00dde30 100644 --- a/www/onlyoffice-documentserver/Makefile +++ b/www/onlyoffice-documentserver/Makefile @@ -6,15 +6,11 @@ CATEGORIES= www MASTER_SITES+= LOCAL/mikael/v8/:source1 \ LOCAL/mikael/onlyoffice/:source2 \ https://nodejs.org/dist/v${NODE_VERSION_PKGFETCH}/:source3 \ - https://nodejs.org/dist/v${NODE_VERSION_PORTS}/:source3 \ - SF/optipng/OptiPNG/optipng-0.7.7/:source4 \ - https://nodejs.org/download/release/v$v${NODE_VERSION_PORTS}/:node + SF/optipng/OptiPNG/optipng-0.7.7/:source4 DISTFILES+= v8-8.9.255.25_all.tar.gz:source1 \ node-v${NODE_VERSION_PKGFETCH}.tar.gz:source3 \ - node-v${NODE_VERSION_PORTS}.tar.gz:source3 \ optipng-0.7.7.tar.gz:source4 \ - ${PORTNAME}-${DISTVERSION}-npm-cache.tar.gz:source2 \ - node-v${NODE_VERSION_PORTS}-headers.tar.gz:node + ${PORTNAME}-${DISTVERSION}-npm-cache.tar.gz:source2 MAINTAINER= mikael@FreeBSD.org COMMENT= Secure office and productivity apps @@ -24,7 +20,6 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BROKEN_i386= fails to build -BROKEN= fails to build after dd041756883ee07e3e67e8e2704d93b59efd90e7 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ boost-libs>0:devel/boost-libs \ @@ -97,8 +92,6 @@ SUB_LIST= ETCDIR=${ETCDIR} \ # node version used with "npm install pkg@5.5.1" NODE_VERSION_PKGFETCH= 16.13.0 -# node version used in the ports tree -NODE_VERSION_PORTS= 16.20.0 MAKE_ENV= BUILD_NUMBER="8" \ PKG_CACHE_PATH=${WRKDIR}/.pkg-cache \ @@ -116,12 +109,8 @@ CONFLICTS_BUILD=devel/googletest post-extract: @${MV} ${WRKDIR}/v8 ${WRKSRC}/core/Common/3dParty/v8 - @${MKDIR} ${WRKDIR}/.pkg-cache/node \ - ${WRKDIR}/.cache/node-gyp/${NODE_VERSION_PORTS} - @${CP} ${DISTDIR}/node-v${NODE_VERSION_PKGFETCH}.tar.gz ${DISTDIR}/node-v${NODE_VERSION_PORTS}.tar.gz \ - ${WRKDIR}/.pkg-cache/node - ${MV} ${WRKDIR}/node-v${NODE_VERSION_PORTS}/include ${WRKDIR}/.cache/node-gyp/${NODE_VERSION_PORTS} - ${ECHO_CMD} '9' > ${WRKDIR}/.cache/node-gyp/${NODE_VERSION_PORTS}/installVersion + @${MKDIR} ${WRKDIR}/.pkg-cache/node + @${CP} ${DISTDIR}/node-v${NODE_VERSION_PKGFETCH}.tar.gz ${WRKDIR}/.pkg-cache/node @${MKDIR} ${WRKSRC}/sdkjs-plugins/v1 @${CP} ${WRKSRC}/onlyoffice.github.io/sdkjs-plugins/v1/* ${WRKSRC}/sdkjs-plugins/v1 @@ -189,6 +178,7 @@ post-patch: do-build: ${INSTALL_SCRIPT} ${FILESDIR}/npm ${BINARY_LINKDIR}/npm + @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKDIR}/.bin/npm @cd ${WRKSRC}/web-apps/build ; ${SETENV} ${MAKE_ENV} npm install patch-package @cd ${WRKSRC}/web-apps/build ; ${SETENV} ${MAKE_ENV} npm install optipng-bin@5.1.0 diff --git a/www/onlyoffice-documentserver/distinfo b/www/onlyoffice-documentserver/distinfo index 90b8bcf3155e..3e770cb7429f 100644 --- a/www/onlyoffice-documentserver/distinfo +++ b/www/onlyoffice-documentserver/distinfo @@ -1,16 +1,12 @@ -TIMESTAMP = 1680598294 +TIMESTAMP = 1689784075 SHA256 (v8-8.9.255.25_all.tar.gz) = 54853ef93accc063a82a0dc29457b25c9b6d88315431d62e06ab1f84797c5f80 SIZE (v8-8.9.255.25_all.tar.gz) = 72818814 SHA256 (node-v16.13.0.tar.gz) = 9c00e5b6024cfcbc9105f9c58cf160762e78659a345d100c5bd80a7fb38c684f SIZE (node-v16.13.0.tar.gz) = 63735070 -SHA256 (node-v16.20.0.tar.gz) = 58c10af148bce26f17417f58ab8f71b91003cae87df17cc48e9f09c94edd908f -SIZE (node-v16.20.0.tar.gz) = 66837258 SHA256 (optipng-0.7.7.tar.gz) = 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452 SIZE (optipng-0.7.7.tar.gz) = 2329555 SHA256 (onlyoffice-documentserver-7.3.3.49-npm-cache.tar.gz) = e1611fe023c2ac5eacae097c4f9605710f8d5de34b600f6301b282872db3fe1d SIZE (onlyoffice-documentserver-7.3.3.49-npm-cache.tar.gz) = 234604012 -SHA256 (node-v16.20.0-headers.tar.gz) = 4ab673791303ba8284c6230a401b4e6054acfbbde05f4b4937769692cb3e80ed -SIZE (node-v16.20.0-headers.tar.gz) = 568323 SHA256 (ONLYOFFICE-DocumentServer-v7.3.3.49-v7.3.3_GH0.tar.gz) = 7eb5d59aea3211fd56d17379c29bf680939fab88e1eb25d0cd6aa32c64e86a4c SIZE (ONLYOFFICE-DocumentServer-v7.3.3.49-v7.3.3_GH0.tar.gz) = 63957 SHA256 (ONLYOFFICE-core-v7.3.3.49_GH0.tar.gz) = 7cb74cd2027d051ddf66129df9efc78e3d646af189c18d50e33018d50a356904 diff --git a/www/onlyoffice-documentserver/files/npm b/www/onlyoffice-documentserver/files/npm index 15abf81b6894..1de6db458319 100644 --- a/www/onlyoffice-documentserver/files/npm +++ b/www/onlyoffice-documentserver/files/npm @@ -1,2 +1,2 @@ #!/bin/sh -exec /usr/local/bin/npm --offline "$@" +exec /usr/local/bin/npm --offline --nodedir=%%LOCALBASE%% "$@"