Fix plist issues. The context plugin is only installed when webkit and python

are enabled together.
Enable webkit by default since it pulled in by libpeas already.
Put forgotten file in the LIRC crowd.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@20039 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 35 insertions, 36 deletions

diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index bddd81131..d97f7bef7 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -48,7 +48,7 @@ GLIB_SCHEMAS=	org.gnome.rhythmbox.gschema.xml
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	DAAP GRILO IPOD NOTIFY PYTHON LIRC MTP WEBKIT
-OPTIONS_DEFAULT=NOTIFY PYTHON
+OPTIONS_DEFAULT=NOTIFY PYTHON WEBKIT
 DAAP_DESC=	DAAP support
 DAAP_CONFIGURE_ENABLE=	daap
 DAAP_LIB_DEPENDS=	libdmapsharing-3.0.so:${PORTSDIR}/net/libdmapsharing
@@ -76,6 +76,5 @@ WEBKIT_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
 post-patch:
 	@${REINPLACE_CMD} -e 's|{MOZILLA_PLUGINDIR|{MOZILLA_PLUGINDIR}|g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/plugins\/context\/Makefile"/d' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 2041ecc1b..0317bdb60 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -103,28 +103,28 @@ lib/rhythmbox/plugins/audiocd/audiocd.plugin
 lib/rhythmbox/plugins/audiocd/libaudiocd.so
 lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.plugin
 lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.so
-%%PYTHON%%lib/rhythmbox/plugins/context/AlbumTab.py
-%%PYTHON%%lib/rhythmbox/plugins/context/ArtistTab.py
-%%PYTHON%%lib/rhythmbox/plugins/context/ContextView.py
-%%PYTHON%%lib/rhythmbox/plugins/context/LastFM.py
-%%PYTHON%%lib/rhythmbox/plugins/context/LinksTab.py
-%%PYTHON%%lib/rhythmbox/plugins/context/LyricsTab.py
-%%PYTHON%%lib/rhythmbox/plugins/context/context.plugin
-%%PYTHON%%lib/rhythmbox/plugins/context/context.py
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/AlbumTab.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/AlbumTab.cpython-%%PYTVER%%.pyo
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/ArtistTab.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/ArtistTab.cpython-%%PYTVER%%.pyo
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/ContextView.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/ContextView.cpython-%%PYTVER%%.pyo
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/LastFM.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/LastFM.cpython-%%PYTVER%%.pyo
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/LinksTab.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/LinksTab.cpython-%%PYTVER%%.pyo
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/LyricsTab.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/LyricsTab.cpython-%%PYTVER%%.pyo
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/context.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/context.cpython-%%PYTVER%%.pyo
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/AlbumTab.py
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/ArtistTab.py
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/ContextView.py
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/LastFM.py
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/LinksTab.py
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/LyricsTab.py
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/context.plugin
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/context.py
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/AlbumTab.cpython-%%PYTVER%%.pyc
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/AlbumTab.cpython-%%PYTVER%%.pyo
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/ArtistTab.cpython-%%PYTVER%%.pyc
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/ArtistTab.cpython-%%PYTVER%%.pyo
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/ContextView.cpython-%%PYTVER%%.pyc
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/ContextView.cpython-%%PYTVER%%.pyo
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/LastFM.cpython-%%PYTVER%%.pyc
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/LastFM.cpython-%%PYTVER%%.pyo
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/LinksTab.cpython-%%PYTVER%%.pyc
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/LinksTab.cpython-%%PYTVER%%.pyo
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/LyricsTab.cpython-%%PYTVER%%.pyc
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/LyricsTab.cpython-%%PYTVER%%.pyo
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/context.cpython-%%PYTVER%%.pyc
+%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/context.cpython-%%PYTVER%%.pyo
 lib/rhythmbox/plugins/cd-recorder/cd-recorder.plugin
 lib/rhythmbox/plugins/cd-recorder/libcd-recorder.so
 %%DAAP%%lib/rhythmbox/plugins/daap/daap.plugin
@@ -229,7 +229,7 @@ lib/rhythmbox/plugins/power-manager/power-manager.plugin
 %%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/stringmatch.cpython-%%PYTVER%%.pyc
 %%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/stringmatch.cpython-%%PYTVER%%.pyo
 %%LIRC%%lib/rhythmbox/plugins/rblirc/librblirc.so
-lib/rhythmbox/plugins/rblirc/rblirc.plugin
+%%LIRC%%lib/rhythmbox/plugins/rblirc/rblirc.plugin
 %%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/rbzeitgeist.plugin
 %%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/rbzeitgeist.py
 %%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/__pycache__/rbzeitgeist.cpython-%%PYTVER%%.pyc
@@ -800,17 +800,17 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 %%DATADIR%%/plugins/audioscrobbler/Last.fm-symbolic.svg
 %%DATADIR%%/plugins/audioscrobbler/audioscrobbler-preferences.ui
 %%DATADIR%%/plugins/audioscrobbler/audioscrobbler-profile.ui
-%%PYTHON%%%%DATADIR%%/plugins/context/img/Allmusic16x16.png
-%%PYTHON%%%%DATADIR%%/plugins/context/img/Discogs16x16.png
-%%PYTHON%%%%DATADIR%%/plugins/context/img/Wikipedia16x16.png
-%%PYTHON%%%%DATADIR%%/plugins/context/img/lastfm.png
-%%PYTHON%%%%DATADIR%%/plugins/context/img/spinner.gif
-%%PYTHON%%%%DATADIR%%/plugins/context/tmpl/album-tmpl.html
-%%PYTHON%%%%DATADIR%%/plugins/context/tmpl/artist-tmpl.html
-%%PYTHON%%%%DATADIR%%/plugins/context/tmpl/links-tmpl.html
-%%PYTHON%%%%DATADIR%%/plugins/context/tmpl/loading.html
-%%PYTHON%%%%DATADIR%%/plugins/context/tmpl/lyrics-tmpl.html
-%%PYTHON%%%%DATADIR%%/plugins/context/tmpl/main.css
+%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/img/Allmusic16x16.png
+%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/img/Discogs16x16.png
+%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/img/Wikipedia16x16.png
+%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/img/lastfm.png
+%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/img/spinner.gif
+%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/tmpl/album-tmpl.html
+%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/tmpl/artist-tmpl.html
+%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/tmpl/links-tmpl.html
+%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/tmpl/loading.html
+%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/tmpl/lyrics-tmpl.html
+%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/tmpl/main.css
 %%DAAP%%%%DATADIR%%/plugins/daap/daap-prefs.ui
 %%DAAP%%%%DATADIR%%/plugins/daap/daap-toolbar.ui
 %%DAAP%%%%DATADIR%%/plugins/daap/remote-icon.png