From nobody Fri Mar 31 13:37:56 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 4Pp1ZD3nx9z42lrW; Fri, 31 Mar 2023 13:37:56 +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 4Pp1ZD3J16z41GY; Fri, 31 Mar 2023 13:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680269876; 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=u85p/e0Ds1J1KBaTT8oEXs2pJKNaePSCEvhBjLPQZ3M=; b=t4dNKBLB2ucAegQvzYBKWPO/T2AtPy3bOfnZ06MgmJGEmVMjbkbS7AK6+eEPmePMASsG8e Hl3EOHvlnMbqWYbem1KBTcQWzrYrJwyNiwXde8TokFYPvW87EOm1ajRb3dm8/nhCEod19F 6nHoJlQUMeuYhRfKhnfdbHp2euFNsN8/2PmLJxnaPv5nL8n4ndSZtMDrW4Ec2u2Md0gr2t 1AySuK7q4ogRu20BMle6pfQwuC+FFi0bk3RUr8aQfJwmNuFOFbbySbUPuvFEmyTZ58jUGZ RzY2ugcgXjHxK+31HfeyBkTjuTLuO0Pp8yK5ypuWcyM6icWOi3E4i+ePwH2z/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680269876; 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=u85p/e0Ds1J1KBaTT8oEXs2pJKNaePSCEvhBjLPQZ3M=; b=sL5WYMi1rx3bqzCz8jzx0utEEPu8Ov2hXwhvPWhtQIBqTK/6l/CNkxDsVTgqubRjnOpaWd 5LClSBENzck2wIrqY748XGvZSpc6VESbodN3FfZH6h5SfF1k0ScD2qtBQVxt21kWwO+nKv QHPcLdEo0pVJBOTLjWytelzNU42Bz+Ku98wKzYrF58SgTaAzH78jdxrbZKaErRa0Vwb4kd 1OQEp7CaKavNeqLQqTrQkFbIDbAYhne+2l183x6CNWAA+OQ+oW0zaXTjWBiztU2FZ5S0eR gLYL6OSPDBM+ZV1s2g0UouciYuKJqj7ei31sJ7bm1xGBnbEEx53uXyiiPS829g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680269876; a=rsa-sha256; cv=none; b=S0uf8+BNG8et7DPOsuUPCkd8vrh2nrxkkCp2gZcE2/r8LUN10N7Qmz6qYq0J6OKy4jynBa YprIvIkYHpcxQLVE2effPl+zgSnK3/LcZ2TpGc9ZNkxi7IYloly79HW2E/+TTSIpjhrox8 ig51HWTjsQKYwHuZ3gTqICvSMKby3B2xvBpW7V39PLwDPdTV2DAC/qAtc6VZAIltsw6GZv Tl33eJxotdZOm1NIiIzplzO4DPQPPIyHjme5Tz8AhNcKG+ASYUYq+blgceWpCvEXMNDFgw oMqaM8LFWVyd8wIDCZ9ZRBzN+88v7Xm5bzA93pE2IONpRvLOU25hlnhkThh8tA== 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 4Pp1ZD2M3gzw7P; Fri, 31 Mar 2023 13:37:56 +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 32VDbu7R051256; Fri, 31 Mar 2023 13:37:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VDbu37051255; Fri, 31 Mar 2023 13:37:56 GMT (envelope-from git) Date: Fri, 31 Mar 2023 13:37:56 GMT Message-Id: <202303311337.32VDbu37051255@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: aacdea631791 - main - www/onlyoffice-documentserver: Remove redundant "onlyoffice" in nginx conf 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: aacdea631791805e07989e32744ce91ca34110b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=aacdea631791805e07989e32744ce91ca34110b4 commit aacdea631791805e07989e32744ce91ca34110b4 Author: Mikael Urankar AuthorDate: 2023-03-31 13:32:56 +0000 Commit: Mikael Urankar 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)