From d9db80318aad5143b93bb0035a3fbb82548b64bd Mon Sep 17 00:00:00 2001 From: hubertf Date: Sat, 18 Nov 2000 21:55:28 +0000 Subject: print-PLIST: enclose s/// commands in single quotes, and protect '.' in OS_VERSION, so that "135" does NOT get replaced by "${OS_VERSION}". Detected in kdetoys-2.0 --- mk/bsd.pkg.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'mk') diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 61038005d61..bbbf27d53e9 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.609 2000/11/18 21:53:31 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.610 2000/11/18 21:55:28 hubertf Exp $ # # This file is in the public domain. # @@ -3020,15 +3020,15 @@ print-PLIST: esac ; \ ${FIND} ${PREFIX}/. -newer ${EXTRACT_COOKIE} \! -type d \ | ${SED} \ - -e s@${PREFIX}/./@@ \ - -e s@${OPSYS}@\$${OPSYS}@ \ - -e s@${OS_VERSION}@\$${OS_VERSION}@ \ - -e s@${MACHINE_ARCH}@\$${MACHINE_ARCH}@ \ - -e s@${MACHINE_GNU_ARCH}@\$${MACHINE_GNU_ARCH}@ \ - -e s@${MACHINE_GNU_PLATFORM}@\$${MACHINE_GNU_PLATFORM}@ \ - -e s@${LOWER_VENDOR}@\$${LOWER_VENDOR}@ \ - -e s@${LOWER_OPSYS}@\$${LOWER_OPSYS}@ \ - -e s@${PKGNAME}@\$${PKGNAME}@ \ + -e 's@${PREFIX}/./@@' \ + -e 's@${OPSYS}@\$${OPSYS}@' \ + -e 's@${OS_VERSION:S/./\./}@\$${OS_VERSION}@' \ + -e 's@${MACHINE_ARCH}@\$${MACHINE_ARCH}@' \ + -e 's@${MACHINE_GNU_ARCH}@\$${MACHINE_GNU_ARCH}@' \ + -e 's@${MACHINE_GNU_PLATFORM}@\$${MACHINE_GNU_PLATFORM}@' \ + -e 's@${LOWER_VENDOR}@\$${LOWER_VENDOR}@' \ + -e 's@${LOWER_OPSYS}@\$${LOWER_OPSYS}@' \ + -e 's@${PKGNAME}@\$${PKGNAME}@' \ $$RMELFLIBS \ | sort \ | ${AWK} ' \ -- cgit v1.2.3