From nobody Wed Jan 12 12:28:49 2022 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 0DBA1195D217; Wed, 12 Jan 2022 12:28:50 +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 4JYn0x5Mmrz3qsp; Wed, 12 Jan 2022 12:28:49 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 98F8E4F42; Wed, 12 Jan 2022 12:28:49 +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 20CCSnww085106; Wed, 12 Jan 2022 12:28:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20CCSn5N085105; Wed, 12 Jan 2022 12:28:49 GMT (envelope-from git) Date: Wed, 12 Jan 2022 12:28:49 GMT Message-Id: <202201121228.20CCSn5N085105@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: cdc19d1011ab - main - www/nginx-devel: fix dependences for some modules 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: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cdc19d1011ab48330bcdd3e4aca828f5ea4433d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641990529; 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=sk1ddumqspAnhc4vQ/pgdGzYdighXQnuvWQZm86ECMY=; b=QJXX+/igKsHkSiFbcd/xq93Jc/AuqIJzcAT4f4ZfL2hmbsTHqJqZoiP7LfCRWKCykhjzp4 Im5TBi4zIpAyHnXpSDKInCeELUDOpz7Qe6deqxeD57f7tTiVEUq83ALDdtn9kBrp+GBbqa Zbwj383oXqCrB+paCfNoHjSyDQ9AhzeuIuh8l82RQQYAgRg1nnshp3zgvEQ5R+M5/tZIvl ayT5JIt9M5xzk96BruPk4kheN17Sh5tMQznvkZEez0pbOcmPM0Mi8OWqDbUe0eFNz0c/6Q PGuuvAaXNQyq82umU/7jc4KU9bnPtn9qiTJR6E9ZYH1nPUmHb6QKgGQVvev9wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641990529; a=rsa-sha256; cv=none; b=Sk6fRGc/BOfVkPy50sh/+tjPNs0LAmlkAkrWvYsI55+p4xWtLinAGJ+KVt2JNXUJU2KPG2 E+oYqmi4XeVDJ0GEx2nAA6nMMN28GH3n50ihhB2gU8/eyrr/Ot8rBAD4Ec7rYhGrmJyYOf uXIf4i7YFI29+hAFZjspmMffvOFohDGOl51iA1od6junAOAM8asgrTRKJJUqLAGA8g9K8O uiBkAUnqiejuZxuUkVZQltbj/NlVQstx1HLFJCdbPxAee8/1wcNmlb3Z2KKZzIOzjYvUoj q5TeHgksSywXrDEexh7e1cax8b8fdINzshrmLSyvKWVp/p5LYi/LKWIwSXMN0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=cdc19d1011ab48330bcdd3e4aca828f5ea4433d9 commit cdc19d1011ab48330bcdd3e4aca828f5ea4433d9 Author: Sergey A. Osokin AuthorDate: 2022-01-12 12:25:38 +0000 Commit: Sergey A. Osokin CommitDate: 2022-01-12 12:25:38 +0000 www/nginx-devel: fix dependences for some modules HTTP_DAV_EXT module requires libraries, so let's define them with a more canonical way. While I'm here use the same way to define dependences for the HTTP_XSLT module as well. PR: 261134 --- www/nginx-devel/Makefile | 6 +++--- www/nginx-devel/Makefile.extmod | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 8560909b0327..f19f856f6603 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME?= nginx PORTVERSION= 1.21.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -165,8 +165,8 @@ HTTP_SSL_CONFIGURE_ON= --with-http_ssl_module HTTP_SSL_USES= ssl HTTP_STATUS_CONFIGURE_ON= --with-http_stub_status_module HTTP_SUB_CONFIGURE_ON= --with-http_sub_module -HTTP_XSLT_USES= gnome -HTTP_XSLT_USE= GNOME=libxml2,libxslt +HTTP_XSLT_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ + libxslt.so:textproc/libxslt HTTP_XSLT_VARS= DSO_BASEMODS+=http_xslt_module HTTPV2_IMPLIES= HTTP_SSL HTTPV2_CONFIGURE_ON= --with-http_v2_module diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index cd3603bd086c..2a2093aae47e 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -102,7 +102,8 @@ HTTP_AUTH_PAM_GH_TUPLE= sto:ngx_http_auth_pam_module:v1.5.1:auth_pam HTTP_AUTH_PAM_VARS= DSO_EXTMODS+=auth_pam HTTP_DAV_EXT_IMPLIES= HTTP_DAV -HTTP_DAV_EXT_USE= GNOME=libxml2,libxslt +HTTP_DAV_EXT_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ + libxslt.so:textproc/libxslt HTTP_DAV_EXT_GH_TUPLE= arut:nginx-dav-ext-module:v3.0.0:dav_ext HTTP_DAV_EXT_VARS= DSO_EXTMODS+=dav_ext HTTP_DAV_EXT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_dav_ext_module.c