summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2008-12-23 15:39:07 +0000
committerabs <abs@pkgsrc.org>2008-12-23 15:39:07 +0000
commitfb0d9752b1e7c200d1f3a7753962cd2a68ad4c00 (patch)
treef3a948efd5b2682a2e4387377e5fc9a3ff2f530d /lang
parent7980055d5dbd71568f84e1edc8bf91c68b7f8a8c (diff)
downloadpkgsrc-fb0d9752b1e7c200d1f3a7753962cd2a68ad4c00.tar.gz
Only derive PYTHON_VERSION_REQD from PKGNAME_REQD or PKGNAME_OLD if they
match py([0-9][0-9])-.*. Fixes breakage when building gnome which then tries to build hamster-applet and chokes due to PYPKGPREFIX ending up undefined.
Diffstat (limited to 'lang')
-rw-r--r--lang/python/extension.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/lang/python/extension.mk b/lang/python/extension.mk
index 5ddcbe41249..0afeb6475f9 100644
--- a/lang/python/extension.mk
+++ b/lang/python/extension.mk
@@ -1,10 +1,10 @@
-# $NetBSD: extension.mk,v 1.20 2008/10/06 14:41:50 joerg Exp $
+# $NetBSD: extension.mk,v 1.21 2008/12/23 15:39:07 abs Exp $
# derive a python version from the package name if possible
# optionally handled quoted package names
-.if defined(PKGNAME_REQD)
+.if defined(PKGNAME_REQD) && !empty(${PKGNAME_REQD:Mpy([0-9][0-9])-.*})
PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
-.elif defined(PKGNAME_OLD)
+.elif defined(PKGNAME_OLD) && !empty(${PKGNAME_OLD:Mpy([0-9][0-9])-.*})
PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
.endif