From nobody Sun May 15 09:28:20 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 14A091AED51B; Sun, 15 May 2022 09:28:21 +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 4L1H9w73Mvz3RLb; Sun, 15 May 2022 09:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652606901; 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=xtdmH5Q2ALJWoDFNX48n+ILfCEqKtI2wykVnDwQBKxw=; b=cYEpXhqz5b9+Q/nuQ5CdEGNSM+GBLHsnFRWIdUPAfkR5BZDc4T3M9FrRx3cPliIBNSpn72 fIlc6UU7qRl72tOtE0UxsTH8ZGYTlKpa3pxwpC03m0ctPPU49lAByGcD60ftWn86PSo2er E7upm/4oGU6J07qll1hk+LYr3o+g0Qrxt4u5nIp6EHGRoIg0A5EiTOeWcblJ6ITLFWqzCa zmHXTnabXoDg9GSisIPXebwE/HUGUTmKJNxHevdgeQ6IPPu8UZPkHR+G6SCpISwY+HTxka T6Kn3lQXZmJPKs31Dj/lms5/GHwug7SuODPxWMjYb1siI0DnZckHZ2fl6goOUA== 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 CE4EF6F4; Sun, 15 May 2022 09:28:20 +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 24F9SKdQ067885; Sun, 15 May 2022 09:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24F9SKvN067884; Sun, 15 May 2022 09:28:20 GMT (envelope-from git) Date: Sun, 15 May 2022 09:28:20 GMT Message-Id: <202205150928.24F9SKvN067884@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 617e09820197 - main - Mk/Uses: make a copy of package.xml 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 617e0982019746729e9ac8a9903016ff5f246d40 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652606901; 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=xtdmH5Q2ALJWoDFNX48n+ILfCEqKtI2wykVnDwQBKxw=; b=IEN6nC5DAXdrGd81zviE3UGyHPv3vIn1qEWL8QdmyDbGiMXhEv28+2AoJaCiRbgzxqnNZc 3BIfZq+KKFYlBy9CNXSkkTvvpafcACIwi4iOJ0Q5BSCrn6m8cA3ta4jyebcapdYtWMBfiU 37SHicJ5Tm4Fz2zPSwiE9thNfI+86zr1wdoHvxjN9Fk9oO3Jkfh14P5AHuIjoJ9OCqbiJA qXvnCAeNbfOpgwgcJgRgMfMRubihF4Htfmg3sDu4ynbaWow9S6I4zTzxUOkRekMLas0pI8 oOUUL/Bihy+gpitSWg23wOyVPdGJb1f/69zfD4EkiBErGYhStID6XkR4HYCYEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652606901; a=rsa-sha256; cv=none; b=GQoscg7ypDFo6c9ZBvoyLbSZ6ELCfXVWkwFtGZbmSCxMfNUzk/ATycZ1RpTSEWiiUBJU2f HeQYBaQZ1KyGhecmqmZw6kvwgq09dGHFZToyNfobXKV4Cvp7BPJsUNLJtryX+dcAnlvWpr /T9YfbQp9LDYVWwIEVsqHsB0vQ07YoRA4NFXADo9jeK01QUSq9A2IM8yrQcYjSqYKQg+aG oaOEMtj9iXI5VWZrqaasRtE6+B17xIapp+Z6cDTi+VwbrcPyNPx5U3NaJngrwGcSPXXkr8 p6P9SCpHpjrMaAfLsdh5FkLek6HxRPWjZvwd80hYDNsUA3rxTCUfd/1t/VTBKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=617e0982019746729e9ac8a9903016ff5f246d40 commit 617e0982019746729e9ac8a9903016ff5f246d40 Author: Thierry Thomas AuthorDate: 2022-05-13 13:16:17 +0000 Commit: Thierry Thomas CommitDate: 2022-05-15 09:22:45 +0000 Mk/Uses: make a copy of package.xml When installing pear ports with php80-pear-1.10.12, I noticed a failure: the file package.xml disappeared from $WRKSRC and the symlink became invalid. PR: 263942 --- Mk/Uses/pear.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Mk/Uses/pear.mk b/Mk/Uses/pear.mk index a04a163fbdb8..e3412fa1fa46 100644 --- a/Mk/Uses/pear.mk +++ b/Mk/Uses/pear.mk @@ -114,6 +114,10 @@ pear-pre-install: @${ECHO_MSG} "" @${FALSE} . endif + (if [ -f ${WRKSRC}/package.xml ] \ + && [ ! -f ${WRKDIR}/package.xml ] ; then \ + ${CP} -p ${WRKSRC}/package.xml ${WRKDIR} ; \ + fi) DIRFILTER= ${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' \ | ( while read r; do \