git: 9f47879b22dd - main - multimedia/mplayer: Simplify REINPLACE_CMD, avoid warnings re no-ops
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 20 Mar 2022 15:11:07 UTC
The branch main has been updated by riggs:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9f47879b22ddf606b275d4e963f5ab503d8d888d
commit 9f47879b22ddf606b275d4e963f5ab503d8d888d
Author: Thomas Zander <riggs@FreeBSD.org>
AuthorDate: 2022-03-20 15:09:48 +0000
Commit: Thomas Zander <riggs@FreeBSD.org>
CommitDate: 2022-03-20 15:11:05 +0000
multimedia/mplayer: Simplify REINPLACE_CMD, avoid warnings re no-ops
---
multimedia/mplayer/Makefile.common | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index f05032d5efac..d8ae230c249d 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -60,15 +60,14 @@ common-post-patch:
-e 's|-lncurses|/usr/lib/libncurses.so|' \
-e 's|-liconv|${ICONV_LIB}|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
- @${FIND} -E ${WRKSRC} -type f \
- -iregex ".*(configure|.sh|Makefile)" -print0 | \
- ${XARGS} -x -0 -n 10 \
- ${REINPLACE_CMD} -E \
- -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
- -e 's|[[:space:]]gcc| ${CC}|' \
- -e 's|\$$\(CC\)|${CC}|' \
- -e 's|/usr/X11R6|${LOCALBASE}|' \
- -e 's|%%LOCALBASE%%|${LOCALBASE}|'
+ @${REINPLACE_CMD} -E \
+ -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
+ -e 's|[[:space:]]gcc| ${CC}|' \
+ -e 's|\$$\(CC\)|${CC}|' \
+ -e 's|/usr/X11R6|${LOCALBASE}|' \
+ -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \
+ ${CONFIGURE_WRKSRC}/Makefile
@${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \
's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \