From nobody Mon Feb 12 13:25:00 2024 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 4TYQDX3SSRz59pHl; Mon, 12 Feb 2024 13:25: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 4TYQDX2yXhz4mKh; Mon, 12 Feb 2024 13:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707744300; 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=dmPhZmpcXqvEwjn4kfe38QQk4/WfUjD5hYJS09Vokc4=; b=ADCtiUZSApm2UESFnQgjUmizvBHpvc/eTuZmuyE8HZTiNT/W//gcN4uU0teoR5EKizN6mo L5gXqCw9Yfl569FabsDkhfVsvGazufu44nQcjdkhKSsLqMQ5AJ4oa/08Eo07uT5JrxL3Xh HTUDrzAgo6QDJvmAOitheW1TdYHNL5hlOp2J9Ky29lMgNKRvWBriTZHg77kZTlh9EcAkcR 282ayBBj8WsgHN1HmaGrrqy65b3PCSZDiiVhknt6cSiS2nW5iZ8I4x1QALu9MEWnkGFkFV KsBiPRiQEXF8cxnUS9WJWBeJGmU83lz5PAFmCEdrv+crUZeV5cGeSab2RXN2Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707744300; a=rsa-sha256; cv=none; b=FZXF/JUrIj3PlAhAdd0khbYvXAQU8FvVqpQvqxYBHqAdx0jFWF1nHDzygBf5y9pyvVtlN1 VG0ODNyyWLzDAdmSnFFrxrbJWj++dlVCU8xkqQy+2M42CUCUxFuvYiewREi1uXTabTcAd0 CIL6GU8RcH3Scm8tCferoZ1gl2ItKTmZSgIaytL2Oe5iTJk9y/Pixa+XttkU2SjXH21Z5X S5ajWsH9Iui8GFZCf7CgVaJs3ad2zZhZCycdAL5pPF8QoyUszjU4+q89G39gBN8fP0Q1je VWviaQs3DtJt/satOHG85LQrTc8+CdL1ArUtLgEV7/Ez/zYAqRyAs639qbtEPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707744300; 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=dmPhZmpcXqvEwjn4kfe38QQk4/WfUjD5hYJS09Vokc4=; b=Eu++BWwGm4WSrea1V+FS2nQ2fS4MZnFDoRmvT2XEqDIFHAx28ZBCRWXTPIkuX16d65mgVA WtSz4Elusp+H9HV9v7amM+XUmBDK2sH5QDpVOt7zE1cYi9lIhgvfK5pkfBsqztNd/VpZ2E w1W1FP6cPT/066eu9+SP9CwbXj4w1rUMX2rpI4rVVkadfJzE4onK8qhxdcRXE3enWJopXf 2dSNk+3tO5gcK/gFDhAgqeQ5tuXdtRXL3eW90kXJuysdlRBQx4nhMkVSUAB76wOHBIUnIp Q8HNXRrqXI1RN7anDbZ/gCK8yC8vhuNhOL6oxhOKA763Yq7cwIppQU17EM82ug== 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 4TYQDX1vTLzSfG; Mon, 12 Feb 2024 13:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CDP0GT074730; Mon, 12 Feb 2024 13:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CDP00K074727; Mon, 12 Feb 2024 13:25:00 GMT (envelope-from git) Date: Mon, 12 Feb 2024 13:25:00 GMT Message-Id: <202402121325.41CDP00K074727@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: e1584ae1c5af - main - subpackages: fix minor regression 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1584ae1c5af74f4ee54ee8dee74b2650dd20714 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=e1584ae1c5af74f4ee54ee8dee74b2650dd20714 commit e1584ae1c5af74f4ee54ee8dee74b2650dd20714 Author: Baptiste Daroussin AuthorDate: 2024-02-12 13:19:42 +0000 Commit: Baptiste Daroussin CommitDate: 2024-02-12 13:24:57 +0000 subpackages: fix minor regression Before subpackages, when running package there where 2 cases: case 1: ${PACKAGES} directory exist: packages are created in the work/pkg directory then copies into ${PACKAGES} directory case 2: ${PACKAGES} does not exist: packages where only created in work/pkg After subpackages in the case 2, the packages get copied into the directory actually running the make package comment. This change makes the framework behave like before subpackages Reported by: Antonio Huete Jimenez (tuxilio from Dragonfly irc channel) --- Mk/bsd.port.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 448056ca1c17..5258bcfeb55b 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3487,11 +3487,13 @@ ${WRKDIR_PKGFILE${_SP.${sp}}}: ${_PLIST}.${sp} create-manifest ${WRKDIR}/pkg _EXTRA_PACKAGE_TARGET_DEP+= ${WRKDIR_PKGFILE${_SP.${sp}}} +. if defined(_HAVE_PACKAGES) ${PKGFILE${_SP.${sp}}}: ${WRKDIR_PKGFILE${_SP.${sp}}} @${LN} -f ${WRKDIR_PKGFILE${_SP.${sp}}} ${PKGFILE${_SP.${sp}}} 2>/dev/null \ || ${CP} -f ${WRKDIR_PKGFILE${_SP.${sp}}} ${PKGFILE${_SP.${sp}}} _EXTRA_PACKAGE_TARGET_DEP+= ${PKGFILE${_SP.${sp}}} +. endif . endfor # This will be the end of the loop