From nobody Mon Apr 24 20:01:09 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 4Q4wxK5vl5z47HMt; Mon, 24 Apr 2023 20:01:09 +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 4Q4wxK4PF4z3N3F; Mon, 24 Apr 2023 20:01:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682366469; 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=7PpRFfoDQ/x4rV0J3wb4qgH5g9BTw1sE4iLxd6VM28w=; b=BgnNcJ5JvsExvu4kNOxkjk36Qz9usKL/s09CNoDD61pZ/bwicKmZFcHlsWBg5iQ7GYkBs4 LOKe+s8x0yePxHFYSP73InI71C7KDyBO9JBt43lLGGuQUjSgPlxNJWtHie6589NY7ynL3W v2S3gfipoFoyiHqNYLjAdKjvCgJmp1quhE6HLSiD4z9PlFf0WMkEwOug9TgZUiMrG5k0Qs cSJDIu/4p7J50Y/ib68qEHj8CAkx4NOjIi6rQcRsGaCSKIjbBlT9bBldpHumRSWEJDiI1Y IMHHplj8aHS0NvQrJkfWj6UCVIi+7AFgIPFjhNDu/QNC9dOTaHeBKHZY07o10A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682366469; 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=7PpRFfoDQ/x4rV0J3wb4qgH5g9BTw1sE4iLxd6VM28w=; b=syXARKn7KPHGCci3EtIaMBwMIXue9r6pzAQ3LVs9WWMrAt9dy2b/1fO3n8TMkc9D7yrrZB kd7ObpkLu/b+oyi/m0ZhM4DB6uML9OOOV4rBwvvgx0E6mQtNOzRA2W2LdWcslHSDv+ckKv H2rYNdc8TPUNWNU5XtJkJZSDmVwSIshrsBs45iIJPyQ+o6t5/uunXFSWaZ7ks5MVyYmAzM 2k4C84PDR0wSPA3///yqcLbsBskYWQwRkeY3gi1gFyObpS8YHYvnFy6FmpA/7FeWRaYO9t XH5GTxi4TEzaf8uNgkO+ZNf8usWCw0u5XK5ekDqXY+1pBJ4qU5oMW7rwGSOsLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682366469; a=rsa-sha256; cv=none; b=rNpBhJB5za4na39eauF3enXzIp0wZXRv8scJv+R7siFeTkZ74HF+X3AJoGSXiLgOna6cn8 g5NlkBdiqAvndFE0JGJhQoNw4rmFkOhjPykfMdA+zQaADsZI6oozq6vHA3vweqour8MLi5 QjwC7hs8jKA3wv75vp+H4UQEb4IJf9LzqIHW7f694+taUdH+raQYEWGZXE3CQ7eM7JqJVd pQEW1NIXmMLQbz1WrA7QBwNBuaalVYZjrSUBwNTwxJ5m0e2nzLvk6NIoqZMcw7/q0Wgae6 JlpWGcl9w30I8Zjl1LFkim861hnwe9Q70VoQ1BKg9wJc3lbGHsyWkXlS74l27A== 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 4Q4wxK3RSgzfD6; Mon, 24 Apr 2023 20:01:09 +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 33OK19aN009302; Mon, 24 Apr 2023 20:01:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OK19wU009301; Mon, 24 Apr 2023 20:01:09 GMT (envelope-from git) Date: Mon, 24 Apr 2023 20:01:09 GMT Message-Id: <202304242001.33OK19wU009301@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: 9f5034f55a47 - main - Mk/Uses/php.mk: Refactor 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: 9f5034f55a47591288167cd49fe4bb963143caed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f5034f55a47591288167cd49fe4bb963143caed commit 9f5034f55a47591288167cd49fe4bb963143caed Author: Muhammad Moinur Rahman AuthorDate: 2023-04-24 19:59:31 +0000 Commit: Muhammad Moinur Rahman 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}