git: 20fd52ed177b - main - Mk/Uses/php.mk: Fix USES
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 24 Apr 2023 20:32:21 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=20fd52ed177b90bd7b6510f097c2b59b377ca0db
commit 20fd52ed177b90bd7b6510f097c2b59b377ca0db
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-04-24 20:30:10 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
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