Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Nov 2024 09:49:43 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: f690c1a6f491 - main - www/onlyoffice-documentserver: Fix patch
Message-ID:  <202411120949.4AC9nhPg082500@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=f690c1a6f491dca7ace703f17699742a44d7f125

commit f690c1a6f491dca7ace703f17699742a44d7f125
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-11-12 09:49:24 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2024-11-12 09:49:39 +0000

    www/onlyoffice-documentserver: Fix patch
---
 .../patch-core_Common_3dParty_openssl_openssl.pri  |   4 +-
 .../files/patch-document-server-package_Makefile   | 314 ++++++++++-----------
 2 files changed, 159 insertions(+), 159 deletions(-)

diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_openssl_openssl.pri b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_openssl_openssl.pri
index dc322326cf8e..b8ab7f52a282 100644
--- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_openssl_openssl.pri
+++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_openssl_openssl.pri
@@ -6,8 +6,8 @@
  } else {
 -    LIBS += $$OPENSSL_LIBS_DIRECTORY/libssl.a
 -	LIBS += $$OPENSSL_LIBS_DIRECTORY/libcrypto.a
-+    LIBS +=  %%LOCALBASE%%/lib/libssl.a
-+	LIBS +=  %%LOCALBASE%%/lib/libcrypto.a
++    LIBS +=  /usr/local/lib/libssl.a
++	LIBS +=  /usr/local/lib/libcrypto.a
  }
  
  INCLUDEPATH += $$OPENSSL_LIBS_DIRECTORY/../include
diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile b/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile
index 8c61f53eb53e..bd67e4e74edf 100644
--- a/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile
+++ b/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile
@@ -1,160 +1,160 @@
 --- document-server-package/Makefile.orig	2024-02-12 13:46:57.000000000 +0100
 +++ document-server-package/Makefile	2024-03-01 10:49:36.212407000 +0100
