Index: Makefile =================================================================== --- Makefile (revision 533410) +++ Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= sabnzbdplus -PORTVERSION= 2.3.9 +DISTVERSION= 3.0.0Alpha1 CATEGORIES= news MAINTAINER= joshruehlig@gmail.com @@ -10,15 +10,17 @@ LICENSE= BSD2CLAUSE BSD3CLAUSE GPLv2+ ISCL MIT PSFL LICENSE_COMB= multi -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 +RUN_DEPENDS= cheetah:devel/py-cheetah3@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/configobj.py:devel/py-configobj@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}portend>=0:net/py-portend@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${PY_FLAVOR} + -RUN_DEPENDS= cheetah:devel/py-cheetah@${PY_FLAVOR} \ - ${PYTHON_SITELIBDIR}/pythonutils/configobj.py:devel/py-utils@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} +USES= python shebangfix -USES= python:2.7 shebangfix - USE_GITHUB= yes GH_ACCOUNT= sabnzbd GH_PROJECT= sabnzbd @@ -48,7 +50,7 @@ PAR2CMDLINE_RUN_DEPENDS= par2repair:archivers/par2cmdline-tbb FEEDPARSER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR} -YENC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sabyenc>=3.3.1:news/py-sabyenc@${PY_FLAVOR} +YENC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sabyenc3>=3.3.1:news/py-sabyenc3@${PY_FLAVOR} SSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} UNRAR_RUN_DEPENDS= unrar:archivers/unrar 7ZIP_RUN_DEPENDS= 7za:archivers/p7zip @@ -66,7 +68,7 @@ @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd cd ${WRKSRC}/sabnzbd && ${COPYTREE_SHARE} \* ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd @${MKDIR} ${STAGEDIR}${DATADIR} -.for i in cherrypy gntp interfaces locale po tools util +.for i in interfaces locale po tools util @${MKDIR} ${STAGEDIR}${DATADIR}/${i} cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${i} .endfor Index: distinfo =================================================================== --- distinfo (revision 533410) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1559445969 -SHA256 (sabnzbd-sabnzbd-2.3.9_GH0.tar.gz) = e5071e66e06e9d10f5d04695cb63aba3e77b0c89deb6dd0f80246218d7940b3c -SIZE (sabnzbd-sabnzbd-2.3.9_GH0.tar.gz) = 4610937 +TIMESTAMP = 1588092653 +SHA256 (sabnzbd-sabnzbd-3.0.0Alpha1_GH0.tar.gz) = 9bdf7771e8c810a54c988bde0b7ff471584da8ae163ad0e5c564fb5e6426e4bb +SIZE (sabnzbd-sabnzbd-3.0.0Alpha1_GH0.tar.gz) = 4219576 Index: files/patch-SABnzbd.py =================================================================== --- files/patch-SABnzbd.py (revision 533410) +++ files/patch-SABnzbd.py (working copy) @@ -1,17 +1,17 @@ ---- SABnzbd.py.orig 2016-06-04 11:45:01 UTC +--- SABnzbd.py.orig 2020-04-28 18:33:05 UTC +++ SABnzbd.py -@@ -51,6 +51,9 @@ except: - print "The Python module Cheetah is required" - sys.exit(1) - +@@ -39,6 +39,9 @@ try: + import six + import feedparser + import configobj +# Force python to load the patched version of cherrypy included with the port, +# instead of any version that may be installed otherwise. -+sys.path.insert(0,%%DATADIR%%) - import cherrypy - if [int(n) for n in cherrypy.__version__.split('.')] < [3, 8, 0]: - print 'Sorry, requires Python module Cherrypy 3.8.0+ (use the included version)' -@@ -1006,7 +1009,7 @@ def main(): - ++ sys.path.insert(0,%%DATADIR%%) + import cherrypy + import portend + import cryptography +@@ -883,7 +886,7 @@ def main(): + sabnzbd.MY_FULLNAME = os.path.normpath(os.path.abspath(sabnzbd.MY_FULLNAME)) sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME) - sabnzbd.DIR_PROG = os.path.dirname(sabnzbd.MY_FULLNAME) Index: pkg-plist =================================================================== --- pkg-plist (revision 533410) +++ pkg-plist (working copy) @@ -15,6 +15,7 @@ %%PYTHON_SITELIBDIR%%/sabnzbd/downloader.py %%PYTHON_SITELIBDIR%%/sabnzbd/emailer.py %%PYTHON_SITELIBDIR%%/sabnzbd/encoding.py +%%PYTHON_SITELIBDIR%%/sabnzbd/filesystem.py %%PYTHON_SITELIBDIR%%/sabnzbd/getipaddress.py %%PYTHON_SITELIBDIR%%/sabnzbd/interface.py %%PYTHON_SITELIBDIR%%/sabnzbd/lang.py @@ -22,6 +23,7 @@ %%PYTHON_SITELIBDIR%%/sabnzbd/newsunpack.py %%PYTHON_SITELIBDIR%%/sabnzbd/newswrapper.py %%PYTHON_SITELIBDIR%%/sabnzbd/notifier.py +%%PYTHON_SITELIBDIR%%/sabnzbd/nzbparser.py %%PYTHON_SITELIBDIR%%/sabnzbd/nzbqueue.py %%PYTHON_SITELIBDIR%%/sabnzbd/nzbstuff.py %%PYTHON_SITELIBDIR%%/sabnzbd/osxmenu.py @@ -40,81 +42,22 @@ %%PYTHON_SITELIBDIR%%/sabnzbd/utils/__init__.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/certgen.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/checkdir.py -%%PYTHON_SITELIBDIR%%/sabnzbd/utils/configobj.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/diskspeed.py -%%PYTHON_SITELIBDIR%%/sabnzbd/utils/feedparser.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/getperformance.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/happyeyeballs.py -%%PYTHON_SITELIBDIR%%/sabnzbd/utils/json.py +%%PYTHON_SITELIBDIR%%/sabnzbd/utils/internetspeed.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/kronos.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/pathbrowser.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/pybonjour.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/pystone.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/rarfile.py -%%PYTHON_SITELIBDIR%%/sabnzbd/utils/rsslib.py +%%PYTHON_SITELIBDIR%%/sabnzbd/utils/rarvolinfo.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/servertests.py +%%PYTHON_SITELIBDIR%%/sabnzbd/utils/sleepless.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/systrayiconthread.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/upload.py %%PYTHON_SITELIBDIR%%/sabnzbd/version.py %%PYTHON_SITELIBDIR%%/sabnzbd/zconfig.py -%%DATADIR%%/cherrypy/VERSION.txt -%%DATADIR%%/cherrypy/__init__.py -%%DATADIR%%/cherrypy/__main__.py -%%DATADIR%%/cherrypy/_cpchecker.py -%%DATADIR%%/cherrypy/_cpcompat.py -%%DATADIR%%/cherrypy/_cpconfig.py -%%DATADIR%%/cherrypy/_cpdispatch.py -%%DATADIR%%/cherrypy/_cperror.py -%%DATADIR%%/cherrypy/_cplogging.py -%%DATADIR%%/cherrypy/_cpmodpy.py -%%DATADIR%%/cherrypy/_cpnative_server.py -%%DATADIR%%/cherrypy/_cpreqbody.py -%%DATADIR%%/cherrypy/_cprequest.py -%%DATADIR%%/cherrypy/_cpserver.py -%%DATADIR%%/cherrypy/_cptools.py -%%DATADIR%%/cherrypy/_cptree.py -%%DATADIR%%/cherrypy/_cpwsgi.py -%%DATADIR%%/cherrypy/_cpwsgi_server.py -%%DATADIR%%/cherrypy/_helper.py -%%DATADIR%%/cherrypy/cherryd -%%DATADIR%%/cherrypy/daemon.py -%%DATADIR%%/cherrypy/favicon.ico -%%DATADIR%%/cherrypy/lib/__init__.py -%%DATADIR%%/cherrypy/lib/auth.py -%%DATADIR%%/cherrypy/lib/auth_basic.py -%%DATADIR%%/cherrypy/lib/auth_digest.py -%%DATADIR%%/cherrypy/lib/caching.py -%%DATADIR%%/cherrypy/lib/covercp.py -%%DATADIR%%/cherrypy/lib/cpstats.py -%%DATADIR%%/cherrypy/lib/cptools.py -%%DATADIR%%/cherrypy/lib/encoding.py -%%DATADIR%%/cherrypy/lib/gctools.py -%%DATADIR%%/cherrypy/lib/httpauth.py -%%DATADIR%%/cherrypy/lib/httputil.py -%%DATADIR%%/cherrypy/lib/jsontools.py -%%DATADIR%%/cherrypy/lib/lockfile.py -%%DATADIR%%/cherrypy/lib/locking.py -%%DATADIR%%/cherrypy/lib/profiler.py -%%DATADIR%%/cherrypy/lib/reprconf.py -%%DATADIR%%/cherrypy/lib/sessions.py -%%DATADIR%%/cherrypy/lib/static.py -%%DATADIR%%/cherrypy/lib/xmlrpcutil.py -%%DATADIR%%/cherrypy/process/__init__.py -%%DATADIR%%/cherrypy/process/plugins.py -%%DATADIR%%/cherrypy/process/servers.py -%%DATADIR%%/cherrypy/process/win32.py -%%DATADIR%%/cherrypy/process/wspbus.py -%%DATADIR%%/cherrypy/wsgiserver/__init__.py -%%DATADIR%%/cherrypy/wsgiserver/ssl_builtin.py -%%DATADIR%%/cherrypy/wsgiserver/ssl_pyopenssl.py -%%DATADIR%%/gntp/__init__.py -%%DATADIR%%/gntp/cli.py -%%DATADIR%%/gntp/config.py -%%DATADIR%%/gntp/core.py -%%DATADIR%%/gntp/errors.py -%%DATADIR%%/gntp/notifier.py -%%DATADIR%%/gntp/shim.py -%%DATADIR%%/gntp/version.py %%DATADIR%%/interfaces/Config/README.txt %%DATADIR%%/interfaces/Config/templates/_inc_footer_uc.tmpl %%DATADIR%%/interfaces/Config/templates/_inc_header_uc.tmpl @@ -271,44 +214,6 @@ %%DATADIR%%/interfaces/Plush/templates/static/stylesheets/rateit/rateit.css %%DATADIR%%/interfaces/Plush/templates/static/stylesheets/rateit/star.gif %%DATADIR%%/interfaces/Plush/templates/status.tmpl -%%DATADIR%%/interfaces/smpl/CreativeCommons2-5.txt -%%DATADIR%%/interfaces/smpl/CreativeCommons3-0.txt -%%DATADIR%%/interfaces/smpl/GPL2.txt -%%DATADIR%%/interfaces/smpl/GPL3.txt -%%DATADIR%%/interfaces/smpl/LICENCE-silk_icons.txt -%%DATADIR%%/interfaces/smpl/LICENSE.txt -%%DATADIR%%/interfaces/smpl/License-ExCanvas.txt -%%DATADIR%%/interfaces/smpl/License-MochiKit.txt -%%DATADIR%%/interfaces/smpl/License-Nuvola.txt -%%DATADIR%%/interfaces/smpl/License-PlotKit.txt -%%DATADIR%%/interfaces/smpl/License-getElementPosition.txt -%%DATADIR%%/interfaces/smpl/README.txt -%%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/MochiKit.js -%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/__package__.js -%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/PlotKit.js -%%DATADIR%%/interfaces/smpl/templates/static/excanvas/excanvas.js -%%DATADIR%%/interfaces/smpl/templates/static/feed-icon-14x14.png -%%DATADIR%%/interfaces/smpl/templates/static/images/browser.png -%%DATADIR%%/interfaces/smpl/templates/static/images/bullet_arrow_down.png -%%DATADIR%%/interfaces/smpl/templates/static/images/control_pause.png -%%DATADIR%%/interfaces/smpl/templates/static/images/control_play.png -%%DATADIR%%/interfaces/smpl/templates/static/images/down.gif -%%DATADIR%%/interfaces/smpl/templates/static/images/drive.png -%%DATADIR%%/interfaces/smpl/templates/static/images/drive_go.png -%%DATADIR%%/interfaces/smpl/templates/static/images/favicon.ico -%%DATADIR%%/interfaces/smpl/templates/static/images/key_enter.png -%%DATADIR%%/interfaces/smpl/templates/static/images/messagebox_critical.png -%%DATADIR%%/interfaces/smpl/templates/static/images/nuvola/kgpg.png -%%DATADIR%%/interfaces/smpl/templates/static/images/up.gif -%%DATADIR%%/interfaces/smpl/templates/static/sabnzbd_small4.png -%%DATADIR%%/interfaces/smpl/templates/static/stylesheets/colorschemes/black.css -%%DATADIR%%/interfaces/smpl/templates/static/stylesheets/colorschemes/white.css -%%DATADIR%%/interfaces/smpl/templates/static/stylesheets/smpl.css -%%DATADIR%%/interfaces/smpl/templates/status.tmpl %%DATADIR%%/interfaces/wizard/README.TXT %%DATADIR%%/interfaces/wizard/inc_bottom.tmpl %%DATADIR%%/interfaces/wizard/inc_top.tmpl @@ -387,6 +292,7 @@ %%DATADIR%%/tools/extract_pot.py %%DATADIR%%/tools/make_mo.py %%DATADIR%%/tools/msgfmt.py +%%DATADIR%%/tools/pygettext.py %%DATADIR%%/util/__init__.py %%DATADIR%%/util/apireg.py %%DATADIR%%/util/mailslot.py