From nobody Mon Jan 30 08:02:03 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 4P50yM6XJdz3bqfM; Mon, 30 Jan 2023 08:02:03 +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 4P50yM63m1z3QWj; Mon, 30 Jan 2023 08:02:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675065723; 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=VS6DF5GsjngK7LpkxngV3okrV0n4icZ60YKi93XHH0w=; b=DMcrPQ23zrVzxF6XZD9Xes+dVUv8psL9jl6kH54Op8yBwcBuD4pAx8dNDz30S4ZSZzoZ3e 2vQZFo/ZjNy1kuBYzn73/bQ6m9N2qXtnt0KFSWM2wqECXnJVNhrt479oCak7IyjSZbFfcc AJ2L9xMTgiVx9U7caGufSW0hUAt3NfV2V6jmXyJmoYWfDziZGTXTR/Pyo/n2A4xWwXbrqg JkQpNB/8CgAGk00UTJI8Rdy7f+zAElVY4xb2+7gIIxO1GirzwuhatbGCZVIqEbYKVFvU/X loQaX3mY2itjRg5jj4JuBp4wi//BrtkZpjwvDGS/DoUE6ujunYxd/dFeAeXgyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675065723; 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=VS6DF5GsjngK7LpkxngV3okrV0n4icZ60YKi93XHH0w=; b=OtQMLoZboU6eCR1QJZXsmDDhKVN0g/pvfsV3JX5DzDIvYYtPJJ1t1j+7cYbBpG2bj48c9o 5K9yRVBqE2Njbzj481PwMCckvMb8zVnVw/mez801pR6Loux6ibDwoI5y8xqGDCa9hVwCBI 1NKDOUm0XJDiBfMk+wdJ55/yuJ5e1jz4cKygM0SI38/+cs2tC+QOZYT3Q7gT+558tY5OdO dwlKrX1wEM1IqjK+A6N2fmpzliJ3x3SZAsG4lh1EG8QLU/xebXuAREQM8UE/WxrgzPRd53 aao9v8cxGnGp4gUw1NmPYDXApX5ilETChlACen0DAZzUymEhFqlW2CvypdmbzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675065723; a=rsa-sha256; cv=none; b=AbUOMEegVcXW4U6FJ0XT8o91l/W2gB8r+C2pWV5S/EfN663yLxCI4vw/5aPgoyQLNmiZwA hilGuWkdy8q3d5bx/OmTzHcQ+tlTdPP7ZbpG6XXYN2Zg5kgc1yU2JmuHeqxEkxL+DoQQ8+ fTnoloxFuYfU2O7rZfDVQsOnB+ZAWDZ3LWFYqlfRVEPCiwpbwfNEjyQpQbSvDkn4zPGAmP WCQoHgeQztxSzYk0UK78lFtnX28aINih58bRRCDq9LRD120rF/nKRsjEIOnbm1+UDZzxoq rtsmZAaJq64a7Kc2VQhBVDkcU/Iy4rOj+rGJ82F9K4Lo+qCH+6nq9jlc5WIXvw== 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 4P50yM576jz11GP; Mon, 30 Jan 2023 08:02:03 +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 30U823C9014815; Mon, 30 Jan 2023 08:02:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30U823F3014814; Mon, 30 Jan 2023 08:02:03 GMT (envelope-from git) Date: Mon, 30 Jan 2023 08:02:03 GMT Message-Id: <202301300802.30U823F3014814@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: d0c4f648b9c6 - main - www/nginx: 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: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0c4f648b9c68d9b845cc2b7df1212d66dd9d737 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0c4f648b9c68d9b845cc2b7df1212d66dd9d737 commit d0c4f648b9c68d9b845cc2b7df1212d66dd9d737 Author: Jochen Neumeister AuthorDate: 2023-01-30 07:59:50 +0000 Commit: Jochen Neumeister CommitDate: 2023-01-30 08:01:57 +0000 www/nginx: 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 Sponsored by: Netzkommune GmbH --- www/nginx/Makefile | 6 +++--- www/nginx/Makefile.extmod | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 0b08c5cf37aa..1b95142c4658 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,6 +1,6 @@ PORTNAME= nginx PORTVERSION= 1.22.1 -PORTREVISION?= 2 +PORTREVISION?= 3 PORTEPOCH= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ @@ -164,8 +164,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/Makefile.extmod b/www/nginx/Makefile.extmod index fa7472f5823f..9f4bb82416cd 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -90,7 +90,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_LIB_DEPENDS= libexpat.so:textproc/expat2 +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