Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 May 2022 09:28:20 GMT
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 617e09820197 - main - Mk/Uses: make a copy of package.xml
Message-ID:  <202205150928.24F9SKvN067884@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=617e0982019746729e9ac8a9903016ff5f246d40

commit 617e0982019746729e9ac8a9903016ff5f246d40
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2022-05-13 13:16:17 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
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 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205150928.24F9SKvN067884>