pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Extend find-prefix.mk so that we can specify a pack...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2aa2503ae594
branches:  trunk
changeset: 503745:2aa2503ae594
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Nov 28 05:54:17 2005 +0000

description:
Extend find-prefix.mk so that we can specify a package wildcard instead
of just ${PKGBASE}, e.g. M4DIR=m4>=1.0 will set M4DIR to the installation
prefix of m4 if it matches "m4>=1.0", otherwise it will set M4DIR to
${M4DIR_DEFAULT}.

diffstat:

 mk/find-prefix.mk |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r def84be62b82 -r 2aa2503ae594 mk/find-prefix.mk
--- a/mk/find-prefix.mk Mon Nov 28 05:39:20 2005 +0000
+++ b/mk/find-prefix.mk Mon Nov 28 05:54:17 2005 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: find-prefix.mk,v 1.3 2005/05/13 23:37:54 jlam Exp $
+# $NetBSD: find-prefix.mk,v 1.4 2005/11/28 05:54:17 jlam Exp $
 #
 # This is a "subroutine" that can be included to find the installation
 # prefix of a package.
 #
-# The input variable is FIND_PREFIX, which is a list of VARNAME=<package>
+# The input variable is FIND_PREFIX, which is a list of VARNAME=<pattern>
 # pairs, where "VARNAME" is the variable that will be set to the
-# installation prefix for the package, and <package> is the ${PKGNAME}
-# for the package.
+# installation prefix for the package, and <pattern> is a package
+# wildcard pattern used to match the installed package (see pkg_info(8)).
 #
 # An example use is:
 #
@@ -19,7 +19,7 @@
 .  if !defined(${_def_:C/=.*$//})
 ${_def_:C/=.*$//}_DEFAULT?=    ${LOCALBASE}
 _${_def_:C/=.*$//}_cmd=                \
-       ${PKG_INFO} -qp ${_def_:C/^.*=//} 2>/dev/null |                 \
+       ${PKG_INFO} -qp ${_def_:C/^[^=]*=//:Q} 2>/dev/null |            \
        { read cmd arg;                                                 \
          case "$$arg" in                                               \
          "")   ${ECHO} ${${_def_:C/=.*$//}_DEFAULT:Q} ;;               \



Home | Main Index | Thread Index | Old Index