[pkgsrc/trunk]: pkgsrc/lang/python For bmake, empty() take a variable, and M ...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d375466ef7ec
branches:  trunk
changeset: 554741:d375466ef7ec
user:      obache <obache%pkgsrc.org@localhost>
date:      Thu Feb 19 12:24:59 2009 +0000

description:
For bmake, empty() take a variable, and M modifier only accept the standard
shell wildcard characters.

diffstat:

 lang/python/extension.mk |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r 1cf1405bf1e3 -r d375466ef7ec lang/python/extension.mk
--- a/lang/python/extension.mk  Thu Feb 19 12:15:15 2009 +0000
+++ b/lang/python/extension.mk  Thu Feb 19 12:24:59 2009 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: extension.mk,v 1.21 2008/12/23 15:39:07 abs Exp $
+# $NetBSD: extension.mk,v 1.22 2009/02/19 12:24:59 obache Exp $
 
 # derive a python version from the package name if possible
 # optionally handled quoted package names
-.if defined(PKGNAME_REQD) && !empty(${PKGNAME_REQD:Mpy([0-9][0-9])-.*})
+.if defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9]-*) || \
+    defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*)
 PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
-.elif defined(PKGNAME_OLD) && !empty(${PKGNAME_OLD:Mpy([0-9][0-9])-.*})
+.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \
+      defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*)
 PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
 .endif