diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2021-03-22 15:13:55 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2021-03-22 15:13:55 +0000 |
commit | 2ba6eb3af7780cb69ceaff8bdb4b3ce5bdf340a1 (patch) | |
tree | 1b12d477d2bb2ebc3e49e8bf27f7bf16e5a8b53c /Mk | |
parent | a19ab6e0a884c0f0c8e4a34269b7c5af1f6328f3 (diff) | |
download | ports-2ba6eb3af7780cb69ceaff8bdb4b3ce5bdf340a1.tar.gz ports-2ba6eb3af7780cb69ceaff8bdb4b3ce5bdf340a1.zip |
Fix an obscure sed message while going through check-plist.
The obscure message being:
sed: 4: /tmp/sed_plist_sub.1i0ZNBB8: RE error: trailing backslash (\)
Thanks to: kevans
Notes
Notes:
svn path=/head/; revision=568966
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/bsd.port.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index e67b9f7f27e9..5ca45a2ab888 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -4543,6 +4543,8 @@ ${i:S/-//:tu}= ${WRKDIR}/${SUB_FILES:M${i}*} # Generate packing list. Also tests to make sure all required package # files exist. +PLIST_SUB_SANITIZED= ${PLIST_SUB:N*_regex=*} + .if !target(generate-plist) generate-plist: ${WRKDIR} @${ECHO_MSG} "===> Generating temporary packing list" @@ -4550,19 +4552,19 @@ generate-plist: ${WRKDIR} @if [ ! -f ${DESCR} ]; then ${ECHO_MSG} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi @>${TMPPLIST} @for file in ${PLIST_FILES}; do \ - ${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \ + ${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB_SANITIZED:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \ done .if !empty(PLIST) .for f in ${PLIST} @if [ -f "${f}" ]; then \ - ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${f} >> ${TMPPLIST}; \ + ${SED} ${PLIST_SUB_SANITIZED:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${f} >> ${TMPPLIST}; \ for i in owner group mode; do ${ECHO_CMD} "@$$i"; done >> ${TMPPLIST}; \ fi .endfor .endif .for dir in ${PLIST_DIRS} - @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dir ,' >> ${TMPPLIST} + @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB_SANITIZED:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dir ,' >> ${TMPPLIST} .endfor .endif |