Date: Mon, 24 Apr 2023 20:01:09 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9f5034f55a47 - main - Mk/Uses/php.mk: Refactor Message-ID: <202304242001.33OK19wU009301@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f5034f55a47591288167cd49fe4bb963143caed commit 9f5034f55a47591288167cd49fe4bb963143caed Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-04-24 19:59:31 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-04-24 20:01:01 +0000 Mk/Uses/php.mk: Refactor - Replace old USE_APACHE_RUN with USES=apache:run - Prior to php8.0 there was a check for the required libname which contained the version number of php. Remove the conditional. Sponsored by: Bounce Experts --- Mk/Uses/php.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index 4d142472d140..c87eb96c4ad8 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -273,14 +273,9 @@ 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} == "") -USE_APACHE_RUN= 22+ +USES= apache:run .include "${PORTSDIR}/Mk/Uses/apache.mk" -. if ${PHP_VER} < 80 -# libphpX.so only has the major version number in it, so remove the last digit of PHP_VER to get it. -RUN_DEPENDS+= ${PHPBASE}/${APACHEMODDIR}/libphp${PHP_VER:C/.$//}.so:${MOD_PHP_PORT} -. else RUN_DEPENDS+= ${PHPBASE}/${APACHEMODDIR}/libphp.so:${MOD_PHP_PORT} -. endif . endif PLIST_SUB+= PHP_EXT_DIR=${PHP_EXT_DIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304242001.33OK19wU009301>