Date: Wed, 19 Jul 2023 17:14:37 GMT From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3ff054290d0d - main - www/onlyoffice-documentserver: Fix build after npm update Message-ID: <202307191714.36JHEbvY000556@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ff054290d0d14b560434b5128c6636183f6763e commit 3ff054290d0d14b560434b5128c6636183f6763e Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2023-07-19 17:14:17 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> 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%% "$@"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307191714.36JHEbvY000556>