git: aacdea631791 - main - www/onlyoffice-documentserver: Remove redundant "onlyoffice" in nginx conf

From: Mikael Urankar <mikael_at_FreeBSD.org>
Date: Fri, 31 Mar 2023 13:37:56 UTC
The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aacdea631791805e07989e32744ce91ca34110b4

commit aacdea631791805e07989e32744ce91ca34110b4
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2023-03-31 13:32:56 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2023-03-31 13:32:56 +0000

    www/onlyoffice-documentserver: Remove redundant "onlyoffice" in nginx conf
    
    ETCDIR already contains "onlyoffice", remove it from the nginx conf
    
    PR:             270561
    Reported by:    freebsd.org@vollkorn.cryptobitch.de
---
 www/onlyoffice-documentserver/Makefile                                  | 1 +
 .../files/patch-document-server-package_Makefile                        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile
index 8e391decd385..09834c620b81 100644
--- a/www/onlyoffice-documentserver/Makefile
+++ b/www/onlyoffice-documentserver/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	onlyoffice-documentserver
 DISTVERSIONPREFIX=	v
 DISTVERSION=	7.3.3.49
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES+=	LOCAL/mikael/v8/:source1 \
 		LOCAL/mikael/onlyoffice/:source2 \
diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile b/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile
index 6ca0b17835a1..ba03b66ea774 100644
--- a/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile
+++ b/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile
@@ -20,7 +20,7 @@
 +		AR := 7z a -y
 +		PACKAGES = tar
 +		DS_PREFIX := $(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)
-+		NGINX_CONF := %%ETCDIR%%/onlyoffice/documentserver/nginx/includes
++		NGINX_CONF := %%ETCDIR%%/documentserver/nginx/includes
 +		NGINX_LOG := /var/log/$(DS_PREFIX)
 +		DS_ROOT := %%LOCALBASE%%/www/$(DS_PREFIX)
 +		DS_FILES := /var/db/$(DS_PREFIX)