From nobody Sun Apr 2 15:41:19 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 4PqJCg35kCz43p0g; Sun, 2 Apr 2023 15:41:19 +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 4PqJCg2d4Jz3sGv; Sun, 2 Apr 2023 15:41:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680450079; 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=ZlHPxmMStzzZ2bhfb6cPu695mfakP/mO9MWgy81+ZL0=; b=DYK78G1IT07QIe4s3JPfpfXGukD+qz4DOws3Ad/IGL3v6D/muhQltYiSm8LOVMvnz6zcZo CdpeSss/upAOkBL7vMyvULLsRx8ywY7FObCNbFaDXFZujotIhsNGt/Azdg3150mawCCodN gXmuu5GWuHZ0RCi9A7kzepWiKfmB1uBgjaJ8DUm72cHNxd9PgOSJH+DAmjeOCg5MzB+RJX yjGJmOzFiPqkkMRpCNcjrf3KhnW2uncnTEVA7I4ukGX8Sf6s2sKRDzo/0TeVkYnvdq5CYy LxvQsQ7OKm3IIC7pVThJk2b+BFcv/FRy/eOK7uF22vgxuNhrmswQ3fwF+rAjng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680450079; 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=ZlHPxmMStzzZ2bhfb6cPu695mfakP/mO9MWgy81+ZL0=; b=qCLfO7jen1P6CeQ423JMJx4eQf1vMtH6+VIKEajlJ/YHFFxpEJ27x1BBsaqWLstQZ6VzZ+ RoOvDH6bT2VIy/fGJQCTWMeZ2/jgNhDDHPzTYgf/9vYXlQCWm4i0H0tSuQof7JeMl4cwUA lcm5zyLEBo2LDpjglGWhzfPsU3x3FEfzMknMW2Y88tGI9b57+n2oKA0xuEs6erRPGwsB1K grS+Vf7kq/6DEi+a85/UmV4cr0uwOxlaEtg76l+Fr4rT0MeLcXTMzHb5EUhvWwHcsAlWYs tzkSwE7cj2ox/FCfVbnei2rZca/pdONs4CHvXpHip9xTd3VXdco0gTH9Fs6cGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680450079; a=rsa-sha256; cv=none; b=pszo8ohfb20WWJfY/donX96grpljbZY0kExgsF1XQjPChcFaE8iIJYEYd7AP/4G0Kd8byu zt7kb/5/KLJpN5aNtT1iIhI0fU+U17uGYQd9m1/M0dpRhDOWF2Cj8h54bKpbLOZrOq+mTE kpvAFL93X6LSprr7VC6pbX5W5HkAx4GF98qIsnO32DRLsETBYKBnH9fwTg+YdJmml+X/6U sYWu9eiDVQLdlqZYA5qlbyKrZcHUKR5wh78sBoimWH281pxO8cBsLRnA0ShpzQFHvA1cih /TNTXSZFpgL3GUiaSpTzeMcyfaexy0qn1LvanCwJXxAuRXNZ9vGCTCNXAxsrVA== 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 4PqJCg1hKrzN4P; Sun, 2 Apr 2023 15:41:19 +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 332FfJsC093684; Sun, 2 Apr 2023 15:41:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332FfJro093683; Sun, 2 Apr 2023 15:41:19 GMT (envelope-from git) Date: Sun, 2 Apr 2023 15:41:19 GMT Message-Id: <202304021541.332FfJro093683@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: 3661e14f6aec - main - www/onlyoffice-documentserver: do not strip the json binary 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: 3661e14f6aec57bf5950af831ea627070a310258 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=3661e14f6aec57bf5950af831ea627070a310258 commit 3661e14f6aec57bf5950af831ea627070a310258 Author: Mikael Urankar AuthorDate: 2023-04-02 13:24:44 +0000 Commit: Mikael Urankar CommitDate: 2023-04-02 15:40:57 +0000 www/onlyoffice-documentserver: do not strip the json binary binary generated by npm/pkg doesn't work if they are stripped PR: 270591 Reported by: freebsd.org@vollkorn.cryptobitch.de --- www/onlyoffice-documentserver/Makefile | 4 ++-- www/onlyoffice-documentserver/pkg-plist | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile index 09834c620b81..f3af86ea8c4a 100644 --- a/www/onlyoffice-documentserver/Makefile +++ b/www/onlyoffice-documentserver/Makefile @@ -197,13 +197,13 @@ do-build: do-install: # install the project -# do not strip docservice, converter and metrics +# do not strip docservice, converter, metrics and json cd ${WRKSRC}/document-server-package/common/documentserver/home && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/documentserver ${INSTALL_SCRIPT} ${WRKSRC}/document-server-package/common/documentserver/bin/*.sh ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/tools/all* ${STAGEDIR}${WWWDIR}/documentserver/server/tools ${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/x2t ${STAGEDIR}${WWWDIR}/documentserver/server/FileConverter/bin ${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/docbuilder ${STAGEDIR}${WWWDIR}/documentserver/server/FileConverter/bin - ${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/npm/json ${STAGEDIR}${WWWDIR}/documentserver/npm + ${INSTALL_DATA} ${WRKSRC}/document-server-package/common/documentserver/home/npm/json ${STAGEDIR}${WWWDIR}/documentserver/npm ${INSTALL_LIB} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/*.so ${STAGEDIR}${PREFIX}/lib ${RM} ${STAGEDIR}${PREFIX}/bin/documentserver-letsencrypt.sh diff --git a/www/onlyoffice-documentserver/pkg-plist b/www/onlyoffice-documentserver/pkg-plist index c1aaf2c1f596..f31165223bf7 100644 --- a/www/onlyoffice-documentserver/pkg-plist +++ b/www/onlyoffice-documentserver/pkg-plist @@ -498,7 +498,7 @@ lib/libkernel_network.so %%WWWDIR%%/documentserver/license/jQuery.license %%WWWDIR%%/documentserver/license/less.license %%WWWDIR%%/documentserver/license/requirejs-text.license -%%WWWDIR%%/documentserver/npm/json +@(,,755) %%WWWDIR%%/documentserver/npm/json %%WWWDIR%%/documentserver/npm/package.json %%WWWDIR%%/documentserver/sdkjs-plugins/highlightcode/3rd-Party.txt %%WWWDIR%%/documentserver/sdkjs-plugins/highlightcode/README.md