Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Apr 2023 15:41:19 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: 3661e14f6aec - main - www/onlyoffice-documentserver: do not strip the json binary
Message-ID:  <202304021541.332FfJro093683@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=3661e14f6aec57bf5950af831ea627070a310258

commit 3661e14f6aec57bf5950af831ea627070a310258
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2023-04-02 13:24:44 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304021541.332FfJro093683>