Sat Jan 25 10:45:50 2014 UTC ()
Remove support for PYTHON_PATCH_SCRIPTS; use REPLACE_PYTHON.


(wiz)
diff -r1.10 -r1.11 pkgsrc/lang/python/application.mk

cvs diff -r1.10 -r1.11 pkgsrc/lang/python/application.mk (expand / switch to unified diff)

--- pkgsrc/lang/python/application.mk 2010/07/24 18:12:11 1.10
+++ pkgsrc/lang/python/application.mk 2014/01/25 10:45:50 1.11
@@ -1,28 +1,25 @@ @@ -1,28 +1,25 @@
1# $NetBSD: application.mk,v 1.10 2010/07/24 18:12:11 gdt Exp $ 1# $NetBSD: application.mk,v 1.11 2014/01/25 10:45:50 wiz Exp $
2# 2#
3# Replace the #! interpreter for Python scripts. 3# Replace the #! interpreter for Python scripts.
4# 4#
5# This mk fragment should be included in all python packages that 5# This mk fragment should be included in all python packages that
6# install python scripts, or at least those that don't use setuptools 6# install python scripts, or at least those that don't use setuptools
7# or some other mechanism to set the real path. Specifically, it is 7# or some other mechanism to set the real path. Specifically, it is
8# reasonable to include both egg.mk and application.mk. 8# reasonable to include both egg.mk and application.mk.
9# 9#
10# Package-settable variables: 10# Package-settable variables:
11# 11#
12# REPLACE_PYTHON 12# REPLACE_PYTHON
13# A list of Python scripts to be installed, relative to ${WRKSRC}. 13# A list of Python scripts to be installed, relative to ${WRKSRC}.
14# 14#
15# PYTHON_PATCH_SCRIPTS 
16# The same as REPLACE_PYTHON. 
17# 
18# Keywords: python 15# Keywords: python
19# 16#
20 17
21.include "../../lang/python/pyversion.mk" 18.include "../../lang/python/pyversion.mk"
22 19
23.if defined(PYTHON_PATCH_SCRIPTS) || defined(REPLACE_PYTHON) 20.if defined(REPLACE_PYTHON)
24REPLACE_INTERPRETER+= python 21REPLACE_INTERPRETER+= python
25REPLACE.python.old= .*python[^ ]* 22REPLACE.python.old= .*python[^ ]*
26REPLACE.python.new= ${PYTHONBIN} 23REPLACE.python.new= ${PYTHONBIN}
27REPLACE_FILES.python= ${PYTHON_PATCH_SCRIPTS} ${REPLACE_PYTHON} 24REPLACE_FILES.python= ${REPLACE_PYTHON}
28.endif 25.endif