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

2 files changed, 38 insertions, 48 deletions

diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index df37ce36e325..71b78d5ffce1 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -18,6 +18,7 @@ BUILD_DEPENDS=	gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas
 RUN_DEPENDS=	gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas \
 		at-spi2-core>=2.1.5:accessibility/at-spi2-core
 
+NO_ARCH=	yes
 USES=		gettext gmake pkgconfig python:3 shebangfix tar:xz
 USE_GNOME=	gtk30 intlhack py3gobject3
 INSTALLS_ICONS=	yes
@@ -28,15 +29,4 @@ SHEBANG_FILES=	plugins/ipython_view.py
 
 GLIB_SCHEMAS=	org.a11y.Accerciser.gschema.xml
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION=	pyo
-.else
-PYOEXTENSION=	opt-1.pyc
-.endif
-
-PLIST_SUB+=	PYOEXTENSION=${PYOEXTENSION} \
-		PYVER=${PYTHON_VER:S/.//}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist
index a64a6e73cbde..7c099c411e6a 100644
--- a/accessibility/accerciser/pkg-plist
+++ b/accessibility/accerciser/pkg-plist
@@ -13,47 +13,47 @@ man/man1/accerciser.1.gz
 %%PYTHON_SITELIBDIR%%/accerciser/prefs_dialog.py
 %%PYTHON_SITELIBDIR%%/accerciser/tools.py
 %%PYTHON_SITELIBDIR%%/accerciser/ui_manager.py
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/accerciser/plugin/__init__.py
 %%PYTHON_SITELIBDIR%%/accerciser/plugin/base_plugin.py
 %%PYTHON_SITELIBDIR%%/accerciser/plugin/message.py
 %%PYTHON_SITELIBDIR%%/accerciser/plugin/plugin_manager.py
 %%PYTHON_SITELIBDIR%%/accerciser/plugin/view.py
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/base_plugin.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/base_plugin.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/message.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/message.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/plugin_manager.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/plugin_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/view.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/view.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/base_plugin.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/base_plugin.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/plugin_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/plugin_manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/view.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/view.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%DATADIR%%/pixmaps/hicolor/22x22/acceleratorlabel.png
 %%DATADIR%%/pixmaps/hicolor/22x22/alert.png
 %%DATADIR%%/pixmaps/hicolor/22x22/animation.png