svn commit: r568966 - in head: Mk databases/postgresql13-server lang/perl5-devel lang/perl5.28 lang/perl5.30 lang/perl5.32 net/ceph14
Mathieu Arnold
mat at FreeBSD.org
Mon Mar 22 15:13:59 UTC 2021
Author: mat
Date: Mon Mar 22 15:13:55 2021
New Revision: 568966
URL: https://svnweb.freebsd.org/changeset/ports/568966
Log:
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
Modified:
head/Mk/bsd.port.mk (contents, props changed)
head/databases/postgresql13-server/Makefile (contents, props changed)
head/lang/perl5-devel/Makefile (contents, props changed)
head/lang/perl5.28/Makefile (contents, props changed)
head/lang/perl5.30/Makefile (contents, props changed)
head/lang/perl5.32/Makefile (contents, props changed)
head/net/ceph14/Makefile (contents, props changed)
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Mon Mar 22 15:13:49 2021 (r568965)
+++ head/Mk/bsd.port.mk Mon Mar 22 15:13:55 2021 (r568966)
@@ -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,^, at dir ,' >> ${TMPPLIST}
+ @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB_SANITIZED:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^, at dir ,' >> ${TMPPLIST}
.endfor
.endif
Modified: head/databases/postgresql13-server/Makefile
==============================================================================
--- head/databases/postgresql13-server/Makefile Mon Mar 22 15:13:49 2021 (r568965)
+++ head/databases/postgresql13-server/Makefile Mon Mar 22 15:13:55 2021 (r568966)
@@ -172,9 +172,9 @@ OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops
DEBUG_CONFIGURE_ENABLE= debug
PLIST_SUB+= PG_USER=${PG_USER} \
- PG_USER_regex=\b${PG_USER}\b \
+ PG_USER_regex=[[:<:]]${PG_USER}[[:>:]] \
PG_GROUP=${PG_GROUP} \
- PG_GROUP_regex=\b${PG_GROUP}\b
+ PG_GROUP_regex=[[:<:]]${PG_GROUP}[[:>:]]
SUB_LIST+= PG_GROUP=${PG_GROUP} \
PG_USER=${PG_USER} \
PG_UID=${PG_UID}
Modified: head/lang/perl5-devel/Makefile
==============================================================================
--- head/lang/perl5-devel/Makefile Mon Mar 22 15:13:49 2021 (r568965)
+++ head/lang/perl5-devel/Makefile Mon Mar 22 15:13:55 2021 (r568966)
@@ -107,11 +107,11 @@ PLIST_SUB= ARCH_LIB=${_ARCH_LIB} \
MAN1=${PERLMANPREFIX_REL}/man/man1 \
MAN3=${PERLMANPREFIX_REL}/man/man3 \
PERL_ARCH=${PERL_ARCH} \
- PERL_ARCH_regex=\b${PERL_ARCH}\b \
+ PERL_ARCH_regex=[[:<:]]${PERL_ARCH}[[:>:]] \
PERL_VER=${PERL_VER} \
PERL_VERSION=${PERL_VERSION} \
PERLMANPREFIX=${PERLMANPREFIX_REL} \
- PERLMANPREFIX_regex=${PERLMANPREFIX_REL}\b \
+ PERLMANPREFIX_regex=${PERLMANPREFIX_REL}[[:>:]] \
PKGNAMESUFFIX=${PKGNAMESUFFIX} \
PRIV_LIB=${_PRIV_LIB} \
SITE_ARCH=${SITE_ARCH_REL} \
Modified: head/lang/perl5.28/Makefile
==============================================================================
--- head/lang/perl5.28/Makefile Mon Mar 22 15:13:49 2021 (r568965)
+++ head/lang/perl5.28/Makefile Mon Mar 22 15:13:55 2021 (r568966)
@@ -148,11 +148,11 @@ MANDIRS+= ${PERLMANPREFIX}/man
PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
PERL_ARCH=${PERL_ARCH} \
- PERL_ARCH_regex=\b${PERL_ARCH}\b \
+ PERL_ARCH_regex=[[:<:]]${PERL_ARCH}[[:>:]] \
MAN1=${PERLMANPREFIX_REL}/man/man1 \
MAN3=${PERLMANPREFIX_REL}/man/man3 \
PERLMANPREFIX=${PERLMANPREFIX_REL} \
- PERLMANPREFIX_regex=${PERLMANPREFIX_REL}\b \
+ PERLMANPREFIX_regex=${PERLMANPREFIX_REL}[[:>:]] \
SITEMANPREFIX=${SITE_MAN_PREFIX} \
SITE_PERL=${SITE_PERL_REL} \
SITE_ARCH=${SITE_ARCH_REL} \
Modified: head/lang/perl5.30/Makefile
==============================================================================
--- head/lang/perl5.30/Makefile Mon Mar 22 15:13:49 2021 (r568965)
+++ head/lang/perl5.30/Makefile Mon Mar 22 15:13:55 2021 (r568966)
@@ -80,11 +80,11 @@ CONFIGURE_ARGS+= \
PLIST_SUB= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
PERL_ARCH=${PERL_ARCH} \
- PERL_ARCH_regex=\b${PERL_ARCH}\b \
+ PERL_ARCH_regex=[[:<:]]${PERL_ARCH}[[:>:]] \
MAN1=${PERLMANPREFIX_REL}/man/man1 \
MAN3=${PERLMANPREFIX_REL}/man/man3 \
PERLMANPREFIX=${PERLMANPREFIX_REL} \
- PERLMANPREFIX_regex=${PERLMANPREFIX_REL}\b \
+ PERLMANPREFIX_regex=${PERLMANPREFIX_REL}[[:>:]] \
SITEMANPREFIX=${SITE_MAN_PREFIX} \
SITE_PERL=${SITE_PERL_REL} \
SITE_ARCH=${SITE_ARCH_REL} \
Modified: head/lang/perl5.32/Makefile
==============================================================================
--- head/lang/perl5.32/Makefile Mon Mar 22 15:13:49 2021 (r568965)
+++ head/lang/perl5.32/Makefile Mon Mar 22 15:13:55 2021 (r568966)
@@ -87,11 +87,11 @@ PLIST_SUB= ARCH_LIB=${_ARCH_LIB} \
MAN1=${PERLMANPREFIX_REL}/man/man1 \
MAN3=${PERLMANPREFIX_REL}/man/man3 \
PERL_ARCH=${PERL_ARCH} \
- PERL_ARCH_regex=\b${PERL_ARCH}\b \
+ PERL_ARCH_regex=[[:<:]]${PERL_ARCH}[[:>:]] \
PERL_VER=${PERL_VER} \
PERL_VERSION=${PERL_VERSION} \
PERLMANPREFIX=${PERLMANPREFIX_REL} \
- PERLMANPREFIX_regex=${PERLMANPREFIX_REL}\b \
+ PERLMANPREFIX_regex=${PERLMANPREFIX_REL}[[:>:]] \
PKGNAMESUFFIX=${PKGNAMESUFFIX} \
PRIV_LIB=${_PRIV_LIB} \
SITE_ARCH=${SITE_ARCH_REL} \
Modified: head/net/ceph14/Makefile
==============================================================================
--- head/net/ceph14/Makefile Mon Mar 22 15:13:49 2021 (r568965)
+++ head/net/ceph14/Makefile Mon Mar 22 15:13:55 2021 (r568966)
@@ -109,7 +109,7 @@ GROUPS= ceph
BINARY_ALIAS= sphinx-build=sphinx-build-${PYTHON_VER}
-# PLIST_SUB=CMAKE_BUILD_TYPE_regex="\bdebug\b"
+# PLIST_SUB=CMAKE_BUILD_TYPE_regex="[[:<:]]debug[[:>:]]"
.include <bsd.port.options.mk>
More information about the svn-ports-head
mailing list