3 files changed, 19 insertions, 21 deletions

diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index 8ff905230ecc..72012131b2fc 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gpodder
-PORTVERSION=	2.7
+PORTVERSION=	2.9
 CATEGORIES=	multimedia
 MASTER_SITES=	BERLIOS \
 		http://thpinfo.com/2010/mygpoclient/:mygpoclient
@@ -72,6 +72,9 @@ RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame \
 USE_GNOME+=	pygnomeextras
 .endif
 
+# ensure that setup.py can find mygpoclient module when installing gpodder
+MAKE_ENV+= PYTHONPATH="${PYTHONPREFIX_SITELIBDIR}"
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e 's|make -C|$$(MAKE) -C|' ${WRKSRC}/Makefile
@@ -81,8 +84,9 @@ pre-build:
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${MGC_WRKSRC}
 
 pre-install:
-	@${MKDIR} ${PYTHON_SITELIBDIR}/mygpoclient
-	@(cd ${MGC_WRKSRC} && ${COPYTREE_SHARE} . ${PYTHON_SITELIBDIR}/mygpoclient)
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/mygpoclient
+	@(cd ${MGC_WRKSRC} && ${COPYTREE_SHARE} . ${PYTHONPREFIX_SITELIBDIR}/mygpoclient)
+
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in PKG-INFO README
diff --git a/multimedia/gpodder/distinfo b/multimedia/gpodder/distinfo
index a0f203b42bdc..0b300ca90245 100644
--- a/multimedia/gpodder/distinfo
+++ b/multimedia/gpodder/distinfo
@@ -1,6 +1,6 @@
-MD5 (gpodder-2.7.tar.gz) = fb27f8e005c2ede35f37e145dd8e7cf1
-SHA256 (gpodder-2.7.tar.gz) = 09bd22726c83fa1f40aa2db50aaaf157399c7c9e0bc81f4cee9c2643d8fd191b
-SIZE (gpodder-2.7.tar.gz) = 987341
+MD5 (gpodder-2.9.tar.gz) = 6eb02a01c7848c056c96d7be36ec54bd
+SHA256 (gpodder-2.9.tar.gz) = b3f030dc06e2ffc356267dad00997049ecf6fdbb57d3d9dd0b0f356f1d50d2c3
+SIZE (gpodder-2.9.tar.gz) = 1056872
 MD5 (mygpoclient-1.4.tar.gz) = dfbee01f09f141e49a36273d7aed00ec
 SHA256 (mygpoclient-1.4.tar.gz) = ed1dd620ef7481085b3869d038cc913a5ed54bafe0aa412a4c36ccd35b63aa6d
 SIZE (mygpoclient-1.4.tar.gz) = 30621
diff --git a/multimedia/gpodder/pkg-plist b/multimedia/gpodder/pkg-plist
index e59f799ca330..111dc94cd199 100644
--- a/multimedia/gpodder/pkg-plist
+++ b/multimedia/gpodder/pkg-plist
@@ -21,6 +21,8 @@ bin/gpodder-backup
 %%PYTHON_SITELIBDIR%%/gpodder/feedcore.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gpodderosx.py
 %%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
@@ -111,6 +113,8 @@ bin/gpodder-backup
 %%PYTHON_SITELIBDIR%%/gpodder/unittests.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/util.py
 %%PYTHON_SITELIBDIR%%/gpodder/util.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/xspf.py
+%%PYTHON_SITELIBDIR%%/gpodder/xspf.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/youtube.py
 %%PYTHON_SITELIBDIR%%/gpodder/youtube.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/__init__.py
@@ -192,10 +196,12 @@ share/icons/hicolor/scalable/apps/gpodder.svg
 share/locale/cs/LC_MESSAGES/gpodder.mo
 share/locale/da/LC_MESSAGES/gpodder.mo
 share/locale/de/LC_MESSAGES/gpodder.mo
+share/locale/el/LC_MESSAGES/gpodder.mo
 share/locale/es/LC_MESSAGES/gpodder.mo
 share/locale/fi/LC_MESSAGES/gpodder.mo
 share/locale/fr/LC_MESSAGES/gpodder.mo
 share/locale/gl/LC_MESSAGES/gpodder.mo
+share/locale/he/LC_MESSAGES/gpodder.mo
 share/locale/it/LC_MESSAGES/gpodder.mo
 share/locale/kk/LC_MESSAGES/gpodder.mo
 share/locale/nb/LC_MESSAGES/gpodder.mo
@@ -209,27 +215,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/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@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
+@dirrm share/locale/kk/LC_MESSAGES
+@dirrm share/locale/kk
+@dirrmtry share/applications