CVS commit: pkgsrc/lang/python

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Dec 14 13:09:10 UTC 2018

Modified Files:
        pkgsrc/lang/python: extension.mk

Log Message:
extension.mk: remove PY_PEP3147, mention correct patch, clean-up


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/lang/python/extension.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python/extension.mk
diff -u pkgsrc/lang/python/extension.mk:1.54 pkgsrc/lang/python/extension.mk:1.55
--- pkgsrc/lang/python/extension.mk:1.54        Sun Sep  2 21:53:03 2018
+++ pkgsrc/lang/python/extension.mk     Fri Dec 14 13:09:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.54 2018/09/02 21:53:03 wiz Exp $
+# $NetBSD: extension.mk,v 1.55 2018/12/14 13:09:10 adam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -16,22 +16,22 @@
 
 PYSETUP?=              setup.py
 PYSETUPBUILDTARGET?=   build
-PYSETUPBUILDARGS?=     #empty
+PYSETUPBUILDARGS?=     # empty
 # Python 3.5+ supports parallel building
-.if defined(MAKE_JOBS) && ${_PYTHON_VERSION} != 27 && ${_PYTHON_VERSION} != 34
-.  if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
+.  if defined(MAKE_JOBS) && ${_PYTHON_VERSION} != 27 && ${_PYTHON_VERSION} != 34
+.    if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
 PYSETUPBUILDARGS+=     -j${MAKE_JOBS}
+.    endif
 .  endif
-.endif
-PYSETUPARGS?=          #empty
-PYSETUPINSTALLARGS?=   #empty
+PYSETUPARGS?=          # empty
+PYSETUPINSTALLARGS?=   # empty
 PYSETUPOPTARGS?=       -c -O1
 _PYSETUPINSTALLARGS=   ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
 _PYSETUPINSTALLARGS+=  --root=${DESTDIR:Q}
 PY_PATCHPLIST?=                yes
 PYSETUPTESTTARGET?=    test
-PYSETUPTESTARGS?=      #empty
-PYSETUPSUBDIR?=                #empty
+PYSETUPTESTARGS?=      # empty
+PYSETUPSUBDIR?=                # empty
 
 do-build:
        (cd ${WRKSRC}/${PYSETUPSUBDIR} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} \
@@ -40,6 +40,7 @@ do-build:
 do-install:
        (cd ${WRKSRC}/${PYSETUPSUBDIR} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
         ${PYTHONBIN} ${PYSETUP} ${PYSETUPARGS} "install" ${_PYSETUPINSTALLARGS})
+
 .  if !target(do-test) && !(defined(TEST_TARGET) && !empty(TEST_TARGET))
 do-test:
        (cd ${WRKSRC}/${PYSETUPSUBDIR} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} \
@@ -56,7 +57,7 @@ do-test:
 # appears to be that creating egg info files was new in Python 2.5.
 PY_NO_EGG?=            yes
 .if !empty(PY_NO_EGG:M[yY][eE][sS])
-# see python*/patches/patch-av
+# see python*/patches/patch-Lib_distutils_command_install.py
 INSTALL_ENV+=          PKGSRC_PYTHON_NO_EGG=defined
 .endif
 
@@ -71,9 +72,6 @@ FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFI
 # prepare Python>=3.2 bytecode file location change
 # http://www.python.org/dev/peps/pep-3147/
 .if empty(_PYTHON_VERSION:M2?)
-PY_PEP3147?=           yes
-.endif
-.if defined(PY_PEP3147) && !empty(PY_PEP3147:M[yY][eE][sS])
 PLIST_AWK+=            -f ${PKGSRCDIR}/lang/python/plist-python.awk
 PLIST_AWK_ENV+=                PYVERS="${PYVERSSUFFIX:S/.//}"
 PRINT_PLIST_AWK+=      /^[^@]/ && /[^\/]+\.py[co]$$/ {