View | Details | Raw Unified | Return to bug 248525 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-10 / +12 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	sabnzbdplus
3
PORTNAME=	sabnzbdplus
4
PORTVERSION=	2.3.9
4
DISTVERSION=	3.0.0Alpha1
5
CATEGORIES=	news
5
CATEGORIES=	news
6
6
7
MAINTAINER=	joshruehlig@gmail.com
7
MAINTAINER=	joshruehlig@gmail.com
Lines 10-24 Link Here
10
LICENSE=	BSD2CLAUSE BSD3CLAUSE GPLv2+ ISCL MIT PSFL
10
LICENSE=	BSD2CLAUSE BSD3CLAUSE GPLv2+ ISCL MIT PSFL
11
LICENSE_COMB=	multi
11
LICENSE_COMB=	multi
12
12
13
DEPRECATED=	Uses deprecated version of python
13
RUN_DEPENDS=	cheetah:devel/py-cheetah3@${PY_FLAVOR} \
14
EXPIRATION_DATE=	2020-09-15
14
		${PYTHON_SITELIBDIR}/configobj.py:devel/py-configobj@${PY_FLAVOR} \
15
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
16
		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
17
		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
18
		${PYTHON_PKGNAMEPREFIX}portend>=0:net/py-portend@${PY_FLAVOR} \
19
		${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${PY_FLAVOR}
20
		
15
21
16
RUN_DEPENDS=	cheetah:devel/py-cheetah@${PY_FLAVOR} \
22
USES=		python shebangfix
17
		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:devel/py-utils@${PY_FLAVOR} \
18
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
19
23
20
USES=		python:2.7 shebangfix
21
22
USE_GITHUB=	yes
24
USE_GITHUB=	yes
23
GH_ACCOUNT=	sabnzbd
25
GH_ACCOUNT=	sabnzbd
24
GH_PROJECT=	sabnzbd
26
GH_PROJECT=	sabnzbd
Lines 48-54 Link Here
48
50
49
PAR2CMDLINE_RUN_DEPENDS=	par2repair:archivers/par2cmdline-tbb
51
PAR2CMDLINE_RUN_DEPENDS=	par2repair:archivers/par2cmdline-tbb
50
FEEDPARSER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR}
52
FEEDPARSER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR}
51
YENC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sabyenc>=3.3.1:news/py-sabyenc@${PY_FLAVOR}
53
YENC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sabyenc3>=3.3.1:news/py-sabyenc3@${PY_FLAVOR}
52
SSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR}
54
SSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR}
53
UNRAR_RUN_DEPENDS=	unrar:archivers/unrar
55
UNRAR_RUN_DEPENDS=	unrar:archivers/unrar
54
7ZIP_RUN_DEPENDS=	7za:archivers/p7zip
56
7ZIP_RUN_DEPENDS=	7za:archivers/p7zip
Lines 66-72 Link Here
66
	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd
68
	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd
67
	cd ${WRKSRC}/sabnzbd && ${COPYTREE_SHARE} \* ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd
69
	cd ${WRKSRC}/sabnzbd && ${COPYTREE_SHARE} \* ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd
68
	@${MKDIR} ${STAGEDIR}${DATADIR}
70
	@${MKDIR} ${STAGEDIR}${DATADIR}
69
.for i in cherrypy gntp interfaces locale po tools util
71
.for i in interfaces locale po tools util
70
	@${MKDIR} ${STAGEDIR}${DATADIR}/${i}
72
	@${MKDIR} ${STAGEDIR}${DATADIR}/${i}
71
	cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${i}
73
	cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${i}
72
.endfor
74
.endfor
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1559445969
1
TIMESTAMP = 1588092653
2
SHA256 (sabnzbd-sabnzbd-2.3.9_GH0.tar.gz) = e5071e66e06e9d10f5d04695cb63aba3e77b0c89deb6dd0f80246218d7940b3c
2
SHA256 (sabnzbd-sabnzbd-3.0.0Alpha1_GH0.tar.gz) = 9bdf7771e8c810a54c988bde0b7ff471584da8ae163ad0e5c564fb5e6426e4bb
3
SIZE (sabnzbd-sabnzbd-2.3.9_GH0.tar.gz) = 4610937
3
SIZE (sabnzbd-sabnzbd-3.0.0Alpha1_GH0.tar.gz) = 4219576
(-)files/patch-SABnzbd.py (-11 / +11 lines)
Lines 1-17 Link Here
1
--- SABnzbd.py.orig	2016-06-04 11:45:01 UTC
1
--- SABnzbd.py.orig	2020-04-28 18:33:05 UTC
2
+++ SABnzbd.py
2
+++ SABnzbd.py
3
@@ -51,6 +51,9 @@ except:
3
@@ -39,6 +39,9 @@ try:
4
     print "The Python module Cheetah is required"
