3 files changed, 110 insertions, 110 deletions

diff --git a/net/penguintv-devel/Makefile b/net/penguintv-devel/Makefile
index aa701ab01a34..9f72d4c73fde 100644
--- a/net/penguintv-devel/Makefile
+++ b/net/penguintv-devel/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	PenguinTV
-PORTVERSION=	1.60
-PORTREVISION=	1
+PORTVERSION=	1.70
 CATEGORIES=	net audio multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	penguintv
@@ -24,8 +23,6 @@ BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
 .endif
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-BROKEN=		Incorrect pkg-plist
-
 USE_GNOME=	pygnomeextras pygnome2
 USE_PYTHON=	yes
 
diff --git a/net/penguintv-devel/distinfo b/net/penguintv-devel/distinfo
index 4044c2cf5433..2b4226315a64 100644
--- a/net/penguintv-devel/distinfo
+++ b/net/penguintv-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (PenguinTV-1.60.tar.gz) = 5c414ffffaa7c358502a61d8f65e81de
-SHA256 (PenguinTV-1.60.tar.gz) = 0d4a1faa850cfd2658984cee46eb54aa67dd65d4a78a04baabb93a306c39cd2b
-SIZE (PenguinTV-1.60.tar.gz) = 166456
+MD5 (PenguinTV-1.70.tar.gz) = aebc5a9175f791ed93465d384c1b3033
+SHA256 (PenguinTV-1.70.tar.gz) = 9eb798f526c132f323308236ad37c9925b92f96532d506c91f1328d98c81d7d6
+SIZE (PenguinTV-1.70.tar.gz) = 315536
diff --git a/net/penguintv-devel/pkg-plist b/net/penguintv-devel/pkg-plist
index 91b816c63eb0..0b6da8a4ba81 100644
--- a/net/penguintv-devel/pkg-plist
+++ b/net/penguintv-devel/pkg-plist
@@ -1,120 +1,123 @@
+%%PYTHON_SITELIBDIR%%/penguintv/AddFeedDialog.py
+%%PYTHON_SITELIBDIR%%/penguintv/AddFeedDialog.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/BTDownloader.py
+%%PYTHON_SITELIBDIR%%/penguintv/BTDownloader.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/Downloader.py
+%%PYTHON_SITELIBDIR%%/penguintv/Downloader.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/EditTagsMultiDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/EditTextTagsDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/EntryList.py
-%%PYTHON_SITELIBDIR%%/penguintv/EntryView.py
-%%PYTHON_SITELIBDIR%%/penguintv/FeedList.py
-%%PYTHON_SITELIBDIR%%/penguintv/HTTPDownloader.py
-%%PYTHON_SITELIBDIR%%/penguintv/SimpleImageCache-threaded.py
 %%PYTHON_SITELIBDIR%%/penguintv/EditTagsMultiDialog.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/EditTextTagsDialog.py
 %%PYTHON_SITELIBDIR%%/penguintv/EditTextTagsDialog.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/EntryList.py
 %%PYTHON_SITELIBDIR%%/penguintv/EntryList.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/EntryView.py
 %%PYTHON_SITELIBDIR%%/penguintv/EntryView.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/FeedList.py
 %%PYTHON_SITELIBDIR%%/penguintv/FeedList.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/HTTPDownloader.py
 %%PYTHON_SITELIBDIR%%/penguintv/HTTPDownloader.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/SimpleImageCache-threaded.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/utils.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/utils.py
