Page MenuHomeFreeBSD
Files F147650219

D4758.id11864.diff
No OneTemporary
Actions

D4758.id11864.diff
View Options

Index: Mk/Uses/python.mk
===================================================================
--- Mk/Uses/python.mk
+++ Mk/Uses/python.mk
@@ -193,10 +193,16 @@
# PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;}
# PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;}
# PYTHON_PLATFORM=${PYTHON_PLATFORM}
+# PYTHON_PYOEXTENSION=${PYTHON_PYOEXTENSION}
# PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
+# PYTHON_SUFFIX=${PYTHON_SUFFIX}
# PYTHON_VER=${PYTHON_VER}
# PYTHON_VERSION=${PYTHON_VERSION}
#
+# and PYTHON2 and PYTHON3 will be set according to the Python version:
+#
+# PYTHON2="" PYTHON3="@comment " for Python 2.x
+# PYTHON2="@comment " PYTHON3="" for Python 3.x
#
# Deprecated variables, which exist for compatibility and will be removed
# soon:
@@ -430,6 +436,13 @@
# Used for recording the installed files.
_PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp
+# PEP 0488 (https://www.python.org/dev/peps/pep-0488/)
+.if ${PYTHON_REL} < 3500
+PYTHON_PYOEXTENSION= pyo
+.else
+PYTHON_PYOEXTENSION= opt-1.pyc
+.endif
+
# Ports bound to a certain python version SHOULD
# - use the PYTHON_PKGNAMEPREFIX
# - use directories using the PYTHON_PKGNAMEPREFIX
@@ -527,11 +540,6 @@
# of TMPPLIST that end with .py[co], so that they conform
# to PEP 3147 (see http://www.python.org/dev/peps/pep-3147/)
PYMAGICTAG= ${PYTHON_CMD} -c 'import imp; print(imp.get_tag())'
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
add-plist-post:
@${AWK} '\
/\.py[co]$$/ && !($$0 ~ "/" pc "/") {id = match($$0, /\/[^\/]+\.py[co]$$/); if (id != 0) {d = substr($$0, 1, RSTART - 1); dirs[d] = 1}; sub(/\.pyc$$/, "." mt "&"); sub(/\.pyo$$/, "." mt "." pyo); sub(/[^\/]+\.py[co]$$/, pc "/&"); print; next} \
@@ -539,7 +547,7 @@
/^@dirrmtry / {d = substr($$0, 11); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
{print} \
' \
- pc="__pycache__" mt="$$(${PYMAGICTAG})" pyo="${PYOEXTENSION}" \
+ pc="__pycache__" mt="$$(${PYMAGICTAG})" pyo="${PYTHON_PYOEXTENSION}" \
${TMPPLIST} > ${TMPPLIST}.pyc_tmp
@${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST}
.endif # ${PYTHON_REL} >= 3200 && defined(_PYTHON_FEATURE_PY3KPLIST)
@@ -588,9 +596,16 @@
PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} \
PYTHON_PLATFORM=${PYTHON_PLATFORM} \
+ PYTHON_PYOEXTENSION=${PYTHON_PYOEXTENSION} \
PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
+ PYTHON_SUFFIX=${PYTHON_SUFFIX} \
PYTHON_VER=${PYTHON_VER} \
- PYTHON_VERSION=python${_PYTHON_VERSION}
+ PYTHON_VERSION=${PYTHON_VERSION}
+.if ${PYTHON_REL} < 3000
+PLIST_SUB+= PYTHON2="" PYTHON3="@comment "
+.else
+PLIST_SUB+= PYTHON2="@comment " PYTHON3=""
+.endif
_USES_POST+= python
.endif # _INCLUDE_USES_PYTHON_MK
Index: databases/postgresql90-plpython/Makefile
===================================================================
--- databases/postgresql90-plpython/Makefile
+++ databases/postgresql90-plpython/Makefile
@@ -18,12 +18,6 @@
CONFIGURE_ARGS= --with-python
COMPONENT= -plpython
-.if defined(PYTHON_VER) && ${PYTHON_VER:R} == 3
-PLIST_SUB+= PYTHON2="@comment " PYTHON3=""
-.else
-PLIST_SUB+= PYTHON2="" PYTHON3="@comment "
-.endif
-
BUILD_DIRS= src/backend src/pl/plpython
INSTALL_DIRS= src/pl/plpython
SLAVE_ONLY= yes
Index: x11/xcb-proto/Makefile
===================================================================
--- x11/xcb-proto/Makefile
+++ x11/xcb-proto/Makefile
@@ -15,12 +15,4 @@
DATADIR= ${PREFIX}/share/xcb
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_MAJOR_VER} == 3
-PLIST_SUB+= PYTHON_SUFFIX=${PYTHON_SUFFIX} PY3="" PY2="@comment "
-.else
-PLIST_SUB+= PY2="" PY3="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: x11/xcb-proto/pkg-plist
===================================================================
--- x11/xcb-proto/pkg-plist
+++ x11/xcb-proto/pkg-plist
@@ -37,27 +37,27 @@
%%PYTHON_SITELIBDIR%%/xcbgen/matcher.py
%%PYTHON_SITELIBDIR%%/xcbgen/state.py
%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.py
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/error.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/state.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/error.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/state.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes.cpython-%%PYTHON_SUFFIX%%.pyo
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyc
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcbgen/error.pyc
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyc
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyc
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcbgen/state.pyc
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyc
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyo
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcbgen/error.pyo
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyo
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyo
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcbgen/state.pyo
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyo
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 13, 2:33 PM (4 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29612849
Default Alt Text
D4758.id11864.diff (7 KB)

Event Timeline