From nobody Sat Apr 9 07:29:21 2022 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 A51CC1A8BAF3; Sat, 9 Apr 2022 07:29:21 +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 4Kb6FF3mTBz3vbf; Sat, 9 Apr 2022 07:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649489361; 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=Xg+pvQ9vnepuxWTV4xNWVlbyQwTXnu0mh9RWFYjTePs=; b=GK3ea1xOtcCy9+e1NnBhz3SuQBgjTdXGGT5LFwwSIEsJeUVU1hy5lpxXe39oeo+q1W8xdI 7QM3wGgqEVx/8XJ2drVM8cy84vqjQkB1F+DDHOI8OtFG9vuLNde6y+JUV8orGWBBmfd0yU zY9i52cZMDGE8DSvdaYL+D+eaBFTiR2jguxjeC9Ce3SqVr9otp3d/gPyOru7WHuidkiklq x9g+VEN7uf2OmxRR8celIcWC2Yfxo+Gm9vmOFJBWhdZVDU6j8DFivyKpCwjc/v0iM4rLtm MxMn+Pf3NGMYGYvk+SJkhYV9m8rEUC9JbrwlOGrVCM9qQpWNZMb0ScqNP7yO/w== 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 5C0A515A1F; Sat, 9 Apr 2022 07:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2397TLui031776; Sat, 9 Apr 2022 07:29:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2397TLc2031774; Sat, 9 Apr 2022 07:29:21 GMT (envelope-from git) Date: Sat, 9 Apr 2022 07:29:21 GMT Message-Id: <202204090729.2397TLc2031774@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: 960d9357eca9 - main - www/onlyoffice-documentserver: Fix build after node 16.14.2 update and improve port 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 960d9357eca90f092e32b190ba7d8ecdf95a4e0c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649489361; 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=Xg+pvQ9vnepuxWTV4xNWVlbyQwTXnu0mh9RWFYjTePs=; b=MXsIHNr3B5GAfjhUvrd7kwxQjBx9GqLTGJAmDgI/lqgdGNWDbemNu/4oMISC8Lm/j7H5lW C+lno5g43r6lWKgfenvfF5BLYhH1YGCQ0Rq9679WGnG7W8fyCpj2Tc6SsIGjPZF37aWUbZ pfdUJtsfWdbr8Zgoep1FTfbeaUArclhExaOybAwcGl1ft2cKVAtYPueya/mqun7V+aEdCf tYt1X2I06OWSbPryTt21N7sOC3NftKUQu4EFhi/8ERJUl5sh+CePtpH4CCpDeU5OVH+43j iHyGes+dTm8yfBquvg/mV7y0bGkguTObZIFXR3LZlaXQXQCc5HbbsKguX55uWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649489361; a=rsa-sha256; cv=none; b=b8nMqLxKnYTG3DFma5nrjuBWlhzmEy7vXKi7CtvDHRinXLyeISPd+l4vSa4bdreE9Kot/v bPQ9KLyJZEkyvdxM3+qei7XYc4MAAxYKKkzIk/i4mrb9ugwdTPFoPGn8zwyndqsgASVCTD ynh+RJiU8hgK1N/mbQZMSN3iUNM36GhBRh4a6awYM/LPFSoqm9MtqypzDsVVaNqz2Wn2ac kWs2/vI+hQuRyUv7H8Kxu+mUG6mnQhLR1XapRHEhQNFnfhQy7o5jZ6UaCCgnx0CILnmwX4 zY0/dGWL1F/8G1TGHcukpo9A0SkunxnUga8hm4esJnJuGnDp3yYsBMf0b4DaMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=960d9357eca90f092e32b190ba7d8ecdf95a4e0c commit 960d9357eca90f092e32b190ba7d8ecdf95a4e0c Author: Mikael Urankar AuthorDate: 2022-04-08 16:10:15 +0000 Commit: Mikael Urankar CommitDate: 2022-04-09 07:29:16 +0000 www/onlyoffice-documentserver: Fix build after node 16.14.2 update and improve port - Regen the distinfo after node 16.14.2 update - Fix for an hardcoded /usr/local in files/patch-core_Common_3dParty_icu_icu.pri - Don't chown in pkg-plist and documentserver-generate-allfonts.sh.m4, there is no rational to do that - Use a trigger to execute documentserver-generate-allfonts.sh and fix pkg-message accordingly PR: 263114 --- www/onlyoffice-documentserver/Makefile | 24 +++++++++++++++------- www/onlyoffice-documentserver/distinfo | 8 +++++--- .../files/onlyoffice-documentserver.ucl.in | 9 ++++++++ .../files/patch-core_Common_3dParty_icu_icu.pri | 6 +++--- ...rver_bin_documentserver-generate-allfonts.sh.m4 | 8 +++----- www/onlyoffice-documentserver/files/pkg-message.in | 17 ++------------- www/onlyoffice-documentserver/pkg-plist | 7 ++++--- 7 files changed, 43 insertions(+), 36 deletions(-) diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile index 3f1a044f6891..587ea9105446 100644 --- a/www/onlyoffice-documentserver/Makefile +++ b/www/onlyoffice-documentserver/Makefile @@ -5,12 +5,14 @@ PORTREVISION= 1 CATEGORIES= www MASTER_SITES+= LOCAL/mikael/v8/:source1 \ LOCAL/mikael/onlyoffice/:source2 \ - https://nodejs.org/dist/v16.13.0/:source3 \ + 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 DISTFILES+= v8-6.8.275.32_all.tar.gz:source1 \ v8-6.8.275.32_122aarch64.tar.gz:source1 \ v8-6.8.275.32_122amd64.tar.gz:source1 \ - node-v16.13.0.tar.gz:source3 \ + node-v${NODE_VERSION_PKGFETCH}.tar.gz:source3 \ + node-v${NODE_VERSION_PORTS}.tar.gz:source3 \ optipng-0.7.7.tar.gz:source4 \ onlyoffice-${DISTVERSION}-npm-cache.tar.gz:source2 \ @@ -38,7 +40,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${PY_FLA webfonts>=0:x11-fonts/webfonts USES= autoreconf:build dos2unix fakeroot gmake gnome iconv localbase nodejs:16,build pkgconfig \ - python:3.7+,build qt:5 + python:3.7+,build qt:5 trigger USE_QT= qmake_build USE_GITHUB= yes GH_ACCOUNT= ONLYOFFICE @@ -97,6 +99,11 @@ SUB_LIST= ETCDIR=${ETCDIR} \ PREFIX=${PREFIX} \ WWWDIR=${WWWDIR} +# 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.14.2 + MAKE_ENV= BUILD_NUMBER="1" \ PKG_CACHE_PATH=${WRKDIR}/.pkg-cache \ PRODUCT_VERSION="${DISTVERSION}" @@ -115,10 +122,13 @@ post-extract: @${MV} ${WRKDIR}/v8_obj_122${ARCH}/obj ${WRKSRC}/core/Common/3dParty/v8/v8/out.gn/freebsd_64 @${MKDIR} ${WRKDIR}/.pkg-cache/node - @${CP} ${DISTDIR}/node-v16.13.0.tar.gz ${WRKDIR}/.pkg-cache/node -# Checksum can be verified here: https://nodejs.org/dist/v16.13.0/SHASUMS256.txt - @${ECHO} "9c00e5b6024cfcbc9105f9c58cf160762e78659a345d100c5bd80a7fb38c684f node-v16.13.0.tar.gz" > \ - ${WRKDIR}/.pkg-cache/node/node-v16.13.0.tar.gz.sha256sum + @${CP} ${DISTDIR}/node-v${NODE_VERSION_PKGFETCH}.tar.gz ${DISTDIR}/node-v${NODE_VERSION_PORTS}.tar.gz \ + ${WRKDIR}/.pkg-cache/node +# Checksum can be verified here: https://nodejs.org/dist/v${NODE_VERSION_PKGFETCH}/SHASUMS256.txt + @${ECHO} "9c00e5b6024cfcbc9105f9c58cf160762e78659a345d100c5bd80a7fb38c684f node-v${NODE_VERSION_PKGFETCH}.tar.gz" > \ + ${WRKDIR}/.pkg-cache/node/node-v${NODE_VERSION_PKGFETCH}.tar.gz.sha256sum + @${ECHO} "082170f362c4da0e97f3a1899e3f5e4c998bbc245b803c77c6ab113a2b5cbd5f node-v${NODE_VERSION_PKGPORTS}.tar.gz" > \ + ${WRKDIR}/.pkg-cache/node/node-v${NODE_VERSION_PORTS}.tar.gz.sha256sum @${MKDIR} ${WRKSRC}/sdkjs-plugins/v1 @${CP} ${WRKSRC}/onlyoffice.github.io/sdkjs-plugins/v1/* ${WRKSRC}/sdkjs-plugins/v1 diff --git a/www/onlyoffice-documentserver/distinfo b/www/onlyoffice-documentserver/distinfo index 72a41eed09d2..c5100056b982 100644 --- a/www/onlyoffice-documentserver/distinfo +++ b/www/onlyoffice-documentserver/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1646292390 +TIMESTAMP = 1649399300 SHA256 (v8-6.8.275.32_all.tar.gz) = 9a62989b8965970c0cc67aef911b4937b822fe91a41e9d6977e797ed1326504b SIZE (v8-6.8.275.32_all.tar.gz) = 65333304 SHA256 (v8-6.8.275.32_122aarch64.tar.gz) = c7311440b3d97a0caa41406de43fd77fc45f1c0f627cea8c54466a7ab78ca69a @@ -7,10 +7,12 @@ SHA256 (v8-6.8.275.32_122amd64.tar.gz) = 78d13788f4e3608a7b6765621353aa9f334f549 SIZE (v8-6.8.275.32_122amd64.tar.gz) = 10328115 SHA256 (node-v16.13.0.tar.gz) = 9c00e5b6024cfcbc9105f9c58cf160762e78659a345d100c5bd80a7fb38c684f SIZE (node-v16.13.0.tar.gz) = 63735070 +SHA256 (node-v16.14.2.tar.gz) = 082170f362c4da0e97f3a1899e3f5e4c998bbc245b803c77c6ab113a2b5cbd5f +SIZE (node-v16.14.2.tar.gz) = 64999385 SHA256 (optipng-0.7.7.tar.gz) = 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452 SIZE (optipng-0.7.7.tar.gz) = 2329555 -SHA256 (onlyoffice-7.0.1.50-npm-cache.tar.gz) = cb61c61cb4e72fc6b18fe560d45c742b4c57ff0f971381db7b4407aaca371f54 -SIZE (onlyoffice-7.0.1.50-npm-cache.tar.gz) = 148399002 +SHA256 (onlyoffice-7.0.1.50-npm-cache.tar.gz) = 48824b1116f38aae29fe9a80ea495aba398d658555e55460d3774491028f4c19 +SIZE (onlyoffice-7.0.1.50-npm-cache.tar.gz) = 212890771 SHA256 (ONLYOFFICE-DocumentServer-v7.0.1.50-v7.0.1_GH0.tar.gz) = 1b5a529bc53c3e3d2c1502a610aa7670d9b2a470b41bc195964507b48726fc7d SIZE (ONLYOFFICE-DocumentServer-v7.0.1.50-v7.0.1_GH0.tar.gz) = 52186 SHA256 (ONLYOFFICE-core-v7.0.1.50_GH0.tar.gz) = d4f0ba20e92e1e9286e43ccb48c540f324c540398720200a9eb9de875ac3794b diff --git a/www/onlyoffice-documentserver/files/onlyoffice-documentserver.ucl.in b/www/onlyoffice-documentserver/files/onlyoffice-documentserver.ucl.in new file mode 100644 index 000000000000..5c04e486af5d --- /dev/null +++ b/www/onlyoffice-documentserver/files/onlyoffice-documentserver.ucl.in @@ -0,0 +1,9 @@ +path: [ "%%WWWDIR%%/documentserver/fonts", "%%PREFIX%%/share/fonts" ] +trigger: { + type: lua + sandbox: false + script: <