From nobody Tue Jan 25 09:21:59 2022 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 288EF196E7AD; Tue, 25 Jan 2022 09:22:00 +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 4JjhFM6kJNz4pmJ; Tue, 25 Jan 2022 09:21:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643102520; 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=qcXyJGGqNzWHZUr2tjIUTvV40DvMe+lNTq8FaEZ40yU=; b=Biflcxqcq0svMadBn8NJzuGNc0cX13QmPXPZLW+jcgycKqTumRaf2+TMssYEnBrLmrzGNC 6qPCw2z9c5m+VejQIr+lm5/hW9r6vmSgkBU7/8+6K7Hmry1eV/t46fu+PnqUw3L00WbYAj u+WqAKfpmvJLreO4RP1gj1sM8ECchY/PZfaISJXevV4i5TuyrHHVOn4wBu91sTIqVUWEDo NWCLCA6d3cLaOOdHdCs45B9+68aA2++bkoaXSgkYlU7O/lH3w+m9nFyvbJSVOd4tXDQjPl xV12Lou2033iJXgEA3qpiQ5ZpA+fyHa8dffuVKN/wB8YQvsqserRkpwcA9Ygnw== 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 C7C83272AF; Tue, 25 Jan 2022 09:21:59 +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 20P9LxIJ068710; Tue, 25 Jan 2022 09:21:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P9LxUJ068709; Tue, 25 Jan 2022 09:21:59 GMT (envelope-from git) Date: Tue, 25 Jan 2022 09:21:59 GMT Message-Id: <202201250921.20P9LxUJ068709@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: ed26168a5c83 - main - Fix libphp name in php.mk 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: ed26168a5c8380b2bc81ff3cd460f7ff44458ebf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643102520; 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=qcXyJGGqNzWHZUr2tjIUTvV40DvMe+lNTq8FaEZ40yU=; b=Q5DCNytY5MGmppg3Om11d1CnAg8YfeVAPeVMZJCTggaG4l1UIrHfRZFtp3aZIItULWUEHl GJchHfpaL0LkqQx+OI+rRguliMLYldm0IjDdeokmzvrSZtEJUd49h4PkP8KUKEtY/dNoMv REYQ0mjc3WEUbcEjlzmSeNygVBE8HX3EcKu9yqf2CXbucrnPuLKUXaVA9amCpfBYjTIWjP MNX9fGOV8Qc/6A709qPcS1POZwwe0pxPp6y/MK7lQU62SkbIg16eCDg5KlA8E3xg2kswsw jcCnEFUO7qHBPMBeHlldNfi+KUxCPd8lv4rWuNbGe/EL44C7J930wmIs51wwww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643102520; a=rsa-sha256; cv=none; b=BBqiZMH2xPGede6pOROZ9yu5Kubz1hUiiuGuTmb78v7/yq3ei3EH+GyM/pZaZb8iIwJCKa KTfAWnxwp9xr6rm502Wf42Oq2bW362NudDrcVaCD0/AAs/o8WC62Tk4hCbWiVKJkNUjidX C0uCrt+Vchof7ytvvOk+A+YZxnb6LVGRLbDa3DgUf9eYxet08F5LCf+Ag88w6TitPASGTq Zm0lutrCclvIeajXEPPl1VUuLnyr6tGYo9z31jdo+rbXwGSZZSPJkI1FTVj1lMHGVEiK+v JM5OGQmhxS8SzdJ8w7GyIsknX37zUvBDOczxlMQ/Li+txbcM1OpyeiTlvo9+MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed26168a5c8380b2bc81ff3cd460f7ff44458ebf commit ed26168a5c8380b2bc81ff3cd460f7ff44458ebf Author: Mark Burdett AuthorDate: 2022-01-25 09:17:22 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-01-25 09:21:38 +0000 Fix libphp name in php.mk - From php80 and onwards libphp name is libphp.so without the major version number. Add a check to fix the RUN_DEPENDS. PR: 251252 Reported by: jonaspalm@posteo.de Approved by: ale (maintainer) Sponsored by: Bounce Experts --- Mk/Uses/php.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index 8f1dd7cc6375..bf3a48b3bd71 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -275,8 +275,12 @@ 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+ .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}