diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2017-01-07 21:42:28 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2017-01-07 21:42:28 +0000 |
| commit | e730d999d3dd8305cbcbc35b739703175d0c2d68 (patch) | |
| tree | 34ed59c815a96dcd021876d917ebc81830b5dedf /math/convertall | |
| parent | 2660d9ede27778db5ed22c2ab82560b9533cdf86 (diff) | |
| download | ports-e730d999d3dd8305cbcbc35b739703175d0c2d68.tar.gz ports-e730d999d3dd8305cbcbc35b739703175d0c2d68.zip | |
Add more PLIST_SUB to Mk/Uses/python.mk
- Add PYTHON_PYOEXTENSION and PYTHON_SUFFIX
- Add PYTHON2 and PYTHON3
- Respect PYTHON_VERSION
- Rename PYOEXTENSION to PYTHON_PYOEXTENSION
This change would help:
- Build databases/postgresql*-plpython with Python 3
(It has PLIST issue since bsd.python.mk to Uses/python.mk transition)
- Simplify Makefile
PR: 205807
Differential Revision: https://reviews.FreeBSD.org/D4758
Exp-run by: antoine
Notes
Notes:
svn path=/head/; revision=430839
Diffstat (limited to 'math/convertall')
| -rw-r--r-- | math/convertall/Makefile | 9 | ||||
| -rw-r--r-- | math/convertall/pkg-plist | 36 |
2 files changed, 18 insertions, 27 deletions
diff --git a/math/convertall/Makefile b/math/convertall/Makefile index 4042d742a7ca..8453cbb651ee 100644 --- a/math/convertall/Makefile +++ b/math/convertall/Makefile @@ -41,15 +41,6 @@ do-install: .include <bsd.port.pre.mk> -.if ${PYTHON_REL} < 3500 -PYOEXTENSION= pyo -.else -PYOEXTENSION= opt-1.pyc -.endif - -PLIST_SUB+= PYTHON_SUFFIX="${PYTHON_SUFFIX}" \ - PYOEXTENSION="${PYOEXTENSION}" - .if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif diff --git a/math/convertall/pkg-plist b/math/convertall/pkg-plist index b327b8b66b39..a24361d4540d 100644 --- a/math/convertall/pkg-plist +++ b/math/convertall/pkg-plist @@ -1,40 +1,40 @@ bin/convertall %%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/finddlg.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/finddlg.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/finddlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/modbutton.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/modbutton.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/modbutton.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.pyc -%%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%% +%%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%DATADIR%%/cmdline.py %%DATADIR%%/convertall.pro %%DATADIR%%/convertall.py |