2 files changed, 29 insertions, 40 deletions

diff --git a/audio/gnome-music/Makefile b/audio/gnome-music/Makefile
index 3286df8c5c4a..70062870fabe 100644
--- a/audio/gnome-music/Makefile
+++ b/audio/gnome-music/Makefile
@@ -29,15 +29,4 @@ INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.Music.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/audio/gnome-music/pkg-plist b/audio/gnome-music/pkg-plist
index c41720c4547c..ed3743403d20 100644
--- a/audio/gnome-music/pkg-plist
+++ b/audio/gnome-music/pkg-plist
@@ -15,34 +15,34 @@ lib/gnome-music/girepository-1.0/Gd-1.0.typelib
 %%PYTHON_SITELIBDIR%%/gnomemusic/view.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/widgets.py
 %%PYTHON_SITELIBDIR%%/gnomemusic/window.py
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/albumArtCache.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/albumArtCache.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/application.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/application.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/grilo.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/grilo.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/mpris.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/mpris.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/notification.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/notification.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/player.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/player.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/playlists.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/playlists.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/query.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/query.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/searchbar.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/searchbar.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/toolbar.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/toolbar.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/view.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/view.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/widgets.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/widgets.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/window.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/window.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/albumArtCache.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/albumArtCache.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/grilo.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/grilo.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/mpris.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/mpris.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/notification.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/notification.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/player.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/player.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/playlists.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/playlists.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/query.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/query.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/searchbar.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/searchbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/toolbar.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/toolbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/view.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/view.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/window.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/window.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 man/man1/gnome-music.1.gz
 share/appdata/gnome-music.appdata.xml
 share/applications/gnome-music.desktop