Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 May 2022 19:50:22 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d8b81c2c885b - main - security/p5-openxpki: adjust REINPLACE_CMD warnings
Message-ID:  <202205231950.24NJoMZf003744@gitrepo.freebsd.org>

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

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

commit d8b81c2c885b061e33e5975ee5e2eef71a7ddfce
Author:     Sergei Vyshenski <svysh.fbsd@gmail.com>
AuthorDate: 2022-05-23 19:42:53 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-05-23 19:49:19 +0000

    security/p5-openxpki: adjust REINPLACE_CMD warnings
    
     - adjust REINPLACE_CMD for better hits and eliminate lots of warnings
       about files that it don't apply.
     - not bumping PORTREVISION since there are no funcionality changes.
    
    PR:             263795
---
 security/p5-openxpki/Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index bdf0e017a33b..465e7566450c 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -123,11 +123,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|..vergen --format version.|"${PORTVERSION}"|g' ${WRKSRC}/Makefile.PL
 	@( \
 	cd ${WRKSRC}/../..; \
-	${FIND} config core/server doc qatest tools -type f -print0 >filelist; \
-	${CAT} filelist | ${XARGS} -0 -I % ${REINPLACE_CMD} -e 's|/etc/openxpki|${PREFIX}/etc/openxpki|g' "%"; \
-	${CAT} filelist | ${XARGS} -0 -I % ${REINPLACE_CMD} -e 's|/var/run/openxpkid.pid|/var/openxpki/openxpkid.pid|g' "%"; \
-	${CAT} filelist | ${XARGS} -0 -I % ${REINPLACE_CMD} -e 's|/var/openxpki/\([^\.]*\)\.log|/var/log/openxpki/\1\.log|g' "%"; \
-	${CAT} filelist | ${XARGS} -0 -I % ${RM} "%.bak"; \
+	${ECHO} "Patching dir names..."; \
+	${GREP} -RIFl -e "/etc/openxpki" config core/server doc qatest tools >filelist; \
+	${CAT} filelist | ${XARGS} -I % ${REINPLACE_CMD} -e 's|/etc/openxpki|${PREFIX}/etc/openxpki|g' "%"; \
+	${CAT} filelist | ${XARGS} -I % ${RM} "%.bak"; \
+	${GREP} -RIFl -e "/var/run/openxpkid.pid" config core/server doc qatest tools >filelist; \
+	${CAT} filelist | ${XARGS} -I % ${REINPLACE_CMD} -e 's|/var/run/openxpkid.pid|/var/openxpki/openxpkid.pid|g' "%"; \
+	${CAT} filelist | ${XARGS} -I % ${RM} "%.bak"; \
 	${RM} filelist; \
 	)
 	@${MKDIR} ${WRKSRC}/t/var/log/openxpki



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