Fix the glob pattern to match >= dependencies correctly.

1 files changed, 8 insertions, 11 deletions

diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 73eecbc1db6..856568f84a6 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.88 2004/02/17 14:49:17 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.89 2004/02/17 16:07:37 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -132,19 +132,16 @@ _BLNK_DEPMETHOD.${_pkg_}=	_BLNK_ADD_TO.BUILD_DEPENDS
 #
 # This next block of code sets _BLNK_DEPENDS.<pkg> to the strictest set of
 # dependencies it can derive from ${BUILDLINK_DEPENDS.<pkg>}.  It only
-# understands dependencies of the form foo>=1.0, and foo-1.0, and leaves
-# the other dependencies undisturbed.
+# understands dependencies of the form foo>=1.0, and leaves the other
+# dependencies undisturbed.
 #
-# The algorithm takes dependencies of the form foo{>=,-}1.0 and converts
-# them to foo-1.0.  It then compares this pkg name against each dependency
-# to see if it satisfies them all.  The key fact is the the strictest
+# The algorithm takes dependencies of the form foo>=1.0 and converts them
+# to foo-1.0.  It then compares this pkg name against each dependency to
+# see if it satisfies them all.  The key fact is the the strictest
 # dependency, when converted to a pkg name, will satisfy every dependency.
 #
-_BLNK_DEPENDS.${_pkg_}=		\
-	${BUILDLINK_DEPENDS.${_pkg_}:N[a-zA-Z0-9]*-[0-9]*:N[a-zA-Z0-9]*>=[0-9]*}
-_BLNK_GE_DEPENDS.${_pkg_}=	\
-	${BUILDLINK_DEPENDS.${_pkg_}:M[a-zA-Z0-9]*-[0-9]*}		\
-	${BUILDLINK_DEPENDS.${_pkg_}:M[a-zA-Z0-9]*>=[0-9]*}
+_BLNK_DEPENDS.${_pkg_}=		${BUILDLINK_DEPENDS.${_pkg_}:N*>=[0-9]*}
+_BLNK_GE_DEPENDS.${_pkg_}=	${BUILDLINK_DEPENDS.${_pkg_}:M*>=[0-9]*}
 _BLNK_STRICTEST_DEPENDS.${_pkg_}?=	none
 .      for _depend_ in ${_BLNK_GE_DEPENDS.${_pkg_}}
 .        for _dep2pkg_ in ${_depend_:S/>=/-/}