7 files changed, 231 insertions, 128 deletions

diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index 325ca2ec7b5c..ac0c462cb6f0 100644
--- a/news/sabnzbdplus/Makefile
+++ b/news/sabnzbdplus/Makefile
@@ -1,34 +1,33 @@
-# New ports collection makefile for:	sabnzbd
-# Date created:				16 March 2006
+# New ports collection makefile for:   sabnzdbplus
+# Date created:				January 2008
 # Whom:					Daniel Bretoi
 #
 # $FreeBSD$
 #
 
-PORTNAME=	sabnzbd
-PORTVERSION=	0.2.5
-PORTREVISION=	1
+PORTNAME=	sabnzbdplus
+PORTVERSION=	0.3.0
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	sabnzbd
-DISTNAME=	SABnzbd-${PORTVERSION}
+MASTER_SITES=	SF/sabnzbdplus
+DISTNAME=	SABnzbd-${PORTVERSION}-src
 
 MAINTAINER=	daniel@netwalk.org
 COMMENT=	A web-interface based binary newsgrabber in python, with nzb support
 
-BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	cheetah:${PORTSDIR}/devel/py-cheetah \
 		${PYTHON_SITELIBDIR}/cherrypy/__init__.py:${PORTSDIR}/www/py-cherrypy-old \
 		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:${PORTSDIR}/devel/py-utils \
 		${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementtree
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_PYTHON=	2.4+
-USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGNAME=	SABnzbd
+NO_BUILD=yes
+USE_ZIP=yes
 
+WRKSRC=	${WRKDIR}/SABnzbd-${PORTVERSION}
 PLIST_SUB=	PORTNAME=${PORTNAME}
 SUB_LIST+=	PORTNAME=${PORTNAME}
-SUB_FILES=	pkg-message
+CONFLICTS=	sabzndb-0.*
 
 OPTIONS=	PAR2CMDLINE "Required for postprocessing of par files." on \
 		UNRAR "Often required for unpacking many downloads." on \
@@ -49,11 +48,26 @@ RUN_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PORTNAME%%|${PORTNAME}|' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e "s:/usr/bin/python:${PYTHON_CMD}:g" \
+		 ${WRKSRC}/SABnzbd.py
+	@${REINPLACE_CMD} -e "s:%%PREFIX%%:'${DATADIR}':g" \
+		 ${WRKSRC}/SABnzbd.py
+
+# the NO_BUILD option stops execution after configure. This should really be
+# post-build
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/SABnzbd.py ${PREFIX}/bin/SABnzbd.py
+	${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
+	${CP} -rp ${WRKSRC}/sabnzbd ${PYTHONPREFIX_SITELIBDIR}/
+	${INSTALL_SCRIPT} -d ${DATADIR}
+	${CP} -rp ${WRKSRC}/interfaces ${DATADIR}
 
 post-install:
-	${CHMOD} -R go+r ${PREFIX}/share/${PORTNAME}/
-	${CHMOD} -R go+r ${PREFIX}/share/doc/${PORTNAME}/
-	@${CAT} ${PKGMESSAGE}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in CHANGELOG.txt INSTALL.txt   ISSUES.txt    LICENSE.txt   README.txt
+	${CP} ${WRKSRC}/$i ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/news/sabnzbdplus/distinfo b/news/sabnzbdplus/distinfo
index bfa15b58d767..55b09e20e443 100644
--- a/news/sabnzbdplus/distinfo
+++ b/news/sabnzbdplus/distinfo
@@ -1,3 +1,3 @@
-MD5 (SABnzbd-0.2.5.tar.gz) = da739699eff3f840ff7d835c6c7763d4
-SHA256 (SABnzbd-0.2.5.tar.gz) = b54b4ad7a4964c2e97ec7c267aaff80724931a63ac3c3cdd558e3d1b1c3624bc
-SIZE (SABnzbd-0.2.5.tar.gz) = 100493
+MD5 (SABnzbd-0.3.0-src.zip) = 030249a892816799ebe0cba033c145d4
+SHA256 (SABnzbd-0.3.0-src.zip) = 12b74d3ec938c9c652a1982f0c4449fd5004b1d3a9e33e997e977c61ac6b0e97
+SIZE (SABnzbd-0.3.0-src.zip) = 2502142
diff --git a/news/sabnzbdplus/files/patch-SABnzbd.py b/news/sabnzbdplus/files/patch-SABnzbd.py
new file mode 100644
index 000000000000..02157cc1d8b0
--- /dev/null
+++ b/news/sabnzbdplus/files/patch-SABnzbd.py
@@ -0,0 +1,11 @@
+--- SABnzbd.py.bak	2008-01-05 11:52:46.000000000 -0800
++++ SABnzbd.py	2008-01-05 11:57:12.000000000 -0800
+@@ -492,7 +492,7 @@
+         web_dir = DEF_STDINTF
+     cfg['misc']['web_dir'] = web_dir
+ 
+-    sabnzbd.DIR_INTERFACES = real_path(sabnzbd.DIR_PROG, DEF_INTERFACES)
++    sabnzbd.DIR_INTERFACES = real_path(%%PREFIX%%, DEF_INTERFACES)
+     web_dir = real_path(sabnzbd.DIR_INTERFACES, web_dir)
+     web_main = real_path(web_dir, DEF_MAIN_TMPL)
+     logging.info("Web dir is %s", web_dir)
diff --git a/news/sabnzbdplus/files/patch-setup.py b/news/sabnzbdplus/files/patch-setup.py
deleted file mode 100644
index 62ada1a54c8e..000000000000
--- a/news/sabnzbdplus/files/patch-setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
---- setup.py.orig	Wed Jul 12 09:55:04 2006
-+++ setup.py	Wed Jul 12 20:44:42 2006
-@@ -13,10 +13,11 @@
-       packages = ['sabnzbd', 'sabnzbd.utils', 'sabnzbd.utils.multiauth'],
-       platforms = ['posix'],
-       license = 'GNU General Public License 2 (GPL2)',
--      data_files = [('share/doc/SABnzbd-' + sabnzbd.__version__,
--                     ['SABnzbd.ini.sample', 'README.txt', 'LICENSE.txt',
--                      'TODO.txt', 'CHANGELOG.txt', 'UPGRADE.txt']),
--                    ('share/SABnzbd-' + sabnzbd.__version__ + '/templates',
-+      data_files = [('share/doc/%%PORTNAME%%',
-+                             ['README.txt', 'LICENSE.txt',
-+                              'TODO.txt', 'CHANGELOG.txt', 'UPGRADE.txt']),
-+                    ('share/%%PORTNAME%%',['SABnzbd.ini.sample']),
-+                    ('share/%%PORTNAME%%' + '/templates',
-                              ['templates/default.css', 'templates/history.tmpl',
-                               'templates/main.tmpl',
- 			      'templates/connection_info.tmpl',
-@@ -30,5 +31,5 @@
-                               'templates/config_scheduling.tmpl',
-                               'templates/config_rss.tmpl',
-                               'templates/static/placeholder.txt']),
--                    ('share/SABnzbd-' + sabnzbd.__version__ + '/templates/static',
-+                    ('share/%%PORTNAME%%/templates/static',
-                               ['templates/static/placeholder.txt'])])
diff --git a/news/sabnzbdplus/files/pkg-message.in b/news/sabnzbdplus/files/pkg-message.in
deleted file mode 100644
index 3dc216036190..000000000000
--- a/news/sabnzbdplus/files/pkg-message.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-****************************************************************************
-Check %%PREFIX%%/share/%%PORTNAME%% for SABnzbd.ini.sample and templates
-See %%PREFIX%%/share/doc/%%PORTNAME%% for README.txt etc
-****************************************************************************
-
diff --git a/news/sabnzbdplus/pkg-descr b/news/sabnzbdplus/pkg-descr
index 4756c5cfd21a..8baf015b7b51 100644
--- a/news/sabnzbdplus/pkg-descr
+++ b/news/sabnzbdplus/pkg-descr
@@ -1,4 +1,4 @@
 A web-interface based standalone binary newsgrabber written in python, supports
 .nzb files
 
-WWW: http://sourceforge.net/projects/sabnzbd
+WWW: http://sourceforge.net/projects/sabnzbdplus
diff --git a/news/sabnzbdplus/pkg-plist b/news/sabnzbdplus/pkg-plist
index 56ebcdd0336d..486288dcf9e1 100644
--- a/news/sabnzbdplus/pkg-plist
+++ b/news/sabnzbdplus/pkg-plist
@@ -1,101 +1,210 @@
 bin/SABnzbd.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/articlecache.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/decoder.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/decorators.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/trylist.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/articlecache.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/decoder.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/decorators.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/trylist.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/articlecache.pyo
-%%PYTHON_SITELIBDIR%%/sabnzbd/decoder.pyo
-%%PYTHON_SITELIBDIR%%/sabnzbd/decorators.pyo
-%%PYTHON_SITELIBDIR%%/sabnzbd/trylist.pyo
+%%DATADIR%%/interfaces/Default/README.TXT
+%%DATADIR%%/interfaces/Default/templates/config.tmpl
+%%DATADIR%%/interfaces/Default/templates/config_directories.tmpl
+%%DATADIR%%/interfaces/Default/templates/config_email.tmpl
+%%DATADIR%%/interfaces/Default/templates/config_general.tmpl
+%%DATADIR%%/interfaces/Default/templates/config_rss.tmpl
+%%DATADIR%%/interfaces/Default/templates/config_scheduling.tmpl
+%%DATADIR%%/interfaces/Default/templates/config_server.tmpl
+%%DATADIR%%/interfaces/Default/templates/config_switches.tmpl
+%%DATADIR%%/interfaces/Default/templates/connection_info.tmpl
+%%DATADIR%%/interfaces/Default/templates/history.tmpl
+%%DATADIR%%/interfaces/Default/templates/main.tmpl
+%%DATADIR%%/interfaces/Default/templates/nzo.tmpl
+%%DATADIR%%/interfaces/Default/templates/queue.tmpl
+%%DATADIR%%/interfaces/Default/templates/static/images/favicon.ico
+%%DATADIR%%/interfaces/Default/templates/static/stylesheets/default.css
+%%DATADIR%%/interfaces/Plush/LICENSE.txt
+%%DATADIR%%/interfaces/Plush/README.txt
+%%DATADIR%%/interfaces/Plush/templates/config.tmpl
+%%DATADIR%%/interfaces/Plush/templates/config_directories.tmpl
+%%DATADIR%%/interfaces/Plush/templates/config_email.tmpl
+%%DATADIR%%/interfaces/Plush/templates/config_general.tmpl
+%%DATADIR%%/interfaces/Plush/templates/config_rss.tmpl
+%%DATADIR%%/interfaces/Plush/templates/config_scheduling.tmpl
+%%DATADIR%%/interfaces/Plush/templates/config_server.tmpl
+%%DATADIR%%/interfaces/Plush/templates/config_switches.tmpl
+%%DATADIR%%/interfaces/Plush/templates/connection_info.tmpl
+%%DATADIR%%/interfaces/Plush/templates/history.tmpl
+%%DATADIR%%/interfaces/Plush/templates/main.tmpl
+%%DATADIR%%/interfaces/Plush/templates/nzo.tmpl
+%%DATADIR%%/interfaces/Plush/templates/queue.tmpl
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_listing_item_bullet.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_listing_item_bullet_hover.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_listing_item_left.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_listing_table_footer.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_listing_table_footer_bl.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_listing_table_footer_br.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_listing_table_heading.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_listing_table_heading_tl.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_listing_table_heading_tr.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_listing_table_tbody_tr.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_listing_table_tbody_tr_alt.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_listing_table_tbody_tr_hover.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_menu_a_hover.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_optionsMenu.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_progress_bar_empty.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_progress_bar_full.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_refreshSlider.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_subMenu.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_topbar.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_topbar_bottom_border.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_topbar_content.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_topbar_toggle.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_total_progress_bar_empty.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_total_progress_bar_full.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_tr_active.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_tr_failed.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_tr_finished.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/bg_tr_pending.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/config_header.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/favicon.ico
+%%DATADIR%%/interfaces/Plush/templates/static/images/gb_blank.gif
+%%DATADIR%%/interfaces/Plush/templates/static/images/gb_close.gif
+%%DATADIR%%/interfaces/Plush/templates/static/images/gb_overlay.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/h_postprocessing.gif
+%%DATADIR%%/interfaces/Plush/templates/static/images/hv_del.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/hv_join.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/hv_par2.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/hv_unrar.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/hv_unzip.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_config_close.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_config_connections.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_config_directories.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_config_disconnect.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_config_email.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_config_general.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_config_help.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_config_rss.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_config_scheduling.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_config_servers.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_config_switches.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_config_test_email.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_delete.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_delete_hover.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/icon_exclamation.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/nzo_bottom.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/nzo_delete.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/nzo_down.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/nzo_reload.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/nzo_top.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/nzo_up.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/o_refresh_handle.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/o_sidebyside.png
+%%DATADIR%%/interfaces/Plush/templates/static/images/o_topbottom.png
+%%DATADIR%%/interfaces/Plush/templates/static/javascripts/interface.js
+%%DATADIR%%/interfaces/Plush/templates/static/javascripts/jquery-1.2.1.pack.js
+%%DATADIR%%/interfaces/Plush/templates/static/javascripts/jquery.corner.js
+%%DATADIR%%/interfaces/Plush/templates/static/javascripts/plush.js
+%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/plush.css
+%%DATADIR%%/interfaces/smpl/LICENSE.txt
+%%DATADIR%%/interfaces/smpl/README.txt
+%%DATADIR%%/interfaces/smpl/templates/config.tmpl
+%%DATADIR%%/interfaces/smpl/templates/config_directories.tmpl
+%%DATADIR%%/interfaces/smpl/templates/config_email.tmpl
+%%DATADIR%%/interfaces/smpl/templates/config_general.tmpl
+%%DATADIR%%/interfaces/smpl/templates/config_rss.tmpl
+%%DATADIR%%/interfaces/smpl/templates/config_scheduling.tmpl
+%%DATADIR%%/interfaces/smpl/templates/config_server.tmpl
+%%DATADIR%%/interfaces/smpl/templates/config_switches.tmpl
+%%DATADIR%%/interfaces/smpl/templates/connection_info.tmpl
+%%DATADIR%%/interfaces/smpl/templates/default.css
+%%DATADIR%%/interfaces/smpl/templates/history.tmpl
+%%DATADIR%%/interfaces/smpl/templates/main.tmpl
+%%DATADIR%%/interfaces/smpl/templates/nzo.tmpl
+%%DATADIR%%/interfaces/smpl/templates/queue.tmpl
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/Async.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/Base.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/Color.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/DOM.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/DateTime.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/DragAndDrop.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/Format.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/Iter.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/Logging.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/LoggingPane.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/MochiKit.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/MockDOM.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/Position.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/Selector.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/Signal.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/Sortable.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/Style.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/Test.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/Visual.js
+%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/__package__.js
+%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/Base.js
+%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/Canvas.js
+%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/EasyPlot.js
+%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/Layout.js
+%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/PlotKit.js
+%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/PlotKit_Packed.js
+%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/SVG.js
+%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/SweetCanvas.js
+%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/SweetSVG.js
+%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/dummy.svg
+%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/excanvas.js
+%%DATADIR%%/interfaces/smpl/templates/static/excanvas.js
+%%DATADIR%%/interfaces/smpl/templates/static/feed-icon-14x14.png
+%%DATADIR%%/interfaces/smpl/templates/static/images/32px-Crystal_Clear_action_stop.png
+%%DATADIR%%/interfaces/smpl/templates/static/images/ajax-loader.gif
+%%DATADIR%%/interfaces/smpl/templates/static/images/favicon.ico
+%%DATADIR%%/interfaces/smpl/templates/static/sabnzbd_small3.gif
+@dirrm share/sabnzbdplus/interfaces/smpl/templates/static/images
+@dirrm share/sabnzbdplus/interfaces/smpl/templates/static/PlotKit
+@dirrm share/sabnzbdplus/interfaces/smpl/templates/static/MochiKit
+@dirrm share/sabnzbdplus/interfaces/smpl/templates/static
+@dirrm share/sabnzbdplus/interfaces/smpl/templates
+@dirrm share/sabnzbdplus/interfaces/smpl
+@dirrm share/sabnzbdplus/interfaces/Plush/templates/static/stylesheets
+@dirrm share/sabnzbdplus/interfaces/Plush/templates/static/javascripts
+@dirrm share/sabnzbdplus/interfaces/Plush/templates/static/images
+@dirrm share/sabnzbdplus/interfaces/Plush/templates/static
+@dirrm share/sabnzbdplus/interfaces/Plush/templates
+@dirrm share/sabnzbdplus/interfaces/Plush
+@dirrm share/sabnzbdplus/interfaces/Default/templates/static/stylesheets
+@dirrm share/sabnzbdplus/interfaces/Default/templates/static/images
+@dirrm share/sabnzbdplus/interfaces/Default/templates/static
+@dirrm share/sabnzbdplus/interfaces/Default/templates
+@dirrm share/sabnzbdplus/interfaces/Default
+@dirrm share/sabnzbdplus/interfaces
+@dirrm share/sabnzbdplus
 %%PYTHON_SITELIBDIR%%/sabnzbd/__init__.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/__init__.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sabnzbd/articlecache.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/assembler.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/assembler.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/assembler.pyo
 %%PYTHON_SITELIBDIR%%/sabnzbd/constants.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/constants.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/constants.pyo
+%%PYTHON_SITELIBDIR%%/sabnzbd/decoder.py
+%%PYTHON_SITELIBDIR%%/sabnzbd/decorators.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/downloader.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/downloader.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/downloader.pyo
+%%PYTHON_SITELIBDIR%%/sabnzbd/email.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/interface.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/interface.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/interface.pyo
 %%PYTHON_SITELIBDIR%%/sabnzbd/misc.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/misc.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/misc.pyo
-%%PYTHON_SITELIBDIR%%/sabnzbd/rss.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/rss.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/rss.pyo
 %%PYTHON_SITELIBDIR%%/sabnzbd/newsunpack.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/newsunpack.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/newsunpack.pyo
 %%PYTHON_SITELIBDIR%%/sabnzbd/newswrapper.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/newswrapper.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/newswrapper.pyo
 %%PYTHON_SITELIBDIR%%/sabnzbd/nzbgrab.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/nzbgrab.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/nzbgrab.pyo
 %%PYTHON_SITELIBDIR%%/sabnzbd/nzbqueue.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/nzbqueue.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/nzbqueue.pyo
 %%PYTHON_SITELIBDIR%%/sabnzbd/nzbstuff.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/nzbstuff.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/nzbstuff.pyo
+%%PYTHON_SITELIBDIR%%/sabnzbd/rss.py
+%%PYTHON_SITELIBDIR%%/sabnzbd/trylist.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/__init__.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/__init__.pyo
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/configobj.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/configobj.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/configobj.pyo
+%%PYTHON_SITELIBDIR%%/sabnzbd/utils/json.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/kronos.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/kronos.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/kronos.pyo
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/listquote.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/listquote.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/listquote.pyo
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth/__init__.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth/__init__.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth/__init__.pyo
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth/auth.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth/auth.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth/auth.pyo
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth/filter.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth/filter.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth/filter.pyo
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth/providers.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth/providers.pyc
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth/providers.pyo
-share/%%PORTNAME%%/SABnzbd.ini.sample
-share/%%PORTNAME%%/templates/config.tmpl
-share/%%PORTNAME%%/templates/config_directories.tmpl
-share/%%PORTNAME%%/templates/config_general.tmpl
-share/%%PORTNAME%%/templates/config_rss.tmpl
-share/%%PORTNAME%%/templates/config_scheduling.tmpl
-share/%%PORTNAME%%/templates/config_server.tmpl
-share/%%PORTNAME%%/templates/config_switches.tmpl
-share/%%PORTNAME%%/templates/connection_info.tmpl
-share/%%PORTNAME%%/templates/default.css
-share/%%PORTNAME%%/templates/history.tmpl
-share/%%PORTNAME%%/templates/main.tmpl
-share/%%PORTNAME%%/templates/nzo.tmpl
-share/%%PORTNAME%%/templates/placeholder.txt
-share/%%PORTNAME%%/templates/queue.tmpl
-share/%%PORTNAME%%/templates/static/placeholder.txt
+%%PYTHON_SITELIBDIR%%/sabnzbd/utils/rsslib.py
+%%PYTHON_SITELIBDIR%%/sabnzbd/utils/sendEmail.pl
+@dirrm %%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth
+@dirrm %%PYTHON_SITELIBDIR%%/sabnzbd/utils
+@dirrm %%PYTHON_SITELIBDIR%%/sabnzbd/
+@dirrmtry %%PYTHON_SITELIBDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
+%%PORTDOCS%%%%DOCSDIR%%/ISSUES.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADE.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/%%PORTNAME%%/templates/static
-@dirrm share/%%PORTNAME%%/templates
-@dirrm share/%%PORTNAME%%
-@dirrm %%PYTHON_SITELIBDIR%%/sabnzbd/utils/multiauth
-@dirrm %%PYTHON_SITELIBDIR%%/sabnzbd/utils
-@dirrm %%PYTHON_SITELIBDIR%%/sabnzbd