pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk fix bug introduced in 1.1569: use ${GREP} instead o...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/05dc92c89d9c
branches:  trunk
changeset: 489367:05dc92c89d9c
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Feb 20 06:02:06 2005 +0000

description:
fix bug introduced in 1.1569: use ${GREP} instead of 'grep' and not
all grep(1)s support grepping for empty string. `${GREP} .' instead.

diffstat:

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

diffs (18 lines):

diff -r 08211b7610d5 -r 05dc92c89d9c mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Feb 20 05:55:51 2005 +0000
+++ b/mk/bsd.pkg.mk     Sun Feb 20 06:02:06 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1591 2005/02/19 04:25:31 grant Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1592 2005/02/20 06:02:06 grant Exp $
 #
 # This file is in the public domain.
 #
@@ -935,7 +935,7 @@
 .  for def in ${EVAL_PREFIX}
 .    if !defined(${def:C/=.*$//})
 ${def:C/=.*$//}_DEFAULT?=${LOCALBASE}
-_${def:C/=.*$//}_CMD=  ${PKG_INFO} -qp ${def:C/^.*=//} 2>/dev/null | ${AWK} '{ print $$2; exit }' | grep '' || ${ECHO} ${${def:C/=.*$//}_DEFAULT}
+_${def:C/=.*$//}_CMD=  ${PKG_INFO} -qp ${def:C/^.*=//} 2>/dev/null | ${AWK} '{ print $$2; exit }' | ${GREP} . || ${ECHO} ${${def:C/=.*$//}_DEFAULT}
 ${def:C/=.*$//}=       ${_${def:C/=.*$//}_CMD:sh}
 MAKEFLAGS+=            ${def:C/=.*//}=${_${def:C/=.*$//}_CMD:sh}
 .    endif



Home | Main Index | Thread Index | Old Index