From nobody Sat Aug 13 14:43:29 2022 X-Original-To: dev-commits-ports-all@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 4M4jw16RvCz4YsRb; Sat, 13 Aug 2022 14:43:29 +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 4M4jw15Csqz43dQ; Sat, 13 Aug 2022 14:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660401809; 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=J8QXFh/2Hwlg6qpTje+iQnpx1lfKa3gNoaCfoWzEw78=; b=KrlCUodEmhz9pKOMFUqIsVxCx5NGXzbgjyJjR9/Bmdp7ATcjRtcUkhZ+QLHjphBWB2m19R MO0PIqXiZa6XeJsKLA0x1S0PFJ584ks7trd2YiOmsIRrjiCTeKkvwvPBcgweGyFnFFkzSL aup60u/dOizQKBFmbJ7jo2RibrvUmLIs+9vV/Z0NS/YFxf1CFNLtQM//Bd+GrGwQvMvbfx 8sqnE/GyJhMYO5K4HOxEm27MXnNv5MNg3Wn6rEg4s12BVVLzb27Miwfbc/qn65RM1n0adO zb0fVIk0cTuag7beW3UKgcGPeuHoXA5JVN58aE7BYAi/kUEF486mUxYFY7GemA== 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 4M4jw14FW2zFpM; Sat, 13 Aug 2022 14:43:29 +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 27DEhTea025803; Sat, 13 Aug 2022 14:43:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27DEhTrD025802; Sat, 13 Aug 2022 14:43:29 GMT (envelope-from git) Date: Sat, 13 Aug 2022 14:43:29 GMT Message-Id: <202208131443.27DEhTrD025802@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: b70f06d6d3ca - main - pear.mk: handle invalid flavors List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b70f06d6d3ca454f931d31f38af19ba80f77fb9c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660401809; 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=J8QXFh/2Hwlg6qpTje+iQnpx1lfKa3gNoaCfoWzEw78=; b=O7eY+fO+9RaLYqeeftNH6y2lX/IREBM/iUM5elFNwC2EiaDXZdi7M1efUJ2nxdveVsV4J2 Awuu3lFwauzKexlj6xp+66QpSSxCgI0/4kNqmJr3f981jTvvPyp0rGk4uR+q3etN7jxRm1 OyexSUGvCoBhjW9IRCZVmkU8VUsvuigdIInJV0B7tAuMP8ncWsSyXZ4FQ8zKbtxMgSL0t/ KWRirvEwo7s2wQhMPvP1l/iPo4Eh7gpHhWNGfL3B6wJzBOs7y6imIBW4nKCMiOJw7VzdfS smrpAfvPj55QGaQNHvcZj7xzrKFs8vwovX0O74iyd3H/CtksoGGXph+fPMPQfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660401809; a=rsa-sha256; cv=none; b=i3yH6Q+Qtxmvp+TlmJAeDgZtswEBovlBaq8ajn1oXeL6j6/GCvgdsHr1z7StvsepyYWXpf kfFQbVEKOHcvr4SYCN3wWlN9bhFNXDp6ic50Z7lORKB1ROoxEbeOVccgzt5U9VdtdQ6VFG zSCdV5o0PVwAHZCMCQ2NS9hLxGqA3eCPEM5W65DAfsWcMIQw7AGWq6Tdj5qz2V4zrFkghb zgBLxZgODQKgTBsYM+wi+wd+gkMp8yoTz9M02Eqd8hwBaZoVIvWGy9d8hfgLvsbxDygyWQ 7zdtFFBPaeTfg6e8s0COav64X/d83zQe9OvBHs6HAanZKmDPzlh6EYaJw38oIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=b70f06d6d3ca454f931d31f38af19ba80f77fb9c commit b70f06d6d3ca454f931d31f38af19ba80f77fb9c Author: Tobias C. Berner AuthorDate: 2022-08-11 18:38:59 +0000 Commit: Tobias C. Berner CommitDate: 2022-08-13 14:42:54 +0000 pear.mk: handle invalid flavors mark pear consumers IGNORE'd when they ask for a flavor, that devel/pear does not support (via Mk/Uses/pear.mk). Tested by: bofh --- Mk/Uses/pear.mk | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/Mk/Uses/pear.mk b/Mk/Uses/pear.mk index bfa0f4a6a9de..26350023ba16 100644 --- a/Mk/Uses/pear.mk +++ b/Mk/Uses/pear.mk @@ -22,43 +22,51 @@ IGNORE= Incorrect 'USES+= pear:${pear_ARGS}' usage: argument [${arg}] is not rec . endif . endfor -IGNORE_WITH_PHP?= 82 +_pear_IGNORE_WITH_PHP= 82 +IGNORE_WIHT_PHP?= ${_pear_IGNORE_WITH_PHP} php_ARGS+= flavors .include "${USESDIR}/php.mk" -. if empty(pear_ARGS:Menv) +# Mark the port ignored if it wants pear for an unsupported flavor +. if ${_pear_IGNORE_WITH_PHP:tw:S/^/php/:M${PHP_FLAVOR}} +IGNORE= devel/pear does not support flavor ${PHP_FLAVOR} +_pear_INVALID= yes +. endif + +. if !defined(_pear_INVALID) +. if empty(pear_ARGS:Menv) MASTER_SITES?= http://pear.php.net/get/ EXTRACT_SUFX?= .tgz DIST_SUBDIR?= PEAR -. if empty(php_ARGS:Mphpize) +. if empty(php_ARGS:Mphpize) NO_BUILD= yes +. endif . endif -. endif BUILD_DEPENDS+= pear:devel/pear@${PHP_FLAVOR} RUN_DEPENDS+= pear:devel/pear@${PHP_FLAVOR} PEAR_PKGNAMEPREFIX= php${PHP_VER}-pear- -. if defined(PEAR_CHANNEL) && ${PEAR_CHANNEL} != "" +. if defined(PEAR_CHANNEL) && ${PEAR_CHANNEL} != "" PEAR_${PEAR_CHANNEL:tu}_PKGNAMEPREFIX= php${PHP_VER}-pear-${PEAR_CHANNEL}- PKGNAMEPREFIX?= ${PEAR_${PEAR_CHANNEL:tu}_PKGNAMEPREFIX} PEARPKGREF= ${PEAR_CHANNEL}/${PORTNAME} PEAR_CHANNEL_VER?= >=0 BUILD_DEPENDS+= ${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR} RUN_DEPENDS+= ${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR} -. else +. else PKGNAMEPREFIX?= ${PEAR_PKGNAMEPREFIX} PEARPKGREF= ${PORTNAME} -. endif +. endif -. if exists(${LOCALBASE}/bin/php-config) +. if exists(${LOCALBASE}/bin/php-config) PHP_BASE!= ${LOCALBASE}/bin/php-config --prefix -. else +. else PHP_BASE= ${LOCALBASE} -. endif +. endif PEAR= ${LOCALBASE}/bin/pear LPEARDIR= share/pear LPKGREGDIR= ${LPEARDIR}/packages/${PKGNAME} @@ -76,29 +84,31 @@ EXAMPLESDIR= ${PHP_BASE}/${LEXAMPLESDIR} SQLSDIR= ${PHP_BASE}/${LSQLSDIR} SCRIPTFILESDIR= ${LOCALBASE}/bin TESTSDIR= ${PHP_BASE}/${LTESTSDIR} -. if defined(CATEGORY) && !empty(CATEGORY) +. if defined(CATEGORY) && !empty(CATEGORY) LINSTDIR= ${LPEARDIR}/${CATEGORY} -. else +. else LINSTDIR= ${LPEARDIR} -. endif +. endif INSTDIR= ${PHP_BASE}/${LINSTDIR} SUB_LIST+= PKG_NAME=${PEARPKGREF} -. if empty(pear_ARGS:Menv) -. if empty(php_ARGS:Mphpize) && !exists(${.CURDIR}/pkg-plist) +. if empty(pear_ARGS:Menv) +. if empty(php_ARGS:Mphpize) && !exists(${.CURDIR}/pkg-plist) PLIST= ${WRKDIR}/PLIST -. endif +. endif PKGINSTALL?= ${PORTSDIR}/devel/pear/pear-install PKGDEINSTALL?= ${WRKDIR}/pear-deinstall -. endif +. endif PLIST_SUB+= PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \ TESTSDIR=${LTESTSDIR} INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR} \ SCRIPTFILESDIR=${LCRIPTSDIR} +. endif # !defined(_pear_INVALID) .endif -.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PEAR_POST_MK) + +.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PEAR_POST_MK) && !defined(_pear_INVALID) _INCLUDE_USES_PEAR_POST_MK= yes . if empty(pear_ARGS:Menv)