-@@ -23,6 +23,7 @@ PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER)
- PACKAGE_NAME := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW)
- PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER)
- 
-+UNAME_P ?= $(shell uname -p)
- UNAME_M ?= $(shell uname -m)
- ifeq ($(UNAME_M),x86_64)
- 	RPM_ARCH := x86_64
-@@ -142,6 +143,22 @@ else
- 		DS_EXAMLE := /var/www/$(DS_PREFIX)-example
- 		DEV_NULL := /dev/null
- 	endif
-+	ifeq ($(UNAME_S),FreeBSD)
-+		PLATFORM := freebsd
-+		SHARED_EXT := .so*
-+		SHELL_EXT := .sh
-+		ARCH_EXT := .zip
-+		AR := 7z a -y
-+		PACKAGES = tar
-+		DS_PREFIX := $(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)
-+		NGINX_CONF := %%ETCDIR%%/documentserver/nginx/includes
-+		NGINX_LOG := /var/log/$(DS_PREFIX)
-+		DS_ROOT := %%LOCALBASE%%/www/$(DS_PREFIX)
-+		DS_FILES := /var/db/$(DS_PREFIX)
-+		DS_EXAMLE := %%LOCALBASE%%/www/$(DS_PREFIX)-example
-+		DEV_NULL := /dev/null
-+		PKG_TARGET := node18
-+	endif
- 	ifeq ($(UNAME_S),Darwin)
- 		PLATFORM := mac
- 		SHARED_EXT := .dylib
-@@ -159,6 +176,12 @@ else
- 	ifeq ($(UNAME_M),x86_64)
- 		ARCHITECTURE := 64
- 	endif
-+	ifeq ($(UNAME_P),amd64)
-+		ARCHITECTURE := 64
-+	endif
-+	ifeq ($(UNAME_P),aarch64)
-+		ARCHITECTURE := 64
-+	endif
- 	ifneq ($(filter %86,$(UNAME_M)),)
- 		ARCHITECTURE := 32
- 	endif
-@@ -320,7 +343,7 @@ documentserver:
- 		
- documentserver:
- 	mkdir -p $(DOCUMENTSERVER_FILES)
--	cp -rf -t $(DOCUMENTSERVER) ../build_tools/out/$(TARGET)/$(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)/*
-+	cp -rf ../build_tools/out/$(TARGET)/$(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)/* $(DOCUMENTSERVER)
- 
- 	mkdir -p $(DOCUMENTSERVER_CONFIG)
- 	mkdir -p $(DOCUMENTSERVER_CONFIG)/log4js
-@@ -329,25 +352,25 @@ documentserver:
- 	mv -f $(DOCUMENTSERVER)/server/Common/config/log4js/*.json $(DOCUMENTSERVER_CONFIG)/log4js/
- 
- 	# rename product specific folders
--	sed "s|onlyoffice\/documentserver|"$(DS_PREFIX)"|"  -i $(DOCUMENTSERVER_CONFIG)/*.json
-+	sed -i '' "s|onlyoffice\/documentserver|"$(DS_PREFIX)"|" $(DOCUMENTSERVER_CONFIG)/*.json
- 
- 	# rename db account params
--	sed 's|\("db.*": "\)onlyoffice\("\)|\1'$(ONLYOFFICE_VALUE)'\2|'  -i $(DOCUMENTSERVER_CONFIG)/*.json
-+	sed -i '' 's|\("db.*": "\)onlyoffice\("\)|\1'$(ONLYOFFICE_VALUE)'\2|' $(DOCUMENTSERVER_CONFIG)/*.json
- 
- 	# rename db schema name
--	sed 's|onlyoffice|'$(ONLYOFFICE_VALUE)'|'  -i $(DOCUMENTSERVER)/server/schema/**/*.sql
-+	sed -i '' 's|onlyoffice|'$(ONLYOFFICE_VALUE)'|' $(DOCUMENTSERVER)/server/schema/**/*.sql
- 
- 	# ignore CREATE DATABASE commands in MySQL
--	sed -r "s/^(CREATE DATABASE|USE)/-- \1/" -i $(DOCUMENTSERVER)/server/schema/mysql/*.sql
-+	sed -i '' -r "s/^(CREATE DATABASE|USE)/-- \1/" $(DOCUMENTSERVER)/server/schema/mysql/*.sql
- 
- 	# rename product in license
--	sed 's|ONLYOFFICE|'$(COMPANY_NAME)'|'  -i $(DOCUMENTSERVER)/server/3rd-Party.txt
--	sed 's|DocumentServer|'$(PRODUCT_NAME)'|'  -i $(DOCUMENTSERVER)/server/3rd-Party.txt
-+	sed -i '' 's|ONLYOFFICE|'$(COMPANY_NAME)'|' $(DOCUMENTSERVER)/server/3rd-Party.txt
-+	sed -i '' 's|DocumentServer|'$(PRODUCT_NAME)'|' $(DOCUMENTSERVER)/server/3rd-Party.txt
- 
- 	# Prevent for modification original config
- 	chmod ug=r $(DOCUMENTSERVER_CONFIG)/*.json
- 
--	cp -fr -t $(DOCUMENTSERVER) $(3RD_PARTY_LICENSE_FILES)
-+	cp -fr $(3RD_PARTY_LICENSE_FILES) $(DOCUMENTSERVER)
- 	rm -fr $(3RD_PARTY_LICENSE_FILES)
- 
- ifeq ($(PLATFORM),win)
-@@ -357,34 +380,34 @@ endif
- endif
- 
- 	[ -f $(LICENSE_FILE) ] \
--		&& cp -f -t $(DOCUMENTSERVER) $(LICENSE_FILE) \
--		|| cp -f -t $(DOCUMENTSERVER) LICENSE.txt
-+		&& cp -f $(LICENSE_FILE) $(DOCUMENTSERVER) \
-+		|| cp -f LICENSE.txt $(DOCUMENTSERVER)
- 
- 	chmod u+x $(DOCUMENTSERVER)/server/FileConverter/bin/x2t$(EXEC_EXT)
- 	#chmod u+x $(DOCUMENTSERVER)/server/FileConverter/bin/docbuilder$(EXEC_EXT)
- 	[ -f $(HTMLFILEINTERNAL)$(EXEC_EXT) ] && chmod u+x $(HTMLFILEINTERNAL)$(EXEC_EXT) || true
- 	chmod u+x $(DOCUMENTSERVER)/server/tools/allfontsgen$(EXEC_EXT)
- 
--	sed "s|\(_dc=\)0|\1"$(PACKAGE_VERSION)"|"  -i $(DOCUMENTSERVER)/web-apps/apps/api/documents/api.js.tpl
-+	sed -i '' "s|\(_dc=\)0|\1"$(PACKAGE_VERSION)"|"  $(DOCUMENTSERVER)/web-apps/apps/api/documents/api.js.tpl
- 
- ifeq ($(PRODUCT_NAME_LOW), documentserver)
--	sed 's|\("packageType": \)[0-9]\+\(.*\)|\10\2|' -i $(DOCUMENTSERVER_CONFIG)/*.json
--	sed 's|\("editorDataStorage": "\).\+\(".*\)|\1editorDataMemory\2|' -i $(DOCUMENTSERVER_CONFIG)/*.json
-+	sed -i '' 's|\("packageType": \)[0-9]\+\(.*\)|\10\2|' $(DOCUMENTSERVER_CONFIG)/*.json
-+	sed -i '' 's|\("editorDataStorage": "\).\+\(".*\)|\1editorDataMemory\2|' $(DOCUMENTSERVER_CONFIG)/*.json
- endif
- 
- ifeq ($(PRODUCT_NAME_LOW), $(filter $(PRODUCT_NAME_LOW),documentserver-ee documentserver-ie))
--	sed 's|\("packageType": \)[0-9]\+\(.*\)|\11\2|' -i $(DOCUMENTSERVER_CONFIG)/*.json
--	sed 's|\("editorDataStorage": "\).\+\(".*\)|\1editorDataRedis\2|' -i $(DOCUMENTSERVER_CONFIG)/*.json
-+	sed -i '' 's|\("packageType": \)[0-9]\+\(.*\)|\11\2|' $(DOCUMENTSERVER_CONFIG)/*.json
-+	sed -i '' 's|\("editorDataStorage": "\).\+\(".*\)|\1editorDataRedis\2|' $(DOCUMENTSERVER_CONFIG)/*.json
- endif
- 
- ifeq ($(PRODUCT_NAME_LOW), documentserver-de)
--	sed 's|\("packageType": \)[0-9]\+\(.*\)|\12\2|' -i $(DOCUMENTSERVER_CONFIG)/*.json
--	sed 's|\("editorDataStorage": "\).\+\(".*\)|\1editorDataRedis\2|' -i $(DOCUMENTSERVER_CONFIG)/*.json
-+	sed -i '' 's|\("packageType": \)[0-9]\+\(.*\)|\12\2|' $(DOCUMENTSERVER_CONFIG)/*.json
-+	sed -i '' 's|\("editorDataStorage": "\).\+\(".*\)|\1editorDataRedis\2|' $(DOCUMENTSERVER_CONFIG)/*.json
- endif
- 
- 	cd $(DOCUMENTSERVER)/npm && \
- 		npm install && \
--		pkg ./node_modules/json $(PKG_TARGET:%=-t %) -o json
-+		env PKG_CACHE_PATH=%%WRKDIR%%/.pkg-cache "%%WRKSRC%%/yao-pkg/node_modules/.bin/pkg" ./node_modules/json $(PKG_TARGET:%=-t %) -o json
- 
- ifeq ($(PLATFORM),win)		
- 	cd $(DOCUMENTSERVER)/npm && \
-@@ -398,7 +421,7 @@ documentserver-example:
- 
- documentserver-example:
- 	mkdir -p $(DOCUMENTSERVER_EXAMPLE)
--	cp -rf -t $(DOCUMENTSERVER_EXAMPLE) ../build_tools/out/$(TARGET)/$(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)-example/* common/documentserver-example/welcome
-+	cp -rf ../build_tools/out/$(TARGET)/$(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)-example/* common/documentserver-example/welcome $(DOCUMENTSERVER_EXAMPLE)
- 	
- 	mkdir -p $(DOCUMENTSERVER_EXAMPLE_CONFIG)
- 
-@@ -407,7 +430,7 @@ documentserver-example:
- 	# Prevent for modification original config
- 	chmod ug=r $(DOCUMENTSERVER_EXAMPLE_CONFIG)/*.json
- 
--	sed "s|{{OFFICIAL_PRODUCT_NAME}}|"$(OFFICIAL_PRODUCT_NAME)"|"  -i $(DOCUMENTSERVER_EXAMPLE)/welcome/*.html
-+	sed -i '' "s|{{OFFICIAL_PRODUCT_NAME}}|"$(OFFICIAL_PRODUCT_NAME)"|" $(DOCUMENTSERVER_EXAMPLE)/welcome/*.html
- 
- 	/usr/bin/find $(DOCUMENTSERVER_EXAMPLE)/welcome -depth -type f -exec sed -i "s_{{year}}_$(shell date +"%Y")_g" {} \;
- 
+@@ -23,6 +23,7 @@ PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER)
+ PACKAGE_NAME := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW)
+ PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER)
+ 
++UNAME_P ?= $(shell uname -p)
+ UNAME_M ?= $(shell uname -m)
+ ifeq ($(UNAME_M),x86_64)
+ 	RPM_ARCH := x86_64
+@@ -142,6 +143,22 @@ else
+ 		DS_EXAMLE := /var/www/$(DS_PREFIX)-example
+ 		DEV_NULL := /dev/null
+ 	endif
++	ifeq ($(UNAME_S),FreeBSD)
++		PLATFORM := freebsd
++		SHARED_EXT := .so*
++		SHELL_EXT := .sh
++		ARCH_EXT := .zip
++		AR := 7z a -y
++		PACKAGES = tar
++		DS_PREFIX := $(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)
++		NGINX_CONF := /usr/local/etc/onlyoffice/documentserver/nginx/includes
++		NGINX_LOG := /var/log/$(DS_PREFIX)
++		DS_ROOT := /usr/local/www/$(DS_PREFIX)
++		DS_FILES := /var/db/$(DS_PREFIX)
++		DS_EXAMLE := /usr/local/www/$(DS_PREFIX)-example
++		DEV_NULL := /dev/null
++		PKG_TARGET := node18
++	endif
+ 	ifeq ($(UNAME_S),Darwin)
+ 		PLATFORM := mac
+ 		SHARED_EXT := .dylib
+@@ -159,6 +176,12 @@ else
+ 	ifeq ($(UNAME_M),x86_64)
+ 		ARCHITECTURE := 64
+ 	endif
++	ifeq ($(UNAME_P),amd64)
++		ARCHITECTURE := 64
++	endif
++	ifeq ($(UNAME_P),aarch64)
++		ARCHITECTURE := 64
++	endif
+ 	ifneq ($(filter %86,$(UNAME_M)),)
+ 		ARCHITECTURE := 32
+ 	endif
+@@ -320,7 +343,7 @@ documentserver:
+ 		
+ documentserver:
+ 	mkdir -p $(DOCUMENTSERVER_FILES)
+-	cp -rf -t $(DOCUMENTSERVER) ../build_tools/out/$(TARGET)/$(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)/*
++	cp -rf ../build_tools/out/$(TARGET)/$(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)/* $(DOCUMENTSERVER)
+ 
+ 	mkdir -p $(DOCUMENTSERVER_CONFIG)
+ 	mkdir -p $(DOCUMENTSERVER_CONFIG)/log4js
+@@ -329,25 +352,25 @@ documentserver:
+ 	mv -f $(DOCUMENTSERVER)/server/Common/config/log4js/*.json $(DOCUMENTSERVER_CONFIG)/log4js/
+ 
+ 	# rename product specific folders
+-	sed "s|onlyoffice\/documentserver|"$(DS_PREFIX)"|"  -i $(DOCUMENTSERVER_CONFIG)/*.json
++	sed -i '' "s|onlyoffice\/documentserver|"$(DS_PREFIX)"|" $(DOCUMENTSERVER_CONFIG)/*.json
+ 
+ 	# rename db account params
+-	sed 's|\("db.*": "\)onlyoffice\("\)|\1'$(ONLYOFFICE_VALUE)'\2|'  -i $(DOCUMENTSERVER_CONFIG)/*.json
++	sed -i '' 's|\("db.*": "\)onlyoffice\("\)|\1'$(ONLYOFFICE_VALUE)'\2|' $(DOCUMENTSERVER_CONFIG)/*.json
+ 
+ 	# rename db schema name
+-	sed 's|onlyoffice|'$(ONLYOFFICE_VALUE)'|'  -i $(DOCUMENTSERVER)/server/schema/**/*.sql
++	sed -i '' 's|onlyoffice|'$(ONLYOFFICE_VALUE)'|' $(DOCUMENTSERVER)/server/schema/**/*.sql
+ 
+ 	# ignore CREATE DATABASE commands in MySQL
+-	sed -r "s/^(CREATE DATABASE|USE)/-- \1/" -i $(DOCUMENTSERVER)/server/schema/mysql/*.sql
++	sed -i '' -r "s/^(CREATE DATABASE|USE)/-- \1/" $(DOCUMENTSERVER)/server/schema/mysql/*.sql
+ 
+ 	# rename product in license
+-	sed 's|ONLYOFFICE|'$(COMPANY_NAME)'|'  -i $(DOCUMENTSERVER)/server/3rd-Party.txt
+-	sed 's|DocumentServer|'$(PRODUCT_NAME)'|'  -i $(DOCUMENTSERVER)/server/3rd-Party.txt
++	sed -i '' 's|ONLYOFFICE|'$(COMPANY_NAME)'|' $(DOCUMENTSERVER)/server/3rd-Party.txt
++	sed -i '' 's|DocumentServer|'$(PRODUCT_NAME)'|' $(DOCUMENTSERVER)/server/3rd-Party.txt
+ 
+ 	# Prevent for modification original config
+ 	chmod ug=r $(DOCUMENTSERVER_CONFIG)/*.json
+ 
+-	cp -fr -t $(DOCUMENTSERVER) $(3RD_PARTY_LICENSE_FILES)
++	cp -fr $(3RD_PARTY_LICENSE_FILES) $(DOCUMENTSERVER)
+ 	rm -fr $(3RD_PARTY_LICENSE_FILES)
+ 
+ ifeq ($(PLATFORM),win)
+@@ -357,34 +380,34 @@ endif
+ endif
+ 
+ 	[ -f $(LICENSE_FILE) ] \
+-		&& cp -f -t $(DOCUMENTSERVER) $(LICENSE_FILE) \
+-		|| cp -f -t $(DOCUMENTSERVER) LICENSE.txt
++		&& cp -f $(LICENSE_FILE) $(DOCUMENTSERVER) \
++		|| cp -f LICENSE.txt $(DOCUMENTSERVER)
+ 
+ 	chmod u+x $(DOCUMENTSERVER)/server/FileConverter/bin/x2t$(EXEC_EXT)
+ 	#chmod u+x $(DOCUMENTSERVER)/server/FileConverter/bin/docbuilder$(EXEC_EXT)
+ 	[ -f $(HTMLFILEINTERNAL)$(EXEC_EXT) ] && chmod u+x $(HTMLFILEINTERNAL)$(EXEC_EXT) || true
+ 	chmod u+x $(DOCUMENTSERVER)/server/tools/allfontsgen$(EXEC_EXT)
+ 
+-	sed "s|\(_dc=\)0|\1"$(PACKAGE_VERSION)"|"  -i $(DOCUMENTSERVER)/web-apps/apps/api/documents/api.js.tpl
++	sed -i '' "s|\(_dc=\)0|\1"$(PACKAGE_VERSION)"|"  $(DOCUMENTSERVER)/web-apps/apps/api/documents/api.js.tpl
+ 
+ ifeq ($(PRODUCT_NAME_LOW), documentserver)
+-	sed 's|\("packageType": \)[0-9]\+\(.*\)|\10\2|' -i $(DOCUMENTSERVER_CONFIG)/*.json
+-	sed 's|\("editorDataStorage": "\).\+\(".*\)|\1editorDataMemory\2|' -i $(DOCUMENTSERVER_CONFIG)/*.json
++	sed -i '' 's|\("packageType": \)[0-9]\+\(.*\)|\10\2|' $(DOCUMENTSERVER_CONFIG)/*.json
++	sed -i '' 's|\("editorDataStorage": "\).\+\(".*\)|\1editorDataMemory\2|' $(DOCUMENTSERVER_CONFIG)/*.json
+ endif
+ 
+ ifeq ($(PRODUCT_NAME_LOW), $(filter $(PRODUCT_NAME_LOW),documentserver-ee documentserver-ie))
+-	sed 's|\("packageType": \)[0-9]\+\(.*\)|\11\2|' -i $(DOCUMENTSERVER_CONFIG)/*.json
+-	sed 's|\("editorDataStorage": "\).\+\(".*\)|\1editorDataRedis\2|' -i $(DOCUMENTSERVER_CONFIG)/*.json
++	sed -i '' 's|\("packageType": \)[0-9]\+\(.*\)|\11\2|' $(DOCUMENTSERVER_CONFIG)/*.json
++	sed -i '' 's|\("editorDataStorage": "\).\+\(".*\)|\1editorDataRedis\2|' $(DOCUMENTSERVER_CONFIG)/*.json
+ endif
+ 
+ ifeq ($(PRODUCT_NAME_LOW), documentserver-de)
+-	sed 's|\("packageType": \)[0-9]\+\(.*\)|\12\2|' -i $(DOCUMENTSERVER_CONFIG)/*.json
+-	sed 's|\("editorDataStorage": "\).\+\(".*\)|\1editorDataRedis\2|' -i $(DOCUMENTSERVER_CONFIG)/*.json
++	sed -i '' 's|\("packageType": \)[0-9]\+\(.*\)|\12\2|' $(DOCUMENTSERVER_CONFIG)/*.json
++	sed -i '' 's|\("editorDataStorage": "\).\+\(".*\)|\1editorDataRedis\2|' $(DOCUMENTSERVER_CONFIG)/*.json
+ endif
+ 
+ 	cd $(DOCUMENTSERVER)/npm && \
+ 		npm install && \
+-		pkg ./node_modules/json $(PKG_TARGET:%=-t %) -o json
++		env PKG_CACHE_PATH=%%WRKDIR%%/.pkg-cache "%%WRKSRC%%/yao-pkg/node_modules/.bin/pkg" ./node_modules/json $(PKG_TARGET:%=-t %) -o json
+ 
+ ifeq ($(PLATFORM),win)		
+ 	cd $(DOCUMENTSERVER)/npm && \
+@@ -398,7 +421,7 @@ documentserver-example:
+ 
+ documentserver-example:
+ 	mkdir -p $(DOCUMENTSERVER_EXAMPLE)
+-	cp -rf -t $(DOCUMENTSERVER_EXAMPLE) ../build_tools/out/$(TARGET)/$(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)-example/* common/documentserver-example/welcome
++	cp -rf ../build_tools/out/$(TARGET)/$(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)-example/* common/documentserver-example/welcome $(DOCUMENTSERVER_EXAMPLE)
+ 	
+ 	mkdir -p $(DOCUMENTSERVER_EXAMPLE_CONFIG)
+ 
+@@ -407,7 +430,7 @@ documentserver-example:
+ 	# Prevent for modification original config
+ 	chmod ug=r $(DOCUMENTSERVER_EXAMPLE_CONFIG)/*.json
+ 
+-	sed "s|{{OFFICIAL_PRODUCT_NAME}}|"$(OFFICIAL_PRODUCT_NAME)"|"  -i $(DOCUMENTSERVER_EXAMPLE)/welcome/*.html
++	sed -i '' "s|{{OFFICIAL_PRODUCT_NAME}}|"$(OFFICIAL_PRODUCT_NAME)"|" $(DOCUMENTSERVER_EXAMPLE)/welcome/*.html
+ 
+ 	/usr/bin/find $(DOCUMENTSERVER_EXAMPLE)/welcome -depth -type f -exec sed -i "s_{{year}}_$(shell date +"%Y")_g" {} \;
+ 
 @@ -500,6 +523,8 @@ $(DEB): $(DEB_DEPS) $(COMMON_DEPS) $(LINUX_DEPS) docum
- 
- %.exe:
- 	cd $(@D) && $(ISCC) $(ISCC_PARAMS) common.iss
-+
-+freebsd: $(COMMON_DEPS) $(LINUX_DEPS) documentserver
- 
- $(EXE): $(COMMON_DEPS) documentserver documentserver-example $(NGINX) $(PSQL) $(WINSW)
- 
+ 
+ %.exe:
+ 	cd $(@D) && $(ISCC) $(ISCC_PARAMS) common.iss
++
++freebsd: $(COMMON_DEPS) $(LINUX_DEPS) documentserver
+ 
+ $(EXE): $(COMMON_DEPS) documentserver documentserver-example $(NGINX) $(PSQL) $(WINSW)
+ 



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