-%%PYTHON_SITELIBDIR%%/penguintv/timeoutsocket.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/timeoutsocket.py
-%%PYTHON_SITELIBDIR%%/penguintv/subProcess.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/subProcess.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/zurllib.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/zurllib.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/track.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/track.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/testtest.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/testtest.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/spewout.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/spewout.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/selectpoll.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/selectpoll.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/parseargs.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/parseargs.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/fakeopen.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/fakeopen.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/download.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/download.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btmakemetafile.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btmakemetafile.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btformats.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btformats.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btcompletedir.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btcompletedir.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/bitfield.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/bitfield.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/bencode.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/bencode.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/__init__.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/__init__.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Uploader.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Uploader.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/StorageWrapper.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/StorageWrapper.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Storage.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Storage.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Rerequester.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Rerequester.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/RawServer.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/RawServer.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/RateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/RateMeasure.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/PiecePicker.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/PiecePicker.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/NatCheck.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/NatCheck.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/HTTPHandler.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/HTTPHandler.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Encrypter.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Encrypter.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/DownloaderFeedback.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/DownloaderFeedback.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Downloader.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Downloader.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/CurrentRateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/CurrentRateMeasure.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Connecter.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Connecter.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Choker.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Choker.py
-@dirrm %%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent
-%%PYTHON_SITELIBDIR%%/penguintv/ptvDB.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvDB.py
-%%PYTHON_SITELIBDIR%%/penguintv/penguintv.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/penguintv.py
-%%PYTHON_SITELIBDIR%%/penguintv/feedparser.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/feedparser.py
-%%PYTHON_SITELIBDIR%%/penguintv/__init__.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/__init__.py
-%%PYTHON_SITELIBDIR%%/penguintv/UpdateTasksManager.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/UpdateTasksManager.py
-%%PYTHON_SITELIBDIR%%/penguintv/ThreadPool.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ThreadPool.py
-%%PYTHON_SITELIBDIR%%/penguintv/SimpleImageCache.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/SimpleImageCache.py
-%%PYTHON_SITELIBDIR%%/penguintv/RenameFeedDialog.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/RenameFeedDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/PreferencesDialog.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/PreferencesDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/Player.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/Player.py
-%%PYTHON_SITELIBDIR%%/penguintv/OPML.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/OPML.py
-%%PYTHON_SITELIBDIR%%/penguintv/MediaManager.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/MainWindow.py
+%%PYTHON_SITELIBDIR%%/penguintv/MainWindow.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/MediaManager.py
-%%PYTHON_SITELIBDIR%%/penguintv/BTDownloader.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/BTDownloader.py
-%%PYTHON_SITELIBDIR%%/penguintv/AddFeedDialog.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/AddFeedDialog.py
-@dirrm %%PYTHON_SITELIBDIR%%/penguintv
+%%PYTHON_SITELIBDIR%%/penguintv/MediaManager.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/OPML.py
+%%PYTHON_SITELIBDIR%%/penguintv/OPML.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/Player.py
+%%PYTHON_SITELIBDIR%%/penguintv/Player.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/PreferencesDialog.py
+%%PYTHON_SITELIBDIR%%/penguintv/PreferencesDialog.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/RenameFeedDialog.py
+%%PYTHON_SITELIBDIR%%/penguintv/RenameFeedDialog.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/SimpleImageCache.py
+%%PYTHON_SITELIBDIR%%/penguintv/SimpleImageCache.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ThreadPool.py
+%%PYTHON_SITELIBDIR%%/penguintv/ThreadPool.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/UpdateTasksManager.py
+%%PYTHON_SITELIBDIR%%/penguintv/UpdateTasksManager.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/__init__.py
+%%PYTHON_SITELIBDIR%%/penguintv/__init__.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/feedparser.py
+%%PYTHON_SITELIBDIR%%/penguintv/feedparser.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/penguintv.py
+%%PYTHON_SITELIBDIR%%/penguintv/penguintv.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvDB.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvDB.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Choker.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Choker.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Connecter.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Connecter.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/CurrentRateMeasure.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/CurrentRateMeasure.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Downloader.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Downloader.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/DownloaderFeedback.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/DownloaderFeedback.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Encrypter.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Encrypter.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/HTTPHandler.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/HTTPHandler.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/NatCheck.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/NatCheck.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/PiecePicker.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/PiecePicker.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/RateMeasure.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/RateMeasure.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/RawServer.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/RawServer.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Rerequester.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Rerequester.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Storage.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Storage.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/StorageWrapper.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/StorageWrapper.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Uploader.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Uploader.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/__init__.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/__init__.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/bencode.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/bencode.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/bitfield.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/bitfield.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btcompletedir.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btcompletedir.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btformats.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btformats.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btmakemetafile.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btmakemetafile.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/download.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/download.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/fakeopen.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/fakeopen.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/parseargs.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/parseargs.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/selectpoll.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/selectpoll.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/spewout.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/spewout.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/testtest.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/testtest.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/track.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/track.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/zurllib.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/zurllib.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/subProcess.py
+%%PYTHON_SITELIBDIR%%/penguintv/subProcess.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/timeoutsocket.py
+%%PYTHON_SITELIBDIR%%/penguintv/timeoutsocket.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/utils.py
+%%PYTHON_SITELIBDIR%%/penguintv/utils.pyc
 bin/PenguinTV
-share/penguintv/penguintv.glade
+share/applications/penguintv.desktop
 share/penguintv/defaultsubs.opml
+share/penguintv/penguintv.glade
 share/penguintv/penguintvicon.png
 share/pixmaps/penguintvicon.png
-share/applications/penguintv.desktop
-@dirrm share/penguintv
+
 @dirrmtry share/pixmaps
 @dirrmtry share/applications
+@dirrm share/penguintv
+@dirrm %%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent
+@dirrm %%PYTHON_SITELIBDIR%%/penguintv
 
 @cwd %%X11BASE%%
 etc/gconf/gconf.xml.defaults/schemas/apps/penguintv/%gconf.xml