summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorobache <obache>2009-02-19 12:24:59 +0000
committerobache <obache>2009-02-19 12:24:59 +0000
commitf4a702863459859cac2da649a321801f2579e24b (patch)
tree7851cb6606d8b4471b58cc5bdb56e0906b795428 /lang
parent375b163e9be632c8cf7984bf8bfd6fb3048ca858 (diff)
downloadpkgsrc-f4a702863459859cac2da649a321801f2579e24b.tar.gz
For bmake, empty() take a variable, and M modifier only accept the standard
shell wildcard characters.
Diffstat (limited to 'lang')
-rw-r--r--lang/python/extension.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/lang/python/extension.mk b/lang/python/extension.mk
index 0afeb6475f9..1adb46f40e0 100644
--- a/lang/python/extension.mk
+++ b/lang/python/extension.mk
@@ -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