Merge -devel version into production version.

3 files changed, 53 insertions, 37 deletions

diff --git a/net/penguintv/Makefile b/net/penguintv/Makefile
index c1ce58c976b..25599fb738f 100644
--- a/net/penguintv/Makefile
+++ b/net/penguintv/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	PenguinTV
-PORTVERSION=	3.0
-PORTREVISION=	1
+PORTVERSION=	3.60
 CATEGORIES=	net audio multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	penguintv
@@ -19,13 +18,10 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/p
 		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:${PORTSDIR}/devel/py-notify \
 		${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer \
 		${PYXML} \
-		${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex
+		${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex \
+		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-BROKEN=		leaves egg file behind on deinstall
-DEPRECATED=	Has been broken for more than 6 months
-EXPIRATION_DATE=2008-09-19
-
 WRKSRC=		${WRKDIR}/PenguinTV-${PORTVERSION}
 
 OPTIONS=	PYLUCENE "Use Lucene search engine" ON \
diff --git a/net/penguintv/distinfo b/net/penguintv/distinfo
index 88335dd0258..3cf0d0403b7 100644
--- a/net/penguintv/distinfo
+++ b/net/penguintv/distinfo
@@ -1,3 +1,3 @@
-MD5 (PenguinTV-3.0.tar.gz) = 1dd07cdfea4a845b2d8919a6331c7e0f
-SHA256 (PenguinTV-3.0.tar.gz) = 13e8505be2e98f76b85640441c203d656c2a19472701f578beca36985c845a70
-SIZE (PenguinTV-3.0.tar.gz) = 285830
+MD5 (PenguinTV-3.60.tar.gz) = 18eec14a343c9615caa31945b6137318
+SHA256 (PenguinTV-3.60.tar.gz) = f0c858d0fc6c6e3d9e2d823bc3eaaa20515a62f684e208a9ec5329a237467534
+SIZE (PenguinTV-3.60.tar.gz) = 347136
diff --git a/net/penguintv/pkg-plist b/net/penguintv/pkg-plist
index bf5b177a7fd..2988524a7ff 100644
--- a/net/penguintv/pkg-plist
+++ b/net/penguintv/pkg-plist
@@ -1,7 +1,29 @@
+bin/PenguinTV
+share/applications/penguintv.desktop
+share/locale/pt/LC_MESSAGES/penguintv.mo
+share/locale/pt_BR/LC_MESSAGES/penguintv.mo
+share/locale/sv/LC_MESSAGES/penguintv.mo
+share/penguintv/defaultsubs.opml
+share/penguintv/mozilla-planet-hildon.css
+share/penguintv/mozilla-planet.css
+share/penguintv/mozilla.css
+share/penguintv/penguintv.glade
+share/penguintv/penguintvicon.png
+share/penguintv/pixmaps/ev_offline.png
+share/penguintv/pixmaps/ev_online.png
+share/penguintv/pixmaps/throbber.gif
+share/pixmaps/penguintvicon.png
+share/dbus-1/services/penguintv.service
+
+%%PYTHON_SITELIBDIR%%/PenguinTV-3.60-py2.5.egg-info
 %%PYTHON_SITELIBDIR%%/penguintv/AddFeedDialog.py
 %%PYTHON_SITELIBDIR%%/penguintv/AddFeedDialog.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/AddFeedUtils.py
+%%PYTHON_SITELIBDIR%%/penguintv/AddFeedUtils.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/AddSearchTagDialog.py
 %%PYTHON_SITELIBDIR%%/penguintv/AddSearchTagDialog.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ArticleSync.py
+%%PYTHON_SITELIBDIR%%/penguintv/ArticleSync.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/BTDownloader.py
 %%PYTHON_SITELIBDIR%%/penguintv/BTDownloader.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/DownloadView.py
@@ -10,6 +32,8 @@
 %%PYTHON_SITELIBDIR%%/penguintv/Downloader.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/EditSearchesDialog.py
 %%PYTHON_SITELIBDIR%%/penguintv/EditSearchesDialog.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/EntryFormatter.py
+%%PYTHON_SITELIBDIR%%/penguintv/EntryFormatter.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/EntryList.py
 %%PYTHON_SITELIBDIR%%/penguintv/EntryList.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/EntryView.py
@@ -24,10 +48,14 @@
 %%PYTHON_SITELIBDIR%%/penguintv/FeedPropertiesDialog.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/FilterSelectorDialog.py
 %%PYTHON_SITELIBDIR%%/penguintv/FilterSelectorDialog.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/FtpSyncClient.py
+%%PYTHON_SITELIBDIR%%/penguintv/FtpSyncClient.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/GStreamerPlayer.py
 %%PYTHON_SITELIBDIR%%/penguintv/GStreamerPlayer.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/HTTPDownloader.py
 %%PYTHON_SITELIBDIR%%/penguintv/HTTPDownloader.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/HildonListener.py
+%%PYTHON_SITELIBDIR%%/penguintv/HildonListener.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/IconManager.py
 %%PYTHON_SITELIBDIR%%/penguintv/IconManager.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/LoginDialog.py
@@ -40,18 +68,24 @@
 %%PYTHON_SITELIBDIR%%/penguintv/MediaManager.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/OPML.py
 %%PYTHON_SITELIBDIR%%/penguintv/OPML.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/PTVAppSocket.py
-%%PYTHON_SITELIBDIR%%/penguintv/PTVAppSocket.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/PTVXapian.py
+%%PYTHON_SITELIBDIR%%/penguintv/PTVXapian.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/PlanetView.py
 %%PYTHON_SITELIBDIR%%/penguintv/PlanetView.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/Player.py
 %%PYTHON_SITELIBDIR%%/penguintv/Player.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/Poller.py
+%%PYTHON_SITELIBDIR%%/penguintv/Poller.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/PreferencesDialog.py
 %%PYTHON_SITELIBDIR%%/penguintv/PreferencesDialog.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/PtvTrayIcon.py
 %%PYTHON_SITELIBDIR%%/penguintv/PtvTrayIcon.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/S3SyncClient.py
+%%PYTHON_SITELIBDIR%%/penguintv/S3SyncClient.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/SimpleImageCache.py
 %%PYTHON_SITELIBDIR%%/penguintv/SimpleImageCache.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/SqliteSyncClient.py
+%%PYTHON_SITELIBDIR%%/penguintv/SqliteSyncClient.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/SynchronizeDialog.py
 %%PYTHON_SITELIBDIR%%/penguintv/SynchronizeDialog.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/TagEditorNG.py
@@ -68,6 +102,10 @@
 %%PYTHON_SITELIBDIR%%/penguintv/ajax/MyTCPServer.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/ajax/__init__.py
 %%PYTHON_SITELIBDIR%%/penguintv/ajax/__init__.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/amazon/S3.py
+%%PYTHON_SITELIBDIR%%/penguintv/amazon/S3.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/amazon/__init__.py
+%%PYTHON_SITELIBDIR%%/penguintv/amazon/__init__.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/feedparser.py
 %%PYTHON_SITELIBDIR%%/penguintv/feedparser.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/itunes.py
@@ -76,6 +114,8 @@
 %%PYTHON_SITELIBDIR%%/penguintv/penguintv.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/ptvDB.py
 %%PYTHON_SITELIBDIR%%/penguintv/ptvDB.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvDbus.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvDbus.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/ptv_sync.py
 %%PYTHON_SITELIBDIR%%/penguintv/ptv_sync.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Choker.py
@@ -146,32 +186,12 @@
 %%PYTHON_SITELIBDIR%%/penguintv/trayicon/__init__.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/utils.py
 %%PYTHON_SITELIBDIR%%/penguintv/utils.pyc
-
-@comment This one shouldn't be here, but the py-lucene port doesn't generate it
 %%PYTHON_SITELIBDIR%%/PyLucene.pyc
 
-bin/PenguinTV
-
-share/applications/penguintv.desktop
-share/pixmaps/penguintvicon.png
-
-share/penguintv/defaultsubs.opml
-share/penguintv/penguintv.glade
-share/penguintv/penguintvicon.png
-share/penguintv/gtkhtml.css
-share/penguintv/mozilla.css
-share/penguintv/mozilla-planet.css
-
-share/locale/pt/LC_MESSAGES/penguintv.mo
-share/locale/pt_BR/LC_MESSAGES/penguintv.mo
-share/locale/sv/LC_MESSAGES/penguintv.mo
-
-@dirrmtry share/applications
-@dirrm share/penguintv
-@dirrm %%PYTHON_SITELIBDIR%%/penguintv/trayicon
-@dirrm %%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent
 @dirrm %%PYTHON_SITELIBDIR%%/penguintv/ajax
+@dirrm %%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent
+@dirrm %%PYTHON_SITELIBDIR%%/penguintv/amazon
+@dirrm %%PYTHON_SITELIBDIR%%/penguintv/trayicon
 @dirrm %%PYTHON_SITELIBDIR%%/penguintv
-
-@comment etc/gconf/gconf.xml.defaults/schemas/apps/penguintv/%gconf.xml
-@comment etc/gconf/gconf.xml.defaults/apps/penguintv/%gconf.xml
+@dirrm share/penguintv/pixmaps
+@dirrm share/penguintv