*/*: sync with upstream

Taken from: FreeBSD
opnsense2 · Nov 19, 2015 · 3d5c58d · 3d5c58d
1 parent a60f623
commit 3d5c58d
Show file tree

Hide file tree

Showing 227 changed files with 2,531 additions and 2,247 deletions.
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
@@ -28,6 +28,15 @@ SHEBANG_FILES=	plugins/ipython_view.py
 
 GLIB_SCHEMAS=	org.a11y.Accerciser.gschema.xml
 
-PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//}
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.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>
diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist
@@ -14,46 +14,46 @@ man/man1/accerciser.1.gz
 %%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/view.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%DATADIR%%/pixmaps/hicolor/22x22/acceleratorlabel.png
 %%DATADIR%%/pixmaps/hicolor/22x22/alert.png
 %%DATADIR%%/pixmaps/hicolor/22x22/animation.png

diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
@@ -32,10 +32,19 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    	${WRKSRC}/src/orca/orca_i18n.py
 
-.include <bsd.port.mk>
+.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>