From nobody Mon Apr 24 20:32:21 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 4Q4xdK3MpYz47Jnt; Mon, 24 Apr 2023 20:32:21 +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 4Q4xdK2rZhz3jRv; Mon, 24 Apr 2023 20:32:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682368341; 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=X30czDDtMY4v6yYpunX+CzIDnyn8KdEYtuyQw7hOh/w=; b=FCQ9W+5jTT6B5CJCjDM/SRm0pTdb1EEsVbhkOjHVlRBOHjCCzHDTjQ9HINYp6H0tq8LZaj Nr8fCxe/N5kKAhM46X8zrBGaidAMrABrXUasHwXUYiCBbAJNE14Ib3B5sB5V3bmoy5/L8H DjqXZpJyA75RMMTqO9i/GuDsYrYxuA6Z5/HDYygXmL1ZnW+556H3lLtHAvqA4W9+oKgm7C rGWc1cQfRfV2sUE3lBibfx8xRqNGcAx8Ugm6m7Gw4vS4uxKr/8elW0ETroqVKRTgFncWE+ 3tCtLISVCWnejAp2yi3V/R4AJbFCtdW5+V7yYrwV0DPWnpOnCFr8NBdOv9KYsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682368341; 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=X30czDDtMY4v6yYpunX+CzIDnyn8KdEYtuyQw7hOh/w=; b=VIF1/pEcnTF4XWq9leYnVwKHZetMWDYA3cwZptJTe9YR46uG/wkCsz038Enijy5wsDXw/n 5pxbjW225zgFGDPgzVh0BI9ln2Vop1x/FQ9V3v+0s+zPaxpFbQy6dQR5D2XCXx7hWfWj8Q qPQeL1HuNVNOirCwnpOmAh1l6+c+rl2k6KRyFWKCXfVzNEjmoNxBVwhTlMmxGdKsEIIf/W QNf9WXHR58LiqM3t/WkrUXPb/yTuY9GHwoF/7oLbxtuOn+1H4DCAZrmfjZ+eW9+gOdgBJe d+e+ZQmkD1poJr7iD7D/b4VpQwaI8hblQzAHJVGAIoOClmPfQ2QE1ZQfg6ePsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682368341; a=rsa-sha256; cv=none; b=RcbR4g8sbEEec/it229zoSed7M30Goa7UzVXMupOG7kQ1CDqX3SckrxJBur+5SeQw7SF8F KDMupWlzcR+j/1KYHmoTIoCSh3BLz7KvvPsjyi9HJvXRG0r2wDwGI36LPct7itbWB9LFru QiSMUi7/mlkm+X4Akex1ecYnYTN1AAWTXfHg2ueayKJKewyuzPl25ykdBaSCkoRek0IAsC dG5FQCgJ4z/kqYI7X9Nai07aOzY8dpeHPgp4BmJIffc5xsrgFwbZ65neC3sK7+yCv/3MZ0 bRkmcBPnNd/5DgrUEIUPmEqKGV9XyUcx/ZVuXQjNqCmHGSRgnIeBR3OHduGP1g== 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 4Q4xdK1w55zgBM; Mon, 24 Apr 2023 20:32:21 +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 33OKWLph060557; Mon, 24 Apr 2023 20:32:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OKWLHt060550; Mon, 24 Apr 2023 20:32:21 GMT (envelope-from git) Date: Mon, 24 Apr 2023 20:32:21 GMT Message-Id: <202304242032.33OKWLHt060550@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 20fd52ed177b - main - Mk/Uses/php.mk: Fix USES 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20fd52ed177b90bd7b6510f097c2b59b377ca0db Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=20fd52ed177b90bd7b6510f097c2b59b377ca0db commit 20fd52ed177b90bd7b6510f097c2b59b377ca0db Author: Muhammad Moinur Rahman AuthorDate: 2023-04-24 20:30:10 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-04-24 20:32:12 +0000 Mk/Uses/php.mk: Fix USES - Avoid overriding or appending USES. - Use USESDIR instead of PORTSDIR/Mk/Uses Reported by: antoine --- Mk/Uses/php.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index c87eb96c4ad8..39d91019af7b 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -273,8 +273,8 @@ BUILD_DEPENDS+= ${PHPBASE}/include/php/main/php.h:${PHP_PORT} . endif RUN_DEPENDS+= ${PHPBASE}/include/php/main/php.h:${PHP_PORT} . if ${php_ARGS:Mmod} || (${php_ARGS:Mweb} && defined(PHP_VERSION) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "") -USES= apache:run -.include "${PORTSDIR}/Mk/Uses/apache.mk" +apache_ARGS?=run +.include "${USESDIR}/apache.mk" RUN_DEPENDS+= ${PHPBASE}/${APACHEMODDIR}/libphp.so:${MOD_PHP_PORT} . endif