From nobody Sun Mar 16 01:14:11 2025 X-Original-To: dev-commits-ports-all@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 4ZFg9c68tGz5qTpB; Sun, 16 Mar 2025 01:14:12 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZFg9b48wKz44TW; Sun, 16 Mar 2025 01:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742087651; 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=kXo9XOFmPno3WDWznlCwis9RilQOifvn7Kloaz5+5Qc=; b=Fr0uv1Lz0y5rWc8sqgRAh+mIlRJ/avxAv2aeHG7Kk/J9dmO7Oj8geJe/y8/aZEEiuoQX8M yc2wi4CtRraS5JZJ9Kq0RqjicCd1dfheQDQxvewBTeGHADSUBPIUecahKeKWH9YKcqZSVB PF4DxZAuYQtAgzOSVUDSGGfEr4xzxNQM8bcH7DYuSyLpJ8SePmF+4HmbzKiuPR9Cmt5dzq aPFU8RBUhZ315MRe3C0kW0iORP9HMlBFEfkzHlUKqUkAurHxrWlfHDJ7QFRpNnLa6UEc6E saERulmTBuvRfc5q8Q5LQUo4g3NDuLZQOyYD84gOS7XM9OuDSEDjtgv5Nk3iUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742087651; a=rsa-sha256; cv=none; b=ez3r+LAxGHm76lA5xl0ZViTHZklT88FxQobLPCaSvXfv69cl+t3mPU2xXdD4ZvrwXO4qyf d9hlktgQ1COLGQn+nSbIOnJXOZu66lwvRdaYhikLFPv2AUbFI8yZR15RhzaphO3ghi+he1 idHCfhGNwFKgELu5iGxFu72OxhPC08aVK8a1zxTryK6mF6vs5Wso/653WOMbrfxgPcee9R 2DtHmr3sC5VqZmwTNxxg4F8dVKYoWGECU+4t9z6XsxFVazOgJ8SgvvB5lFvMqz7R4YwoVb 3Ab0IVBjLGMhYlsBrZPSTpEtWSeTdqN4EWk/LEGGt9i8nl9l/Z5PxpElqX8RPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742087651; 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=kXo9XOFmPno3WDWznlCwis9RilQOifvn7Kloaz5+5Qc=; b=tTZcKv3/gY6hHStbd7suJaBtXG9E/Hy7D0qVVEVtlTbPQdZ6uixNxvJGEcBkEotCgLjbAk xX/bhHcxbIeb8/hz6cX6nsZmZitvN+EimkKnHQbtIMrxzCl48PWi3WX7aOPxbn21AW5QIU 6vDf+yDP4an91gaWh/CHBiBax6MMoO0KY98fmctIDKgrLrLkk7Y6UIsr/8208iBnFpOBlO cwi1aNZayMalI3ARvFQAF7EaXHYI6L6J+d+YyoK5Wiq5r5u4fWMAu3gWpA2zhEghv1pZec ZlbLXHp5eDp5q/Baj4bX9rzTS3KE4EexXMTdCEhejs3DO0qwipDfmj3qcQgPyA== 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 4ZFg9b3RkxzfWL; Sun, 16 Mar 2025 01:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52G1EB6H077308; Sun, 16 Mar 2025 01:14:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52G1EBbo077305; Sun, 16 Mar 2025 01:14:11 GMT (envelope-from git) Date: Sun, 16 Mar 2025 01:14:11 GMT Message-Id: <202503160114.52G1EBbo077305@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: fe1fd5678550 - main - www/lighttpd: patch config files correctly List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe1fd567855031114eca44f187f920de90d1268a Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe1fd567855031114eca44f187f920de90d1268a commit fe1fd567855031114eca44f187f920de90d1268a Author: Piotr Kubaj AuthorDate: 2025-03-11 01:35:58 +0000 Commit: Piotr Kubaj CommitDate: 2025-03-16 01:14:03 +0000 www/lighttpd: patch config files correctly PR: 285149 Submitted by: Samuel Chow (cyschow@shaw.ca) --- www/lighttpd/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index 08406f84c1e1..8fd8ab9b88dc 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -1,6 +1,6 @@ PORTNAME= lighttpd PORTVERSION= 1.4.77 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/ @@ -115,6 +115,9 @@ PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" CACHEDIR="${CACHEDIR}" \ SUB_LIST= REQUIRE="${REQUIRE}" post-patch: + @${REINPLACE_CMD} -E \ + -e "s|/etc/lighttpd|${ETCDIR}|g" \ + ${WRKSRC}/doc/config/lighttpd.conf @${REINPLACE_CMD} -E -e \ 's|^(server.document-root.*=).*|\1 "${PREFIX}/www" + "/data"|' \ -e "s|/etc/lighttpd|${ETCDIR}|g" \ @@ -127,7 +130,7 @@ post-patch: -e "s|^(var.home_dir.*=).*|\1 \"${HOMEDIR}\"|" \ -e "s|^(var.state_dir.*=).*|\1 \"${RUNDIR}\"|" \ -e "s|^(var.cache_dir.*=).*|\1 \"${CACHEDIR}\"|" \ - ${WRKSRC}/doc/config/lighttpd.conf + ${WRKSRC}/doc/config/lighttpd.annotated.conf @${REINPLACE_CMD} -e "s|/usr/bin/python|${LOCALBASE}/bin/python|" \ ${WRKSRC}/doc/config/conf.d/cgi.conf