--- Makefile (revision 423422) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= rhythmbox PORTVERSION= 3.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -25,8 +25,8 @@ libsecret-1.so:security/libsecret \ libtdb.so:databases/tdb -USES= desktop-file-utils gettext gmake gnome libtool pathfix \ - pkgconfig tar:xz +USES= desktop-file-utils gettext gmake gnome libtool localbase \ + pathfix pkgconfig tar:xz USE_GNOME= intlhack gnomeprefix gtk30 introspection:build \ py3gobject3 USE_XORG= ice xproto @@ -33,7 +33,7 @@ GNU_CONFIGURE= yes USE_GSTREAMER1= flac lame jpeg cdparanoia vorbis CONFIGURE_ARGS= --enable-vala \ - --disable-gudev \ + --without-gudev \ --without-webkit \ --enable-visualizer=no \ --disable-browser-plugin \ @@ -40,12 +40,8 @@ --with-libsecret=yes INSTALLS_ICONS= yes USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -PLIST_SUB+= PYTVER=${PYTHON_VER:S/.//} - GLIB_SCHEMAS= org.gnome.rhythmbox.gschema.xml OPTIONS_SUB= yes @@ -52,7 +48,7 @@ OPTIONS_DEFINE= BRASERO DAAP GRILO IPOD NOTIFY PYTHON LIRC MTP OPTIONS_DEFAULT=BRASERO NOTIFY PYTHON BRASERO_DESC= Brasero disc burning support -BRASERO_CONFIGURE_ENABLE=brasero +BRASERO_CONFIGURE_WITH=brasero BRASERO_LIB_DEPENDS= libbrasero-media3.so:sysutils/brasero DAAP_DESC= DAAP support DAAP_CONFIGURE_ENABLE= daap @@ -66,14 +62,14 @@ GRILO_RUN_DEPENDS= grilo-plugins>=0:net/grilo-plugins LIRC_CONFIGURE_ENABLE= lirc LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc -NOTIFY_CONFIGURE_ENABLE= notify +NOTIFY_CONFIGURE_ENABLE= libnotify NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify MTP_CONFIGURE_WITH= mtp MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp \ libhal.so:sysutils/hal PYTHON_CONFIGURE_ENABLE= python -PYTHON_USES= python:3 -PYTHON_USE= PYTVER=${PYTHON_VER:S/.//} +PYTHON_USES= python:3.3+ +PYTHON_PLIST_SUB+= PYTVER=${PYTHON_SUFFIX} PYOEXTENSION=${PYOEXTENSION} PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas # context plugin # webkit is for the context plugin, which is broken because @@ -82,6 +78,14 @@ #WEBKIT_CONFIGURE_WITH= webkit #WEBKIT_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3 +.include + +.if ${PYTHON_REL} < 3500 +PYOEXTENSION= pyo +.else +PYOEXTENSION= opt-1.pyc +.endif + post-patch: @${REINPLACE_CMD} -e 's|{MOZILLA_PLUGINDIR|{MOZILLA_PLUGINDIR}|g' \ ${WRKSRC}/configure @@ -90,4 +94,4 @@ post-install: @${RM} -rf ${STAGEDIR}${PREFIX}/lib/rhythmbox/plugins/rbzeitgeist -.include +.include --- pkg-plist (revision 423422) +++ pkg-plist (working copy) @@ -89,19 +89,19 @@ %%PYTHON%%lib/rhythmbox/plugins/artsearch/oldcache.py %%PYTHON%%lib/rhythmbox/plugins/artsearch/songinfo.py %%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/artsearch.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/artsearch.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/artsearch.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/embedded.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/embedded.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/embedded.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/lastfm.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/lastfm.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/lastfm.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/local.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/local.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/local.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/musicbrainz.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/musicbrainz.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/musicbrainz.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/oldcache.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/oldcache.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/oldcache.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/songinfo.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/songinfo.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/songinfo.cpython-%%PYTVER%%.%%PYOEXTENSION%% lib/rhythmbox/plugins/audiocd/audiocd.plugin lib/rhythmbox/plugins/audiocd/libaudiocd.so lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.plugin @@ -123,7 +123,7 @@ %%PYTHON%%lib/rhythmbox/plugins/im-status/im-status.plugin %%PYTHON%%lib/rhythmbox/plugins/im-status/im-status.py %%PYTHON%%lib/rhythmbox/plugins/im-status/__pycache__/im-status.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/im-status/__pycache__/im-status.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/im-status/__pycache__/im-status.cpython-%%PYTVER%%.%%PYOEXTENSION%% lib/rhythmbox/plugins/iradio/iradio.plugin lib/rhythmbox/plugins/iradio/libiradio.so %%PYTHON%%lib/rhythmbox/plugins/lyrics/AstrawebParser.py @@ -139,27 +139,27 @@ %%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.plugin %%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.py %%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/AstrawebParser.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/AstrawebParser.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/AstrawebParser.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/DarkLyricsParser.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/DarkLyricsParser.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/DarkLyricsParser.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JetlyricsParser.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JetlyricsParser.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JetlyricsParser.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JlyricParser.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JlyricParser.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JlyricParser.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricWikiParser.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricWikiParser.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricWikiParser.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsConfigureDialog.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsConfigureDialog.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsConfigureDialog.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsParse.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsParse.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsParse.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsSites.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsSites.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsSites.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/TerraParser.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/TerraParser.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/TerraParser.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/WinampcnParser.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/WinampcnParser.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/WinampcnParser.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/lyrics.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/lyrics.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/lyrics.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/magnatune/DownloadAlbumHandler.py %%PYTHON%%lib/rhythmbox/plugins/magnatune/MagnatuneAccount.py %%PYTHON%%lib/rhythmbox/plugins/magnatune/MagnatuneSource.py @@ -167,15 +167,15 @@ %%PYTHON%%lib/rhythmbox/plugins/magnatune/magnatune.plugin %%PYTHON%%lib/rhythmbox/plugins/magnatune/magnatune.py %%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/DownloadAlbumHandler.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/DownloadAlbumHandler.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/DownloadAlbumHandler.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneAccount.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneAccount.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneAccount.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneSource.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneSource.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneSource.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/TrackListHandler.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/TrackListHandler.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/TrackListHandler.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/magnatune.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/magnatune.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/magnatune.cpython-%%PYTVER%%.%%PYOEXTENSION%% lib/rhythmbox/plugins/mmkeys/libmmkeys.so lib/rhythmbox/plugins/mmkeys/mmkeys.plugin lib/rhythmbox/plugins/mpris/libmpris.so @@ -189,7 +189,7 @@ %%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.plugin %%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.py %%PYTHON%%lib/rhythmbox/plugins/python-console/__pycache__/pythonconsole.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/python-console/__pycache__/pythonconsole.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/python-console/__pycache__/pythonconsole.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.py %%PYTHON%%lib/rhythmbox/plugins/rb/Loader.py %%PYTHON%%lib/rhythmbox/plugins/rb/URLCache.py @@ -198,17 +198,17 @@ %%PYTHON%%lib/rhythmbox/plugins/rb/rbconfig.py %%PYTHON%%lib/rhythmbox/plugins/rb/stringmatch.py %%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Coroutine.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Coroutine.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Coroutine.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Loader.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Loader.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Loader.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/URLCache.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/URLCache.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/URLCache.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rb.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rb.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rb.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rbconfig.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rbconfig.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rbconfig.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/stringmatch.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/stringmatch.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/stringmatch.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%LIRC%%lib/rhythmbox/plugins/rblirc/librblirc.so %%LIRC%%lib/rhythmbox/plugins/rblirc/rblirc.plugin %%PYTHON%%lib/rhythmbox/plugins/replaygain/config.py @@ -216,11 +216,11 @@ %%PYTHON%%lib/rhythmbox/plugins/replaygain/replaygain.plugin %%PYTHON%%lib/rhythmbox/plugins/replaygain/replaygain.py %%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/config.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/config.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/config.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/player.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/player.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/player.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/replaygain.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/replaygain.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/replaygain.cpython-%%PYTVER%%.%%PYOEXTENSION%% lib/rhythmbox/sample-plugins/sample/libsample.so lib/rhythmbox/sample-plugins/sample/sample.plugin lib/rhythmbox/sample-plugins/sample-vala/libsample-vala.so @@ -228,13 +228,13 @@ %%PYTHON%%lib/rhythmbox/plugins/sendto/sendto.plugin %%PYTHON%%lib/rhythmbox/plugins/sendto/sendto.py %%PYTHON%%lib/rhythmbox/plugins/sendto/__pycache__/sendto.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/sendto/__pycache__/sendto.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/sendto/__pycache__/sendto.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/sample-python.plugin %%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/sample-python.py %%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/__pycache__/sample-python.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/__pycache__/sample-python.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/__pycache__/sample-python.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/soundcloud/__pycache__/soundcloud.cpython-%%PYTVER%%.pyc -%%PYTHON%%lib/rhythmbox/plugins/soundcloud/__pycache__/soundcloud.cpython-%%PYTVER%%.pyo +%%PYTHON%%lib/rhythmbox/plugins/soundcloud/__pycache__/soundcloud.cpython-%%PYTVER%%.%%PYOEXTENSION%% %%PYTHON%%lib/rhythmbox/plugins/soundcloud/soundcloud.plugin %%PYTHON%%lib/rhythmbox/plugins/soundcloud/soundcloud.py libdata/pkgconfig/rhythmbox.pc