4
     import six
5
     sys.exit(1)
5
     import feedparser
6
 
6
     import configobj
7
+# Force python to load the patched version of cherrypy included with the port,
7
+# Force python to load the patched version of cherrypy included with the port,
8
+# instead of any version that may be installed otherwise.
8
+# instead of any version that may be installed otherwise.
9
+sys.path.insert(0,%%DATADIR%%)
9
+    sys.path.insert(0,%%DATADIR%%)
10
 import cherrypy
10
     import cherrypy
11
 if [int(n) for n in cherrypy.__version__.split('.')] < [3, 8, 0]:
11
     import portend
12
     print 'Sorry, requires Python module Cherrypy 3.8.0+ (use the included version)'
12
     import cryptography
13
@@ -1006,7 +1009,7 @@ def main():
13
@@ -883,7 +886,7 @@ def main():
14
             
14
 
15
     sabnzbd.MY_FULLNAME = os.path.normpath(os.path.abspath(sabnzbd.MY_FULLNAME))
15
     sabnzbd.MY_FULLNAME = os.path.normpath(os.path.abspath(sabnzbd.MY_FULLNAME))
16
     sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME)
16
     sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME)
17
-    sabnzbd.DIR_PROG = os.path.dirname(sabnzbd.MY_FULLNAME)
17
-    sabnzbd.DIR_PROG = os.path.dirname(sabnzbd.MY_FULLNAME)
(-)pkg-plist (-100 / +6 lines)
Lines 15-20 Link Here
15
%%PYTHON_SITELIBDIR%%/sabnzbd/downloader.py
15
%%PYTHON_SITELIBDIR%%/sabnzbd/downloader.py
16
%%PYTHON_SITELIBDIR%%/sabnzbd/emailer.py
16
%%PYTHON_SITELIBDIR%%/sabnzbd/emailer.py
17
%%PYTHON_SITELIBDIR%%/sabnzbd/encoding.py
17
%%PYTHON_SITELIBDIR%%/sabnzbd/encoding.py
18
%%PYTHON_SITELIBDIR%%/sabnzbd/filesystem.py
18
%%PYTHON_SITELIBDIR%%/sabnzbd/getipaddress.py
19
%%PYTHON_SITELIBDIR%%/sabnzbd/getipaddress.py
19
%%PYTHON_SITELIBDIR%%/sabnzbd/interface.py
20
%%PYTHON_SITELIBDIR%%/sabnzbd/interface.py
20
%%PYTHON_SITELIBDIR%%/sabnzbd/lang.py
21
%%PYTHON_SITELIBDIR%%/sabnzbd/lang.py
Lines 22-27 Link Here
22
%%PYTHON_SITELIBDIR%%/sabnzbd/newsunpack.py
23
%%PYTHON_SITELIBDIR%%/sabnzbd/newsunpack.py
23
%%PYTHON_SITELIBDIR%%/sabnzbd/newswrapper.py
24
%%PYTHON_SITELIBDIR%%/sabnzbd/newswrapper.py
24
%%PYTHON_SITELIBDIR%%/sabnzbd/notifier.py
25
%%PYTHON_SITELIBDIR%%/sabnzbd/notifier.py
26
%%PYTHON_SITELIBDIR%%/sabnzbd/nzbparser.py
25
%%PYTHON_SITELIBDIR%%/sabnzbd/nzbqueue.py
27
%%PYTHON_SITELIBDIR%%/sabnzbd/nzbqueue.py
26
%%PYTHON_SITELIBDIR%%/sabnzbd/nzbstuff.py
28
%%PYTHON_SITELIBDIR%%/sabnzbd/nzbstuff.py
27
%%PYTHON_SITELIBDIR%%/sabnzbd/osxmenu.py
29
%%PYTHON_SITELIBDIR%%/sabnzbd/osxmenu.py
Lines 40-120 Link Here
40
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/__init__.py
42
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/__init__.py
41
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/certgen.py
43
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/certgen.py
42
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/checkdir.py
44
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/checkdir.py
43
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/configobj.py
44
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/diskspeed.py
45
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/diskspeed.py
45
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/feedparser.py
46
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/getperformance.py
46
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/getperformance.py
47
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/happyeyeballs.py
47
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/happyeyeballs.py
48
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/json.py
48
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/internetspeed.py
49
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/kronos.py
49
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/kronos.py
50
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/pathbrowser.py
50
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/pathbrowser.py
51
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/pybonjour.py
51
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/pybonjour.py
52
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/pystone.py
52
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/pystone.py
53
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/rarfile.py
53
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/rarfile.py
54
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/rsslib.py
54
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/rarvolinfo.py
55
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/servertests.py
55
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/servertests.py
56
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/sleepless.py
56
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/systrayiconthread.py
57
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/systrayiconthread.py
57
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/upload.py
58
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/upload.py
58
%%PYTHON_SITELIBDIR%%/sabnzbd/version.py
59
%%PYTHON_SITELIBDIR%%/sabnzbd/version.py
59
%%PYTHON_SITELIBDIR%%/sabnzbd/zconfig.py
60
%%PYTHON_SITELIBDIR%%/sabnzbd/zconfig.py
60
%%DATADIR%%/cherrypy/VERSION.txt
61
%%DATADIR%%/cherrypy/__init__.py
62
%%DATADIR%%/cherrypy/__main__.py
63
%%DATADIR%%/cherrypy/_cpchecker.py
64
%%DATADIR%%/cherrypy/_cpcompat.py
65
%%DATADIR%%/cherrypy/_cpconfig.py
66
%%DATADIR%%/cherrypy/_cpdispatch.py
67
%%DATADIR%%/cherrypy/_cperror.py
68
%%DATADIR%%/cherrypy/_cplogging.py
69
%%DATADIR%%/cherrypy/_cpmodpy.py
70
%%DATADIR%%/cherrypy/_cpnative_server.py
71
%%DATADIR%%/cherrypy/_cpreqbody.py
72
%%DATADIR%%/cherrypy/_cprequest.py
73
%%DATADIR%%/cherrypy/_cpserver.py
74
%%DATADIR%%/cherrypy/_cptools.py
75
%%DATADIR%%/cherrypy/_cptree.py
76
%%DATADIR%%/cherrypy/_cpwsgi.py
77
%%DATADIR%%/cherrypy/_cpwsgi_server.py
78
%%DATADIR%%/cherrypy/_helper.py
79
%%DATADIR%%/cherrypy/cherryd
80
%%DATADIR%%/cherrypy/daemon.py
81
%%DATADIR%%/cherrypy/favicon.ico
82
%%DATADIR%%/cherrypy/lib/__init__.py
83
%%DATADIR%%/cherrypy/lib/auth.py
84
%%DATADIR%%/cherrypy/lib/auth_basic.py
85
%%DATADIR%%/cherrypy/lib/auth_digest.py
86
%%DATADIR%%/cherrypy/lib/caching.py
87
%%DATADIR%%/cherrypy/lib/covercp.py
88
%%DATADIR%%/cherrypy/lib/cpstats.py
89
%%DATADIR%%/cherrypy/lib/cptools.py
90
%%DATADIR%%/cherrypy/lib/encoding.py
91
%%DATADIR%%/cherrypy/lib/gctools.py
92
%%DATADIR%%/cherrypy/lib/httpauth.py
93
%%DATADIR%%/cherrypy/lib/httputil.py
94
%%DATADIR%%/cherrypy/lib/jsontools.py
95
%%DATADIR%%/cherrypy/lib/lockfile.py
96
%%DATADIR%%/cherrypy/lib/locking.py
97
%%DATADIR%%/cherrypy/lib/profiler.py
98
%%DATADIR%%/cherrypy/lib/reprconf.py
99
%%DATADIR%%/cherrypy/lib/sessions.py
100
%%DATADIR%%/cherrypy/lib/static.py
101
%%DATADIR%%/cherrypy/lib/xmlrpcutil.py
102
%%DATADIR%%/cherrypy/process/__init__.py
103
%%DATADIR%%/cherrypy/process/plugins.py
104
%%DATADIR%%/cherrypy/process/servers.py
105
%%DATADIR%%/cherrypy/process/win32.py
106
%%DATADIR%%/cherrypy/process/wspbus.py
107
%%DATADIR%%/cherrypy/wsgiserver/__init__.py
108
%%DATADIR%%/cherrypy/wsgiserver/ssl_builtin.py
109
%%DATADIR%%/cherrypy/wsgiserver/ssl_pyopenssl.py
110
%%DATADIR%%/gntp/__init__.py
111
%%DATADIR%%/gntp/cli.py
112
%%DATADIR%%/gntp/config.py
113
%%DATADIR%%/gntp/core.py
114
%%DATADIR%%/gntp/errors.py
115
%%DATADIR%%/gntp/notifier.py
116
%%DATADIR%%/gntp/shim.py
117
%%DATADIR%%/gntp/version.py
118
%%DATADIR%%/interfaces/Config/README.txt
61
%%DATADIR%%/interfaces/Config/README.txt
119
%%DATADIR%%/interfaces/Config/templates/_inc_footer_uc.tmpl
62
%%DATADIR%%/interfaces/Config/templates/_inc_footer_uc.tmpl
120
%%DATADIR%%/interfaces/Config/templates/_inc_header_uc.tmpl
63
%%DATADIR%%/interfaces/Config/templates/_inc_header_uc.tmpl
Lines 271-314 Link Here
271
%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/rateit/rateit.css
214
%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/rateit/rateit.css
272
%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/rateit/star.gif
215
%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/rateit/star.gif
273
%%DATADIR%%/interfaces/Plush/templates/status.tmpl
216
%%DATADIR%%/interfaces/Plush/templates/status.tmpl
274
%%DATADIR%%/interfaces/smpl/CreativeCommons2-5.txt
275
%%DATADIR%%/interfaces/smpl/CreativeCommons3-0.txt
276
%%DATADIR%%/interfaces/smpl/GPL2.txt
277
%%DATADIR%%/interfaces/smpl/GPL3.txt
278
%%DATADIR%%/interfaces/smpl/LICENCE-silk_icons.txt
279
%%DATADIR%%/interfaces/smpl/LICENSE.txt
280
%%DATADIR%%/interfaces/smpl/License-ExCanvas.txt
281
%%DATADIR%%/interfaces/smpl/License-MochiKit.txt
282
%%DATADIR%%/interfaces/smpl/License-Nuvola.txt
283
%%DATADIR%%/interfaces/smpl/License-PlotKit.txt
284
%%DATADIR%%/interfaces/smpl/License-getElementPosition.txt
285
%%DATADIR%%/interfaces/smpl/README.txt
286
%%DATADIR%%/interfaces/smpl/templates/history.tmpl
287
%%DATADIR%%/interfaces/smpl/templates/main.tmpl
288
%%DATADIR%%/interfaces/smpl/templates/nzo.tmpl
289
%%DATADIR%%/interfaces/smpl/templates/queue.tmpl
290
%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/MochiKit.js
291
%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/__package__.js
292
%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/PlotKit.js
293
%%DATADIR%%/interfaces/smpl/templates/static/excanvas/excanvas.js
294
%%DATADIR%%/interfaces/smpl/templates/static/feed-icon-14x14.png
295
%%DATADIR%%/interfaces/smpl/templates/static/images/browser.png
296
%%DATADIR%%/interfaces/smpl/templates/static/images/bullet_arrow_down.png
297
%%DATADIR%%/interfaces/smpl/templates/static/images/control_pause.png
298
%%DATADIR%%/interfaces/smpl/templates/static/images/control_play.png
299
%%DATADIR%%/interfaces/smpl/templates/static/images/down.gif
300
%%DATADIR%%/interfaces/smpl/templates/static/images/drive.png
301
%%DATADIR%%/interfaces/smpl/templates/static/images/drive_go.png
302
%%DATADIR%%/interfaces/smpl/templates/static/images/favicon.ico
303
%%DATADIR%%/interfaces/smpl/templates/static/images/key_enter.png
304
%%DATADIR%%/interfaces/smpl/templates/static/images/messagebox_critical.png
305
%%DATADIR%%/interfaces/smpl/templates/static/images/nuvola/kgpg.png
306
%%DATADIR%%/interfaces/smpl/templates/static/images/up.gif
307
%%DATADIR%%/interfaces/smpl/templates/static/sabnzbd_small4.png
308
%%DATADIR%%/interfaces/smpl/templates/static/stylesheets/colorschemes/black.css
309
%%DATADIR%%/interfaces/smpl/templates/static/stylesheets/colorschemes/white.css
310
%%DATADIR%%/interfaces/smpl/templates/static/stylesheets/smpl.css
311
%%DATADIR%%/interfaces/smpl/templates/status.tmpl
312
%%DATADIR%%/interfaces/wizard/README.TXT
217
%%DATADIR%%/interfaces/wizard/README.TXT
313
%%DATADIR%%/interfaces/wizard/inc_bottom.tmpl
218
%%DATADIR%%/interfaces/wizard/inc_bottom.tmpl
314
%%DATADIR%%/interfaces/wizard/inc_top.tmpl
219
%%DATADIR%%/interfaces/wizard/inc_top.tmpl
Lines 387-392 Link Here
387
%%DATADIR%%/tools/extract_pot.py
292
%%DATADIR%%/tools/extract_pot.py
388
%%DATADIR%%/tools/make_mo.py
293
%%DATADIR%%/tools/make_mo.py
389
%%DATADIR%%/tools/msgfmt.py
294
%%DATADIR%%/tools/msgfmt.py
295
%%DATADIR%%/tools/pygettext.py
390
%%DATADIR%%/util/__init__.py
296
%%DATADIR%%/util/__init__.py
391
%%DATADIR%%/util/apireg.py
297
%%DATADIR%%/util/apireg.py
392
%%DATADIR%%/util/mailslot.py
298
%%DATADIR%%/util/mailslot.py

Return to bug 248525