2 files changed, 46 insertions, 37 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 16252e102400..36218998e25b 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -47,10 +47,19 @@ GLIB_SCHEMAS=	org.gnome.gedit.enums.xml \
 		org.gnome.gedit.plugins.time.enums.xml \
 		org.gnome.gedit.plugins.time.gschema.xml
 
-PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//}
+.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/.//}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|=python|=${PYTHON_CMD}|g' \
 		${WRKSRC}/py-compile
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index 982e25d3a0c5..fa1fe18349a3 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -23,25 +23,25 @@ lib/gedit/plugins/docinfo.plugin
 lib/gedit/plugins/externaltools.plugin
 lib/gedit/plugins/externaltools/__init__.py
 lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/externaltools/appactivatable.py
 lib/gedit/plugins/externaltools/capture.py
 lib/gedit/plugins/externaltools/filelookup.py
@@ -62,61 +62,61 @@ lib/gedit/plugins/modelines.plugin
 lib/gedit/plugins/pythonconsole.plugin
 lib/gedit/plugins/pythonconsole/__init__.py
 lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/pythonconsole/config.py
 lib/gedit/plugins/pythonconsole/console.py
 lib/gedit/plugins/quickopen.plugin
 lib/gedit/plugins/quickopen/__init__.py
 lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/quickopen/popup.py
 lib/gedit/plugins/quickopen/virtualdirs.py
 lib/gedit/plugins/snippets.plugin
 lib/gedit/plugins/snippets/__init__.py
 lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/snippets/appactivatable.py
 lib/gedit/plugins/snippets/completion.py
 lib/gedit/plugins/snippets/document.py
@@ -139,7 +139,7 @@ lib/gedit/plugins/spell.plugin
 lib/gedit/plugins/time.plugin
 %%PYTHON_SITELIBDIR%%/gi/overrides/Gedit.py
 %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYVER%%.%%PYOEXTENSION%%
 libdata/pkgconfig/gedit.pc
 libexec/gedit/gedit-bugreport.sh
 man/man1/gedit.1.gz