summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authortron <tron>1999-09-24 22:20:30 +0000
committertron <tron>1999-09-24 22:20:30 +0000
commit9596116dfedc19d5e99c0d433c375df2846816c2 (patch)
tree10a86c54d44fd1197655156f63ac96807d30ea32 /mk
parentce979a787d3dd480dcc935238bc7d858bdc59774 (diff)
downloadpkgsrc-9596116dfedc19d5e99c0d433c375df2846816c2.tar.gz
Replace the call to "sed" used to modify the package list during automatic
ELF shared object handling by a call to "awk" to avoid clobbering exclamation marks in the package list.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 0e6650d5065..d88e0c98823 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.343 1999/09/24 17:13:31 tron Exp $
+# $NetBSD: bsd.pkg.mk,v 1.344 1999/09/24 22:20:30 tron Exp $
#
# This file is in the public domain.
#
@@ -1360,14 +1360,14 @@ root-install:
so0=`${ECHO} $$so1 | ${SED} -e 's|\.[0-9]*$$||'`; \
cnt=`${EGREP} -c -x "$$so0" ${PLIST} || ${TRUE}`; \
if [ $$cnt -eq 0 ]; then \
- ${SED} -e "s|^$$so3$$|&!$$so0|" -e 'y|!|\n|' ${PLIST} > ${PLIST}.tmp && ${MV} ${PLIST}.tmp ${PLIST}; \
+ ${AWK} "{sub(\"^$$so3$$\",\"$$so3\n$$so0\"); print}" ${PLIST} > ${PLIST}.tmp && ${MV} ${PLIST}.tmp ${PLIST}; \
${ECHO_MSG} "${LN} -s $$so2 ${PREFIX}/$$so0"; \
${RM} -f ${PREFIX}/$$so0; \
${LN} -s $$so2 ${PREFIX}/$$so0; \
fi; \
cnt=`${EGREP} -c -x "$$so1" ${PLIST} || ${TRUE}`; \
if [ $$cnt -eq 0 ]; then \
- ${SED} -e "s|^$$so3$$|&!$$so1|" -e 'y|!|\n|' ${PLIST} > ${PLIST}.tmp && ${MV} ${PLIST}.tmp ${PLIST}; \
+ ${AWK} "{sub(\"^$$so3$$\",\"$$so3\n$$so1\"); print}" ${PLIST} > ${PLIST}.tmp && ${MV} ${PLIST}.tmp ${PLIST}; \
${ECHO_MSG} "${LN} -s $$so2 ${PREFIX}/$$so1"; \
${RM} -f ${PREFIX}/$$so1; \
${LN} -s $$so2 ${PREFIX}/$$so1; \