3 files changed, 60 insertions, 59 deletions

diff --git a/audio/exaile-devel/Makefile b/audio/exaile-devel/Makefile
index 81b4aa8278c6..ec98177f210c 100644
--- a/audio/exaile-devel/Makefile
+++ b/audio/exaile-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	exaile
-DISTVERSION=	0.2.9
-PORTREVISION=	1
+DISTVERSION=	0.2.10
 CATEGORIES=	audio
 MASTER_SITES=	http://www.exaile.org/files/ GENTOO/distfiles
 DISTNAME=	${PORTNAME}_${DISTVERSION}
@@ -15,20 +14,30 @@ DISTNAME=	${PORTNAME}_${DISTVERSION}
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	AmaroK replacement for GTK+
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify \
-		${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree \
-		${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen \
-		${PYTHON_SITELIBDIR}/gtk-2.0/sexy.so:${PORTSDIR}/x11-toolkits/py-sexy \
-		${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23
+RUN_DEPENDS=	py*-dbus>=0.82.1:${PORTSDIR}/devel/py-dbus \
+		py*-notify>=0.1.1:${PORTSDIR}/devel/py-notify \
+		py*-elementtree>=1.2.6:${PORTSDIR}/devel/py-elementtree \
+		py*-mutagen>=1.11:${PORTSDIR}/audio/py-mutagen \
+		py*-sexy>=0.1.9:${PORTSDIR}/x11-toolkits/py-sexy \
+		py*-cddb>=1.4:${PORTSDIR}/audio/py-cddb \
+		py*-pysqlite>=2.3.3:${PORTSDIR}/databases/py-pysqlite23
 
 USE_GETTEXT=	yes
 USE_GNOME=	pygtk2 pygnomeextras
-USE_GSTREAMER=	python
+USE_GSTREAMER=	python gnomevfs
 USE_PYTHON=	yes
+MAN1=	${PORTNAME}.1
+MAKE_ENV+=	FIREFOX=${LOCALBASE}/lib/firefox
+ALL_TARGET=	compile
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^PREFIX/d' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e '/^PYTHON_DIR/s|=.*|=${PYTHON_INCLUDEDIR}|' ${WRKSRC}/mmkeys/Makefile
+	@${REINPLACE_CMD} -e '/^PREFIX/d;/LIBDIR/d;/^FIREFOX/d;/install/s|-D||;\
+		/createpot/d;s|/bin/echo|echo|;s|$$[(]PREFIX[)]/share/exaile|${DATADIR}|;\
+		/install.*mmkeys/d;s|$$[(]PREFIX[)]/share/man/man1|${MAN1PREFIX}/man/man1|'\
+			${WRKSRC}/Makefile
+
+#pre-install:
+#	@for i in ca cs es_AR he_IL it_IT nn pl ro tr_TR zh_CN zh_TW;do\
+#		${INSTALL} -d ${PREFIX}/share/locale/$$i/LC_MESSAGES/;done
 
 .include <bsd.port.mk>
diff --git a/audio/exaile-devel/distinfo b/audio/exaile-devel/distinfo
index 293d3c297597..5eccf743525c 100644
--- a/audio/exaile-devel/distinfo
+++ b/audio/exaile-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (exaile_0.2.9.tar.gz) = d52241d30a66286d9483e30e1259d8d4
-SHA256 (exaile_0.2.9.tar.gz) = b8377fd0559a1ca7b98b47348a436b9dc90658b1dde17115b429e907f045ca98
-SIZE (exaile_0.2.9.tar.gz) = 421296
+MD5 (exaile_0.2.10.tar.gz) = 776412d9844b06fe26444c0d7f74d712
+SHA256 (exaile_0.2.10.tar.gz) = 11cbef758b770fcab44a73b0b3d7f7daa37c1eb3c9e96cb6754e664f76609184
+SIZE (exaile_0.2.10.tar.gz) = 516304
diff --git a/audio/exaile-devel/pkg-plist b/audio/exaile-devel/pkg-plist
index 8ed5ad4c4bc0..c90756bc700d 100644
--- a/audio/exaile-devel/pkg-plist
+++ b/audio/exaile-devel/pkg-plist
@@ -1,14 +1,6 @@
-share/locale/ca/LC_MESSAGES/exaile.mo
-share/locale/de_DE/LC_MESSAGES/exaile.mo
-share/locale/en_GB/LC_MESSAGES/exaile.mo
-share/locale/es_ES/LC_MESSAGES/exaile.mo
-share/locale/pl/LC_MESSAGES/exaile.mo
-share/locale/pt_BR/LC_MESSAGES/exaile.mo
-share/locale/ru/LC_MESSAGES/exaile.mo
-share/locale/sv/LC_MESSAGES/exaile.mo
-share/locale/zh_CN/LC_MESSAGES/exaile.mo
 bin/exaile
 share/applications/exaile.desktop
+%%DATADIR%%/equalizer.ini
 %%DATADIR%%/exaile.glade
 %%DATADIR%%/exaile.py
 %%DATADIR%%/images/artist.png
@@ -40,79 +32,79 @@ share/applications/exaile.desktop
 %%DATADIR%%/images/nocover.png
 %%DATADIR%%/images/playlist.png
 %%DATADIR%%/images/splash.png
-%%DATADIR%%/images/star.svg
+%%DATADIR%%/images/star.png
 %%DATADIR%%/images/track.png
 %%DATADIR%%/images/trayicon.png
-%%DATADIR%%/mmkeys.so
+%%DATADIR%%/lib/__init__.py
+%%DATADIR%%/lib/__init__.pyc
+%%DATADIR%%/lib/wmainfo.py
+%%DATADIR%%/lib/wmainfo.pyc
 %%DATADIR%%/plugins/__init__.py
-%%DATADIR%%/plugins/alarmclock.py
-%%DATADIR%%/plugins/console.py
-%%DATADIR%%/plugins/desktopcover.py
-%%DATADIR%%/plugins/exailenotify.py
-%%DATADIR%%/plugins/gossip_status.py
 %%DATADIR%%/plugins/gui.py
-%%DATADIR%%/plugins/imstatus.py
-%%DATADIR%%/plugins/ipoddriver.py
 %%DATADIR%%/plugins/manager.py
-%%DATADIR%%/plugins/massstoragedriver.py
-%%DATADIR%%/plugins/minimode.py
-%%DATADIR%%/plugins/notaskbarentry.py
 %%DATADIR%%/plugins/plugins.glade
-%%DATADIR%%/plugins/resume.py
-%%DATADIR%%/plugins/serp.py
-%%DATADIR%%/plugins/sound-juicer.py
-%%DATADIR%%/plugins/streamripper.py
-%%DATADIR%%/po/ca.po
-%%DATADIR%%/po/de_DE.po
-%%DATADIR%%/po/en_GB.po
-%%DATADIR%%/po/es_ES.po
-%%DATADIR%%/po/pl.po
-%%DATADIR%%/po/pt_BR.po
-%%DATADIR%%/po/ru.po
-%%DATADIR%%/po/sv.po
-%%DATADIR%%/po/zh_CN.po
 %%DATADIR%%/sql/changes0001.sql
+%%DATADIR%%/sql/changes0002.sql
 %%DATADIR%%/sql/db.sql
 %%DATADIR%%/xl/__init__.py
+%%DATADIR%%/xl/__init__.pyc
 %%DATADIR%%/xl/audioscrobbler.py
+%%DATADIR%%/xl/audioscrobbler.pyc
 %%DATADIR%%/xl/common.py
+%%DATADIR%%/xl/common.pyc
 %%DATADIR%%/xl/config.py
+%%DATADIR%%/xl/config.pyc
 %%DATADIR%%/xl/config_convert.py
+%%DATADIR%%/xl/config_convert.pyc
 %%DATADIR%%/xl/covers.py
+%%DATADIR%%/xl/covers.pyc
 %%DATADIR%%/xl/db.py
+%%DATADIR%%/xl/db.pyc
 %%DATADIR%%/xl/dbusinterface.py
+%%DATADIR%%/xl/dbusinterface.pyc
+%%DATADIR%%/xl/equalizer.py
+%%DATADIR%%/xl/equalizer.pyc
 %%DATADIR%%/xl/filtergui.py
+%%DATADIR%%/xl/filtergui.pyc
 %%DATADIR%%/xl/media/__init__.py
+%%DATADIR%%/xl/media/__init__.pyc
 %%DATADIR%%/xl/media/flac.py
-%%DATADIR%%/xl/media/m4a.py
+%%DATADIR%%/xl/media/flac.pyc
 %%DATADIR%%/xl/media/mp3.py
+%%DATADIR%%/xl/media/mp3.pyc
+%%DATADIR%%/xl/media/mp4.py
+%%DATADIR%%/xl/media/mp4.pyc
 %%DATADIR%%/xl/media/mpc.py
+%%DATADIR%%/xl/media/mpc.pyc
 %%DATADIR%%/xl/media/ogg.py
+%%DATADIR%%/xl/media/ogg.pyc
 %%DATADIR%%/xl/media/wav.py
+%%DATADIR%%/xl/media/wav.pyc
 %%DATADIR%%/xl/media/wma.py
+%%DATADIR%%/xl/media/wma.pyc
+%%DATADIR%%/xl/mozembed.py
+%%DATADIR%%/xl/mozembed.pyc
 %%DATADIR%%/xl/panels.py
+%%DATADIR%%/xl/panels.pyc
 %%DATADIR%%/xl/player.py
+%%DATADIR%%/xl/player.pyc
 %%DATADIR%%/xl/prefs.py
-%%DATADIR%%/xl/shoutcast.py
+%%DATADIR%%/xl/prefs.pyc
 %%DATADIR%%/xl/track.py
+%%DATADIR%%/xl/track.pyc
 %%DATADIR%%/xl/tracks.py
+%%DATADIR%%/xl/tracks.pyc
 %%DATADIR%%/xl/trackslist.py
+%%DATADIR%%/xl/trackslist.pyc
 %%DATADIR%%/xl/xlmisc.py
+%%DATADIR%%/xl/xlmisc.pyc
 share/pixmaps/exaile.png
 @dirrm %%DATADIR%%/images/default_theme
 @dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/po
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%/xl/media
 @dirrm %%DATADIR%%/xl
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/de_DE/LC_MESSAGES
-@dirrmtry share/locale/de_DE
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/applications