pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk egrep -x 'RE'



details:   https://anonhg.NetBSD.org/pkgsrc/rev/abbacde4a503
branches:  trunk
changeset: 472673:abbacde4a503
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Sun Apr 11 20:17:37 2004 +0000

description:
egrep -x 'RE'

is the same as

egrep '^RE$'

Not all egrep's know the '-x' flag, so use the latter.

diffstat:

 mk/bsd.pkg.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r aafcc2542655 -r abbacde4a503 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Apr 11 20:00:30 2004 +0000
+++ b/mk/bsd.pkg.mk     Sun Apr 11 20:17:37 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1438 2004/04/07 14:26:50 tv Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1439 2004/04/11 20:17:37 jschauma Exp $
 #
 # This file is in the public domain.
 #
@@ -2976,7 +2976,7 @@
 do-shlib-handling:
 .if ${SHLIB_HANDLING} == "YES"
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       sos=`${EGREP} -h -x '.*/lib[^/]+\.so' ${PLIST} || ${TRUE}`;     \
+       sos=`${EGREP} -h '^.*/lib[^/]+\.so$$' ${PLIST} || ${TRUE}`;     \
        if [ "$$sos" != "" ]; then                                      \
                shlib_type=`${MAKE} ${MAKEFLAGS} show-shlib-type`;      \
                if [ "${SHLIB_PLIST_MODE}" = "0" ]; then                \
@@ -2991,7 +2991,7 @@
                        else                                            \
                                ${RM} ${PLIST}.tmp ;                    \
                        fi ;                                            \
-                       cnt=`${EGREP} -c -x '@exec[     ]*${LDCONFIG}' ${PLIST} || ${TRUE}`; \
+                       cnt=`${EGREP} -c '^@exec[       ]*${LDCONFIG}$$' ${PLIST} || ${TRUE}`; \
                        if [ "${SHLIB_PLIST_MODE}" = "1" ]; then        \
                                if [ $$cnt -eq 0 ]; then                \
                                        ${ECHO} "@exec ${LDCONFIG}" >> ${PLIST}; \



Home | Main Index | Thread Index | Old Index