3 files changed, 17 insertions, 19 deletions

diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index 852f36ca0e99..1af36e34f636 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gpodder
-PORTVERSION=	2.14
+PORTVERSION=	2.15
 CATEGORIES=	multimedia
 MASTER_SITES=	BERLIOS \
 		http://thp.io/2010/mygpoclient/:mygpoclient \
@@ -19,15 +19,15 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
 MAINTAINER=	cvs-src@yandex.ru
 COMMENT=	A GTK2 podcast aggregrator written in Python
 
-RUN_DEPENDS=	py*-pysqlite>=2.3:${PORTSDIR}/databases/py-pysqlite23 \
-		py*-sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
-		py*-notify>=0:${PORTSDIR}/devel/py-notify \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysqlite>=2.3:${PORTSDIR}/databases/py-pysqlite23 \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}notify>=0:${PORTSDIR}/devel/py-notify \
 		xdg-open:${PORTSDIR}/devel/xdg-utils \
 		wget:${PORTSDIR}/ftp/wget \
 		gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		py*-feedparser>=0:${PORTSDIR}/textproc/py-feedparser \
-		py*-simplejson>=0:${PORTSDIR}/devel/py-simplejson
+		${PYTHON_PKGNAMEPREFIX}feedparser>=0:${PORTSDIR}/textproc/py-feedparser \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=0:${PORTSDIR}/devel/py-simplejson
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -54,19 +54,19 @@ MGC_WRKSRC=	${WRKDIR}/${MGC_DISTNAME}/mygpoclient
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_COVERART)
-RUN_DEPENDS+=	py*-imaging>=0:${PORTSDIR}/graphics/py-imaging
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging
 .endif
 
 .if defined(WITH_IPOD)
 LIB_DEPENDS+=	gpod.7:${PORTSDIR}/audio/libgpod
-RUN_DEPENDS+=	py*-mad>=0:${PORTSDIR}/audio/py-mad
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mad>=0:${PORTSDIR}/audio/py-mad
 .if !exists(${PYTHON_SITELIBDIR}/gpod/__init__.py)
 IGNORE=		requires Python bindings for libgpod. Please uninstall libgpod and reinstall with Python support
 .endif
 .endif
 
 .if defined(WITH_MP3TAG)
-RUN_DEPENDS+=	py*-eyed3>=0:${PORTSDIR}/audio/py-eyed3
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}eyed3>=0:${PORTSDIR}/audio/py-eyed3
 .endif
 
 .if defined(WITH_OGG2MP3)
diff --git a/multimedia/gpodder/distinfo b/multimedia/gpodder/distinfo
index c4043616398d..512d4594fcaa 100644
--- a/multimedia/gpodder/distinfo
+++ b/multimedia/gpodder/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gpodder-2.14.tar.gz) = 9b8ea0ab473940930e3773dcd53c099f3f80bfbaf4c6381f3e721e206bde796f
-SIZE (gpodder-2.14.tar.gz) = 1065720
+SHA256 (gpodder-2.15.tar.gz) = aba47467033db14f73630b463c9fdf294168902af2e737573cb2adfb075b6208
+SIZE (gpodder-2.15.tar.gz) = 1069662
 SHA256 (mygpoclient-1.5.tar.gz) = bd3f31fa082965e3005cf725a09444bcc77600de355e1ee795e7af53fcae568b
 SIZE (mygpoclient-1.5.tar.gz) = 30719
diff --git a/multimedia/gpodder/pkg-plist b/multimedia/gpodder/pkg-plist
index f2e107931d8a..6260109be442 100644
--- a/multimedia/gpodder/pkg-plist
+++ b/multimedia/gpodder/pkg-plist
@@ -21,8 +21,6 @@ bin/gpodder-backup
 %%PYTHON_SITELIBDIR%%/gpodder/gpodderosx.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gpopymtp.py
 %%PYTHON_SITELIBDIR%%/gpodder/gpopymtp.pyc
-%%PYTHON_SITELIBDIR%%/gpodder/gstreamer.py
-%%PYTHON_SITELIBDIR%%/gpodder/gstreamer.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/base.py
@@ -179,8 +177,6 @@ share/dbus-1/services/org.gpodder.service
 %%DATADIR%%/podcast-3.png
 %%DATADIR%%/podcast-4.png
 %%DATADIR%%/podcast-all.png
-%%DATADIR%%/video-locked.png
-%%DATADIR%%/video.png
 %%DATADIR%%/ui/desktop/gpodder.ui
 %%DATADIR%%/ui/desktop/gpodderaddpodcast.ui
 %%DATADIR%%/ui/desktop/gpodderchannel.ui
@@ -193,6 +189,8 @@ share/dbus-1/services/org.gpodder.service
 %%DATADIR%%/ui/desktop/gpoddershownotes.ui
 %%DATADIR%%/ui/desktop/gpoddersyncprogress.ui
 %%DATADIR%%/ui/gpodderwelcome.ui
+%%DATADIR%%/video-locked.png
+%%DATADIR%%/video.png
 share/icons/hicolor/16x16/apps/gpodder.png
 share/icons/hicolor/22x22/apps/gpodder.png
 share/icons/hicolor/24x24/apps/gpodder.png
@@ -220,15 +218,15 @@ share/locale/ru/LC_MESSAGES/gpodder.mo
 share/locale/sv/LC_MESSAGES/gpodder.mo
 share/locale/uk/LC_MESSAGES/gpodder.mo
 share/pixmaps/gpodder.png
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
 @dirrm %%DATADIR%%/ui/desktop
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/mygpoclient
 @dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface
 @dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop
 @dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui
 @dirrm %%PYTHON_SITELIBDIR%%/gpodder
-@dirrmtry share/applications
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk