From nobody Sun Apr 24 11:36:49 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 D22371A8C2C5; Sun, 24 Apr 2022 11:36:49 +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 4KmR1s5ZyRz4cKl; Sun, 24 Apr 2022 11:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650800209; 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=ChgEbsGMThwhrXEkBVixI/SjGcI2PWRjPkRXTQJLGFU=; b=w4iy16zs4LWdshZL1ppAAh3UvHHelBuwHNurPck9wfiGLGZhtsnLW2dtz0FN5dAsC88iiC bkavCbdcyBxOPADl3Q2/rESJ+Ub+2Av4OtDyYv1MoDQZ4ca403p07Ug0gH1c5nghpYVUc5 DLs3Y3LvXjcf6IeLEjHFm4/VEiYVkeRoQB4Nvw9l+jju+i4qLypUnuI6S9gzq/dAfrcA/b CVlrORB0Qxk8fSAjK9uxU9eX+FSSXuH08g3ZcN3aJCfGIrCuCZ5s2cc4WcAf/RfMXO40M1 4uySrsiSr1SLYsrySof856frL1DK/fSCrbq66gFhtDGg8Ert44GDjOyMDrEJrA== 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 9FB9C254C3; Sun, 24 Apr 2022 11:36:49 +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 23OBan6k061432; Sun, 24 Apr 2022 11:36:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23OBanhU061431; Sun, 24 Apr 2022 11:36:49 GMT (envelope-from git) Date: Sun, 24 Apr 2022 11:36:49 GMT Message-Id: <202204241136.23OBanhU061431@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: 5614638f1ecd - main - Mk/bsd.port.mk: revert commit e03f85dbc9cc 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5614638f1ecda8f8bc97a5d3b76d27d454d78ae6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650800209; 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=ChgEbsGMThwhrXEkBVixI/SjGcI2PWRjPkRXTQJLGFU=; b=ng95dRMl4sucqfwgm/uD1k4Yj5HU9F9V2u5fqC+oz2/t3WP1iwDHkmPDQpZepB1QdFQH0G /v5arfVFFE1dfJX4XSyQMH3QR0d42RQYkh85aUHLet9EPEBuoYJcQTN5cIJ+mV/0mu491n rBhA0/3KxTY6YiG1Q+JW8dYbDrG5sqsK3M7LkV1PVbWfgY+iz/4y9ezZ6etcx+3dISYF9X E0jrEIJ9nzJDy3YzXrtHshvExRpaYYCJZ1pIrf/b4+vB2+Ye7PMwtO8C/14H6VNl20zNnu A8IW/BLSkclo3CNr9pBEhUsHPniSyrPvUBoiHeD4VoyxDUEKqw15489iZ0jOPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650800209; a=rsa-sha256; cv=none; b=eluG0tmFYcQjErmMiJU8djatZaYJiK9xjSoyhuZX9xvGSCIBUKcfH3jIbcwTgQKt0iT1wy SKy+RgMQk/aZTYpXe+LCS70mjlb5Mk4wyYipkyj42x7fgBDSMYlia/ghN7dXndEU9Ko/IP sqMiq7Kff/HsC0vuN3bZBa00PA9/pbF42Kct4olcSfb0NS1jpCOoQYgZI4sevxYXHiyn+y Rb7gSjzXb/kgx+5GZR2E+Y+JXtt+sVRrqesTfZqRY/3+3xn47ujevXPNY3OVrpoW22p/JK Q4vdtZK0bXEF1/rB0n1A+o/Q3Wqkow/UAl5v78sqHKVBfHptcEuz0lujsWjP5w== 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=5614638f1ecda8f8bc97a5d3b76d27d454d78ae6 commit 5614638f1ecda8f8bc97a5d3b76d27d454d78ae6 Author: Stefan Eßer AuthorDate: 2022-04-24 11:34:52 +0000 Commit: Stefan Eßer CommitDate: 2022-04-24 11:34:52 +0000 Mk/bsd.port.mk: revert commit e03f85dbc9cc While adjusting for white-space changes one .if conditon has been lost. Revert and re-apply in a follow-up commit with the missing line restored. Approved by: portmgr (implicit) --- Mk/bsd.port.mk | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 4ea0f73cc0c5..f1e258672484 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1047,7 +1047,7 @@ _FLAVOR:= ${FLAVOR} .if !defined(PORTS_FEATURES) && empty(${PORTS_FEATURES:MFLAVORS}) PORTS_FEATURES+= FLAVORS .endif -MINIMAL_PKG_VERSION= 1.17.2 +MINIMAL_PKG_VERSION= 1.15.9 _PORTS_DIRECTORIES+= ${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR} \ ${STAGEDIR}${PREFIX} ${WRKDIR}/pkg ${BINARY_LINKDIR} @@ -3294,7 +3294,13 @@ check-conflicts: check-build-conflicts check-install-conflicts . if !target(check-build-conflicts) check-build-conflicts: . if ( defined(CONFLICTS) || defined(CONFLICTS_BUILD) ) && !defined(DISABLE_CONFLICTS) && !defined(DEFER_CONFLICTS_CHECK) - @conflicts_with=$$(${PKG_QUERY} -ge "%n != ${PKGBASE}" "%n-%v" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} 2>/dev/null || : ; ) ; \ + @conflicts_with=$$( \ + { ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} 2>/dev/null || : ; } \ + | while read pkgname prfx orgn; do \ + if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ + ${ECHO_CMD} -n " $${pkgname}"; \ + fi; \ + done); \ if [ -n "$${conflicts_with}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ @@ -3313,7 +3319,13 @@ check-build-conflicts: CONFLICT_WARNING_WAIT?= 10 identify-install-conflicts: . if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) ) && !defined(DISABLE_CONFLICTS) - @conflicts_with=$$(${PKG_QUERY} -ge "%n != ${PKGBASE}" "%n-%v" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : ; ) ; \ + @conflicts_with=$$( \ + { ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : ; } \ + | while read pkgname prfx orgn; do \ + if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ + ${ECHO_CMD} -n " $${pkgname}"; \ + fi; \ + done); \ if [ -n "$${conflicts_with}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ @@ -3331,7 +3343,14 @@ identify-install-conflicts: . if !target(check-install-conflicts) check-install-conflicts: . if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) || ( defined(CONFLICTS_BUILD) && defined(DEFER_CONFLICTS_CHECK) ) ) && !defined(DISABLE_CONFLICTS) - @conflicts_with=$$(${PKG_QUERY} -ge "%n != ${PKGBASE}" "%n-%v" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : ; ) ; \ +. if defined(DEFER_CONFLICTS_CHECK) + @conflicts_with=$$( \ + { ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : ; } \ + | while read pkgname prfx orgn; do \ + if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ + ${ECHO_CMD} -n " $${pkgname}"; \ + fi; \ + done); \ if [ -n "$${conflicts_with}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ @@ -3343,7 +3362,13 @@ check-install-conflicts: exit 1; \ fi . else - @conflicts_with=$$(${PKG_QUERY} -ge "%n != ${PKGBASE}" "%n-%v" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : ; ) ; \ + @conflicts_with=$$( \ + { ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : ; } \ + | while read pkgname prfx orgn; do \ + if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ + ${ECHO_CMD} -n " $${pkgname}"; \ + fi; \ + done); \ if [ -n "$${conflicts_with}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ @@ -3749,7 +3774,7 @@ deinstall: . if !target(deinstall-all) deinstall-all: -. if ${UID} != 0 && !defined(INSTALL_AS_USER) +.if ${UID} != 0 && !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Switching to root credentials for '${.TARGET}' target" @cd ${.CURDIR} && \ ${SU_CMD} "${MAKE} ${.TARGET}"