diff options
| -rw-r--r-- | Mk/bsd.port.mk | 8 | ||||
| -rw-r--r-- | databases/postgresql13-server/Makefile | 4 | ||||
| -rw-r--r-- | lang/perl5-devel/Makefile | 4 | ||||
| -rw-r--r-- | lang/perl5.28/Makefile | 4 | ||||
| -rw-r--r-- | lang/perl5.30/Makefile | 4 | ||||
| -rw-r--r-- | lang/perl5.32/Makefile | 4 | ||||
| -rw-r--r-- | net/ceph14/Makefile | 2 |
7 files changed, 16 insertions, 14 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 diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile index 7441c077dd93..61361c2e2713 100644 --- a/databases/postgresql13-server/Makefile +++ b/databases/postgresql13-server/Makefile @@ -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} diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index e4be544fd9c2..dca39224f305 100644 --- a/lang/perl5-devel/Makefile +++ b/lang/perl5-devel/Makefile @@ -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} \ diff --git a/lang/perl5.28/Makefile b/lang/perl5.28/Makefile index 3a6649604e69..24c9bebb2aec 100644 --- a/lang/perl5.28/Makefile +++ b/lang/perl5.28/Makefile @@ -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} \ diff --git a/lang/perl5.30/Makefile b/lang/perl5.30/Makefile index e5b6da318958..dbbfa27f5f29 100644 --- a/lang/perl5.30/Makefile +++ b/lang/perl5.30/Makefile @@ -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} \ diff --git a/lang/perl5.32/Makefile b/lang/perl5.32/Makefile index af25187118bd..3e43d568b049 100644 --- a/lang/perl5.32/Makefile +++ b/lang/perl5.32/Makefile @@ -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} \ diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index a94f84420ede..4bd24ef3cc2a 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -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> |