Wed May 4 10:01:02 2011 UTC ()
also put PYLIB in PLIST_SUBST, a part of PR#44826.


(obache)
diff -r1.28 -r1.29 pkgsrc/lang/python/extension.mk
cvs diff -r1.28 -r1.29 pkgsrc/lang/python/extension.mk (expand / switch to unified diff)

--- pkgsrc/lang/python/extension.mk 2010/07/24 00:57:17 1.28
+++ pkgsrc/lang/python/extension.mk 2011/05/04 10:01:02 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: extension.mk,v 1.28 2010/07/24 00:57:17 gdt Exp $ 1# $NetBSD: extension.mk,v 1.29 2011/05/04 10:01:02 obache Exp $
2 2
3.include "../../lang/python/pyversion.mk" 3.include "../../lang/python/pyversion.mk"
4 4
5# Packages that are a non-egg distutils extension should set 5# Packages that are a non-egg distutils extension should set
6# PYDISTUTILSPKG=YES and include this mk file. 6# PYDISTUTILSPKG=YES and include this mk file.
7 7
8# This mk fragment is included to handle packages that create 8# This mk fragment is included to handle packages that create
9# extensions to python, which by definition are those that place files 9# extensions to python, which by definition are those that place files
10# in ${PYSITELIB}. Extensions can be implemented via setuptools as 10# in ${PYSITELIB}. Extensions can be implemented via setuptools as
11# eggs (see egg.mk), via distutils (confusing, with an egg-info file, 11# eggs (see egg.mk), via distutils (confusing, with an egg-info file,
12# even though they are not eggs), or via more ad hocs methods. 12# even though they are not eggs), or via more ad hocs methods.
13 13
14.if defined(PYDISTUTILSPKG) 14.if defined(PYDISTUTILSPKG)
@@ -39,15 +39,15 @@ do-install: @@ -39,15 +39,15 @@ do-install:
39# PY_NO_EGG suppress the installation of the egg info file (and 39# PY_NO_EGG suppress the installation of the egg info file (and
40# therefore its inclusion in the package). Python practice is be to 40# therefore its inclusion in the package). Python practice is be to
41# use these files to let 'require' verify that python distributions 41# use these files to let 'require' verify that python distributions
42# are present, and therefore the default value of PY_NO_EGG=yes causes 42# are present, and therefore the default value of PY_NO_EGG=yes causes
43# pkgsrc not to conform to python norms. The reason for this behavior 43# pkgsrc not to conform to python norms. The reason for this behavior
44# appears to be that creating egg info files was new in Python 2.5. 44# appears to be that creating egg info files was new in Python 2.5.
45PY_NO_EGG?= yes 45PY_NO_EGG?= yes
46.if !empty(PY_NO_EGG:M[yY][eE][sS]) 46.if !empty(PY_NO_EGG:M[yY][eE][sS])
47# see python25/patches/patch-av 47# see python25/patches/patch-av
48INSTALL_ENV+= PKGSRC_PYTHON_NO_EGG=defined 48INSTALL_ENV+= PKGSRC_PYTHON_NO_EGG=defined
49.endif 49.endif
50 50
51.if defined(PY_PATCHPLIST) 51.if defined(PY_PATCHPLIST)
52PLIST_SUBST+= PYINC=${PYINC} PYSITELIB=${PYSITELIB} 52PLIST_SUBST+= PYINC=${PYINC} PYLIB=${PYLIB} PYSITELIB=${PYSITELIB}
53.endif 53.endif