3 files changed, 82 insertions, 7 deletions

diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index 83a803d155d8..cb803648c521 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	gpodder
-PORTVERSION=	2.1
-PORTREVISION=	1
+PORTVERSION=	2.2
 CATEGORIES=	multimedia
-MASTER_SITES=	BERLIOS
+MASTER_SITES=	BERLIOS \
+		http://thpinfo.com/2010/mygpoclient/:mygpoclient
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
+		${MGC_DISTNAME}${EXTRACT_SUFX}:mygpoclient
 
 MAINTAINER=	ports@FreeBSD.org
 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 \
 		xdg-open:${PORTSDIR}/devel/xdg-utils \
@@ -32,11 +35,16 @@ OPTIONS=	COVERART "Cover Art syncing support" off \
 USE_PYTHON=	yes
 USE_GNOME=	pygtk2
 USE_GETTEXT=	yes
+USE_GMAKE=	yes
+ALL_TARGET=	messages
 INSTALLS_ICONS=	yes
 INSTALLS_EGGINFO=yes
 
 MAN1=		gpo.1 ${PORTNAME}.1 ${PORTNAME}-backup.1
 
+MGC_DISTNAME=	mygpoclient-1.0
+MGC_WRKSRC=	${WRKDIR}/${MGC_DISTNAME}/mygpoclient
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_COVERART)
@@ -70,8 +78,15 @@ RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e 's|make -C|$$(MAKE) -C|' ${WRKSRC}/Makefile
+
+pre-build:
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${MGC_WRKSRC}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${MGC_WRKSRC}
 
-post-install:
+pre-install:
+	@${MKDIR} ${PYTHON_SITELIBDIR}/mygpoclient
+	@(cd ${MGC_WRKSRC} && ${COPYTREE_SHARE} . ${PYTHON_SITELIBDIR}/mygpoclient)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in PKG-INFO README
diff --git a/multimedia/gpodder/distinfo b/multimedia/gpodder/distinfo
index 9241b9f012a7..645c944f30fe 100644
--- a/multimedia/gpodder/distinfo
+++ b/multimedia/gpodder/distinfo
@@ -1,3 +1,6 @@
-MD5 (gpodder-2.1.tar.gz) = 57ed679e3722b7c214956b8d4e13141a
-SHA256 (gpodder-2.1.tar.gz) = 2134eba889ad9b2306870aab0d43a15efaa0ad54132a7770a92aafca79ef3ccf
-SIZE (gpodder-2.1.tar.gz) = 694681
+MD5 (gpodder-2.2.tar.gz) = 1d91f4a4ef59012e1df2c7add9357ca2
+SHA256 (gpodder-2.2.tar.gz) = 5d0bfd9c98f17695acb85d4921b6de5a6f1cb4f87320640a8926d9edb72e8c3a
+SIZE (gpodder-2.2.tar.gz) = 783567
+MD5 (mygpoclient-1.0.tar.gz) = 1e0cdad9a329b76b6eb19426e8efd787
+SHA256 (mygpoclient-1.0.tar.gz) = 50634aca62705c8d780c2f5333d1a30c0ddc448c9b683fb4531769f30988923c
+SIZE (mygpoclient-1.0.tar.gz) = 28244
diff --git a/multimedia/gpodder/pkg-plist b/multimedia/gpodder/pkg-plist
index c22202add362..5fc52b056272 100644
--- a/multimedia/gpodder/pkg-plist
+++ b/multimedia/gpodder/pkg-plist
@@ -13,6 +13,8 @@ bin/gpodder-backup
 %%PYTHON_SITELIBDIR%%/gpodder/corestats.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/dbsqlite.py
 %%PYTHON_SITELIBDIR%%/gpodder/dbsqlite.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/dbusproxy.py
+%%PYTHON_SITELIBDIR%%/gpodder/dbusproxy.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/download.py
 %%PYTHON_SITELIBDIR%%/gpodder/download.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/feedcore.py
@@ -67,6 +69,8 @@ bin/gpodder-backup
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/welcome.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/mygpodder.py
+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/mygpodder.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/services.py
@@ -81,12 +85,16 @@ bin/gpodder-backup
 %%PYTHON_SITELIBDIR%%/gpodder/libconverter.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/liblogger.py
 %%PYTHON_SITELIBDIR%%/gpodder/liblogger.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/minidb.py
+%%PYTHON_SITELIBDIR%%/gpodder/minidb.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/model.py
 %%PYTHON_SITELIBDIR%%/gpodder/model.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/my.py
 %%PYTHON_SITELIBDIR%%/gpodder/my.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/opml.py
 %%PYTHON_SITELIBDIR%%/gpodder/opml.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/qtui.py
+%%PYTHON_SITELIBDIR%%/gpodder/qtui.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/services.py
 %%PYTHON_SITELIBDIR%%/gpodder/services.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/soundcloud.py
@@ -99,7 +107,53 @@ bin/gpodder-backup
 %%PYTHON_SITELIBDIR%%/gpodder/util.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/youtube.py
 %%PYTHON_SITELIBDIR%%/gpodder/youtube.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/__init__.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/__init__.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/api.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/api.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/api.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/api_test.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/api_test.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/api_test.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/http.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/http.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/http.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/http_test.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/http_test.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/http_test.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/json.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/json.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/json.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/json_test.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/json_test.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/json_test.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/locator.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/locator.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/locator.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/locator_test.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/locator_test.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/locator_test.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/public.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/public.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/public.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/public_test.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/public_test.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/public_test.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/simple.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/simple.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/simple.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/simple_test.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/simple_test.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/simple_test.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/testing.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/testing.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/testing.pyo
+%%PYTHON_SITELIBDIR%%/mygpoclient/util.py
+%%PYTHON_SITELIBDIR%%/mygpoclient/util.pyc
+%%PYTHON_SITELIBDIR%%/mygpoclient/util.pyo
 share/applications/gpodder.desktop
+share/dbus-1/services/org.gpodder.service
 %%PORTDOCS%%%%DOCSDIR%%/PKG-INFO
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/credits.txt
@@ -115,6 +169,7 @@ share/applications/gpodder.desktop
 %%DATADIR%%/ui/desktop/gpoddershownotes.ui
 %%DATADIR%%/ui/desktop/gpoddersyncprogress.ui
 %%DATADIR%%/ui/gpodderwelcome.ui
+%%DATADIR%%/ui/mygpoddersettings.ui
 share/icons/hicolor/16x16/apps/gpodder.png
 share/icons/hicolor/22x22/apps/gpodder.png
 share/icons/hicolor/24x24/apps/gpodder.png
@@ -130,6 +185,7 @@ share/locale/gl/LC_MESSAGES/gpodder.mo
 share/locale/it/LC_MESSAGES/gpodder.mo
 share/locale/nb/LC_MESSAGES/gpodder.mo
 share/locale/nl/LC_MESSAGES/gpodder.mo
+share/locale/nn/LC_MESSAGES/gpodder.mo
 share/locale/pl/LC_MESSAGES/gpodder.mo
 share/locale/pt/LC_MESSAGES/gpodder.mo
 share/locale/pt_BR/LC_MESSAGES/gpodder.mo
@@ -154,6 +210,7 @@ share/pixmaps/gpodder.png
 @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