From nobody Sun Feb 06 18:52:45 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 7415619C71BC; Sun, 6 Feb 2022 18:52:45 +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 4JsJLP1mMTz4ZWp; Sun, 6 Feb 2022 18:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644173565; 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=sH8p1pWhEuTobxiUZMeZ9bzg5WBbD8vidRDpKyDrqxY=; b=KjdjHfiuyS5gUxs+vU7N8dbaVnZA3etPaLcOxlP2huhUh/jLGDT/Gkyemd1RFBXpeq0ViG J5bWHTMZKn7ERd6dpAzXmlylaUgWQrViO6ApaUBLTxObpqjkVlj4tcDTslAySogftHuHbk ALIqqOu8w87uZWH6AR+VZt9k+ox0VxHUEvkIOBTUNI0W3ue89aDpiSXlyy25ol+lXKihJS tjy9HEqyPL9ihMp4UNMtJRCpD9NF4SGRFsgqE4cNTafqxtHuk7z0tjDbGYkv28qiBQI+lo NMgBAmCP678iIPqsQuNHuF8TBdy9dwj8PWN1aBWLpeSWU54cSiVLWYJvcscIng== 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 1CC3C17AE4; Sun, 6 Feb 2022 18:52:45 +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 216Iqjx3063757; Sun, 6 Feb 2022 18:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 216IqjIP063756; Sun, 6 Feb 2022 18:52:45 GMT (envelope-from git) Date: Sun, 6 Feb 2022 18:52:45 GMT Message-Id: <202202061852.216IqjIP063756@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: d4b3ad64a4ca - main - lang/php??: make CONFLICTS_INSTALL visible to PHP module ports 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4b3ad64a4ca97d38fdce4ff6821758b5c2a9dcb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644173565; 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=sH8p1pWhEuTobxiUZMeZ9bzg5WBbD8vidRDpKyDrqxY=; b=N7uEQSUo7o6IH7NXMTyV6I9avFgAEvDPJGwC/m3p/tnz/bqNjvAphB1aE/RY4wVvM4QQXp Y2TZVtIk+Fqf5Mg8/kKDf5BTLUR6X0kuqbdpAZvzygoTM20XBVkRxzJWSed2hIk088y3l4 cJCD9du+QZNb+hR1+pNEuNQS3ehYY/WRGK+oQOOEyo9RZKDoFUERF51khyz3V7KDRxSnAq 2YLU+oEFNXZwc4dCzFkvZ4SIG1+ZRL+IbcQEwv0NhpQdSs7Rz/MMmTcC62M+IGE5rLR0rU u9Xk195DTkHGyJ1tfrCeWf3QYEwRvkuM4ZrdJV9MuFbrkEk7c2z6Y4+HysFusw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644173565; a=rsa-sha256; cv=none; b=XZB0RTqQpTsN8ZPn4ExX0Azydb7j33lwbmLHDRg7y5EsVClvcACfmtrItWqdNHggjY7BJN SN1Ti24NYQQ6rXF/dME1OMT2r9TPZDymYxaUzgcY1FBmnf2Sj0qffZ9y+E9f4OnMHoBqkt k40OBiJYo8QdzEmkpMA7TpKYFR6icUZNXx+qXCmAQ1hD7bGYdjagM9TkN3W0S9btI+sie7 cCuQzGI0/XyTh6+EVeapkJ4zpqKfKhtWp9otvzeSPRpeNTqA2WcKSMiKFZ9mxlCbPBJyUt SjyaZUVaqBRN7x0ZA2ykQ2/zX8e7YjFRAGp77BJueVvo4XECQ/TGVqIzE5tzPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=d4b3ad64a4ca97d38fdce4ff6821758b5c2a9dcb commit d4b3ad64a4ca97d38fdce4ff6821758b5c2a9dcb Author: Stefan Eßer AuthorDate: 2022-02-06 18:46:36 +0000 Commit: Stefan Eßer CommitDate: 2022-02-06 18:46:36 +0000 lang/php??: make CONFLICTS_INSTALL visible to PHP module ports The definition of CONFLICTS_INSTALL already included ${PKGNAMESUFFIX}, but in a block that was conditional on ${PKGNAMESUFFIX} not being defined, defying the purpose. After this change all ports that refer to the lang/php?? interpreter ports get an automatic CONFLICTS_INSTALL definition that prevents the installation of the same module for multiple interpreter versions. This change adds correct CONFLICTS_INSTALL definitions to hundreds of PHP ports that previously lacked any such definition. PHP modules can override this generated CONFLICTS_INSTALL definition in their Makefiles, if required. Approved by: portmgr (implicit) --- lang/php74/Makefile | 4 ++-- lang/php80/Makefile | 4 ++-- lang/php81/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/php74/Makefile b/lang/php74/Makefile index e5984688cca2..844391f2b287 100644 --- a/lang/php74/Makefile +++ b/lang/php74/Makefile @@ -18,6 +18,8 @@ USES+= compiler:c11 tar:xz cpe gnome pkgconfig CPE_PRODUCT= php NO_OPTIONS_SORT=yes +CONFLICTS_INSTALL?= php[0-9][0-9]${PKGNAMESUFFIX} + .if !defined(PKGNAMESUFFIX) LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ libargon2.so:security/libargon2 @@ -36,8 +38,6 @@ USE_GNOME= libxml2 # PR230207 Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-z,notext -CONFLICTS_INSTALL= php[0-9][0-9]${PKGNAMESUFFIX} - OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE OPTIONS_EXCLUDE_DragonFly= DTRACE diff --git a/lang/php80/Makefile b/lang/php80/Makefile index 1e7c99b06cdf..940c5d9d106e 100644 --- a/lang/php80/Makefile +++ b/lang/php80/Makefile @@ -14,6 +14,8 @@ LICENSE= PHP301 USES+= compiler:c11 tar:xz cpe gnome pkgconfig CPE_PRODUCT= php +CONFLICTS_INSTALL?= php[0-9][0-9]${PKGNAMESUFFIX} + .if !defined(PKGNAMESUFFIX) LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ libargon2.so:security/libargon2 @@ -32,8 +34,6 @@ CPPFLAGS= -I${LOCALBASE}/include # PR230207 Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-z,notext -CONFLICTS_INSTALL= php[0-9][0-9]${PKGNAMESUFFIX} - OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND MYSQL80 LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE OPTIONS_EXCLUDE_DragonFly= DTRACE diff --git a/lang/php81/Makefile b/lang/php81/Makefile index 8220c29387f4..4206fea49ec7 100644 --- a/lang/php81/Makefile +++ b/lang/php81/Makefile @@ -14,6 +14,8 @@ USES+= compiler:c11 cpe gnome pkgconfig tar:xz CPE_PRODUCT= php PHP_VER= 81 +CONFLICTS_INSTALL?= php[0-9][0-9]${PKGNAMESUFFIX} + .if !defined(PKGNAMESUFFIX) LIB_DEPENDS= libargon2.so:security/libargon2 \ libpcre2-8.so:devel/pcre2 @@ -35,8 +37,6 @@ CPPFLAGS= -I${LOCALBASE}/include # PR230207 Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-z,notext -CONFLICTS_INSTALL= php[0-9][0-9]${PKGNAMESUFFIX} - OPTIONS_DEFINE+= CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \ MYSQL80 MYSQLND PHPDBG ZTS OPTIONS_DEFAULT= CGI CLI DTRACE EMBED FPM LINKTHR MYSQLND