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

Collapse All | Expand All

(-)sabnzbdplus/Makefile (-5 / +5 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	sabnzbdplus
8
PORTNAME=	sabnzbdplus
9
PORTVERSION=	0.6.8
9
PORTVERSION=	0.6.9
10
CATEGORIES=	news
10
CATEGORIES=	news
11
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/sabnzbd-${PORTVERSION}
11
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/sabnzbd-${PORTVERSION}
12
DISTNAME=	SABnzbd-${PORTVERSION}-src
12
DISTNAME=	SABnzbd-${PORTVERSION}-src
Lines 16-25 Link Here
16
16
17
LICENSE=	GPLv2
17
LICENSE=	GPLv2
18
18
19
RUN_DEPENDS=	cheetah:${PORTSDIR}/devel/py-cheetah \
19
RUN_DEPENDS= cheetah:${PORTSDIR}/devel/py-cheetah \
20
		${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2.0:${PORTSDIR}/www/py-cherrypy \
20
   ${PYTHON_SITELIBDIR}/pythonutils/configobj.py:${PORTSDIR}/devel/py-utils \
21
		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:${PORTSDIR}/devel/py-utils \
21
   ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
22
		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
23
22
24
USE_PYTHON=	2.5+
23
USE_PYTHON=	2.5+
25
24
Lines 75-80 Link Here
75
	${INSTALL} -d  ${PYTHONPREFIX_SITELIBDIR}/
74
	${INSTALL} -d  ${PYTHONPREFIX_SITELIBDIR}/
76
	${CP} -rp ${WRKSRC}/sabnzbd ${PYTHONPREFIX_SITELIBDIR}/
75
	${CP} -rp ${WRKSRC}/sabnzbd ${PYTHONPREFIX_SITELIBDIR}/
77
	${INSTALL} -d ${DATADIR}
76
	${INSTALL} -d ${DATADIR}
77
	${CP} -rp ${WRKSRC}/cherrypy ${DATADIR}
78
	${CP} -rp ${WRKSRC}/interfaces ${DATADIR}
78
	${CP} -rp ${WRKSRC}/interfaces ${DATADIR}
79
	${CP} -rp ${WRKSRC}/locale ${DATADIR}
79
	${CP} -rp ${WRKSRC}/locale ${DATADIR}
80
	${CP} -rp ${WRKSRC}/po ${DATADIR}
80
	${CP} -rp ${WRKSRC}/po ${DATADIR}
(-)sabnzbdplus/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (SABnzbd-0.6.8-src.tar.gz) = 43b57e5e435e6af884f930fee6dc8993e443c407ab83eb0e289c20c88323dc27
1
SHA256 (SABnzbd-0.6.9-src.tar.gz) = 2c304daf22ffc68c8b77819a9e12322473cf245e6f66de314ee85ed830e24fe9
2
SIZE (SABnzbd-0.6.8-src.tar.gz) = 1900995
2
SIZE (SABnzbd-0.6.9-src.tar.gz) = 1936582
(-)sabnzbdplus/files/patch-SABnzbd.py (-3 / +13 lines)
Lines 1-6 Link Here
1
--- SABnzbd.py	2011-07-26 14:57:12.000000000 -0400
1
--- SABnzbd.py.orig	2011-09-10 05:04:42.000000000 -0400
2
+++ SABnzbd.py.new	2011-08-01 22:47:35.614282615 -0400
2
+++ SABnzbd.py	2011-09-14 23:17:08.387342710 -0400
3
@@ -928,7 +928,7 @@
3
@@ -40,6 +40,9 @@
4
     print "The Python module Cheetah is required"
5
     sys.exit(1)
6
 
7
+# Force python to load the patched version of cherrypy included with the port,
8
+# instead of any version that may be installed otherwise.
9
+sys.path.insert(0,%%PREFIX%%)
10
 import cherrypy
11
 if not cherrypy.__version__.startswith("3.2"):
12
     print "Sorry, requires Python module Cherrypy 3.2 (use the included version)"
13
@@ -932,7 +935,7 @@
4
 
14
 
5
     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))
6
     sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME)
16
     sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME)
(-)sabnzbdplus/files/sabnzbd.in (-15 / +39 lines)
Lines 6-24 Link Here
6
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
6
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
7
# to enable this service:
7
# to enable this service:
8
#
8
#
9
# sabnzbd_enable (bool):	Set to NO by default.
9
# sabnzbd_enable (bool):        Set to NO by default.
10
#			Set it to YES to enable it.
10
#                       Set it to YES to enable it.
11
# sabnzbd_conf_dir:	Directory where sabnzbd configuration
11
# sabnzbd_conf_dir:     Directory where sabnzbd configuration
12
#			data is stored.
12
#                       data is stored.
13
#			Default: %%PREFIX%%/sabnzbd
13
#                       Default: %%PREFIX%%/sabnzbd
14
# sabnzbd_user:	    	The user account sabnzbd daemon runs as what
14
# sabnzbd_user:         The user account sabnzbd daemon runs as what
15
#			you want it to be. It uses '_sabnzbd' user by
15
#                       you want it to be. It uses '_sabnzbd' user by
16
#			default. Do not sets it as empty or it will run
16
#                       default. Do not sets it as empty or it will run
17
#			as root.
17
#                       as root.
18
# sabnzbd_group:    	The group account sabnzbd daemon runs as what
18
# sabnzbd_group:        The group account sabnzbd daemon runs as what
19
#			you want it to be. It uses '_sabnzbd' group by
19
#                       you want it to be. It uses '_sabnzbd' group by
20
#			default. Do not sets it as empty or it will run
20
#                       default. Do not sets it as empty or it will run
21
#			as wheel.
21
#                       as wheel.
22
22
23
. /etc/rc.subr
23
. /etc/rc.subr
24
24
Lines 34-45 Link Here
34
34
35
required_dirs=${sabnzbd_conf_dir}
35
required_dirs=${sabnzbd_conf_dir}
36
36
37
start_cmd="${name}_start"
38
#start_postcmd="${name}_poststart"
37
status_cmd="${name}_status"
39
status_cmd="${name}_status"
38
stop_cmd="${name}_stop"
40
stop_cmd="${name}_stop"
39
start_precmd=sabnzbd_check_dir
41
start_precmd=sabnzbd_check_dir
40
42
41
command="/usr/sbin/daemon"
43
42
command_args="-f %%PREFIX%%/bin/SABnzbd.py ${sabnzbd_flags} --daemon -b 0 -w 0 -l 0 -f ${sabnzbd_conf_dir}"
44
45
sabnzbd_start()
46
{
47
if [ ! -f "${sabnzbd_pid}" ]; then
48
    su -m ${sabnzbd_user} -c "%%PREFIX%%/bin/SABnzbd.py --daemon -f ${sabnzbd_conf_dir}/sabnzbd.ini"
49
    echo "Starting ${name}."
50
else
51
    GETPROCESSPID=`/bin/ps -auxw | /usr/bin/awk '/SABnzbd.py/ && !/awk/ && !/sh/ {print $2}'`
52
    PIDFROMFILE=`cat ${sabnzbd_pid}`
53
    if [ "$GETPROCESSPID" = "$PIDFROMFILE" ]; then
54
        echo "${name} already running with PID: ${PIDFROMFILE} ?"
55
        echo "Remove ${sabnzbd_pid} manually if needed."
56
    else
57
        rm -f ${sabnzbd_pid}
58
        su -m ${sabnzbd_user} -c "%%PREFIX%%/bin/SABnzbd.py --daemon -f ${sabnzbd_conf_dir}/sabnzbd.ini"
59
        echo "Starting ${name}."
60
    fi
61
fi
62
}
63
64
#sabnzbd_poststart() {
65
#  echo `/bin/ps -auxw | /usr/bin/awk '/SABnzbd.py/ && !/awk/ {print $2}'` > $sabnzbd_pid
66
#}
43
67
44
# SABnzbd can only be cleanly stopped by calling the http api
68
# SABnzbd can only be cleanly stopped by calling the http api
45
sabnzbd_stop() {
69
sabnzbd_stop() {
(-)sabnzbdplus/pkg-plist (-3 / +48 lines)
Lines 48-53 Link Here
48
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/upload.py
48
%%PYTHON_SITELIBDIR%%/sabnzbd/utils/upload.py
49
%%PYTHON_SITELIBDIR%%/sabnzbd/version.py
49
%%PYTHON_SITELIBDIR%%/sabnzbd/version.py
50
%%PYTHON_SITELIBDIR%%/sabnzbd/wizard.py
50
%%PYTHON_SITELIBDIR%%/sabnzbd/wizard.py
51
%%PORTDOCS%%%%DOCSDIR%%/ABOUT.txt
51
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
52
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
52
%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.txt
53
%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.txt
53
%%PORTDOCS%%%%DOCSDIR%%/GPL2.txt
54
%%PORTDOCS%%%%DOCSDIR%%/GPL2.txt
Lines 67-72 Link Here
67
%%PORTDOCS%%%%DOCSDIR%%/License-rsslib.txt
68
%%PORTDOCS%%%%DOCSDIR%%/License-rsslib.txt
68
%%PORTDOCS%%%%DOCSDIR%%/License-ssmtplib.txt
69
%%PORTDOCS%%%%DOCSDIR%%/License-ssmtplib.txt
69
%%PORTDOCS%%%%DOCSDIR%%/README.txt
70
%%PORTDOCS%%%%DOCSDIR%%/README.txt
71
%%DATADIR%%/cherrypy/LICENSE.txt
72
%%DATADIR%%/cherrypy/VERSION.txt
73
%%DATADIR%%/cherrypy/__init__.py
74
%%DATADIR%%/cherrypy/_cpcgifs.py
75
%%DATADIR%%/cherrypy/_cpchecker.py
76
%%DATADIR%%/cherrypy/_cpconfig.py
77
%%DATADIR%%/cherrypy/_cpdispatch.py
78
%%DATADIR%%/cherrypy/_cperror.py
79
%%DATADIR%%/cherrypy/_cplogging.py
80
%%DATADIR%%/cherrypy/_cpmodpy.py
81
%%DATADIR%%/cherrypy/_cprequest.py
82
%%DATADIR%%/cherrypy/_cpserver.py
83
%%DATADIR%%/cherrypy/_cpthreadinglocal.py
84
%%DATADIR%%/cherrypy/_cptools.py
85
%%DATADIR%%/cherrypy/_cptree.py
86
%%DATADIR%%/cherrypy/_cpwsgi.py
87
%%DATADIR%%/cherrypy/_cpwsgi_server.py
88
%%DATADIR%%/cherrypy/cherryd
89
%%DATADIR%%/cherrypy/favicon.ico
90
%%DATADIR%%/cherrypy/lib/__init__.py
91
%%DATADIR%%/cherrypy/lib/auth.py
92
%%DATADIR%%/cherrypy/lib/caching.py
93
%%DATADIR%%/cherrypy/lib/covercp.py
94
%%DATADIR%%/cherrypy/lib/cptools.py
95
%%DATADIR%%/cherrypy/lib/encoding.py
96
%%DATADIR%%/cherrypy/lib/http.py
97
%%DATADIR%%/cherrypy/lib/httpauth.py
98
%%DATADIR%%/cherrypy/lib/profiler.py
99
%%DATADIR%%/cherrypy/lib/safemime.py
100
%%DATADIR%%/cherrypy/lib/sessions.py
101
%%DATADIR%%/cherrypy/lib/static.py
102
%%DATADIR%%/cherrypy/lib/tidy.py
103
%%DATADIR%%/cherrypy/lib/wsgiapp.py
104
%%DATADIR%%/cherrypy/lib/xmlrpc.py
105
%%DATADIR%%/cherrypy/process/__init__.py
106
%%DATADIR%%/cherrypy/process/plugins.py
107
%%DATADIR%%/cherrypy/process/servers.py
108
%%DATADIR%%/cherrypy/process/win32.py
109
%%DATADIR%%/cherrypy/process/wspbus.py
110
%%DATADIR%%/cherrypy/wsgiserver/__init__.py
70
%%DATADIR%%/interfaces/Classic/README.TXT
111
%%DATADIR%%/interfaces/Classic/README.TXT
71
%%DATADIR%%/interfaces/Classic/templates/config.tmpl
112
%%DATADIR%%/interfaces/Classic/templates/config.tmpl
72
%%DATADIR%%/interfaces/Classic/templates/config_cat.tmpl
113
%%DATADIR%%/interfaces/Classic/templates/config_cat.tmpl
Lines 210-216 Link Here
210
%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-icons_70b2e1_256x240.png
251
%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-icons_70b2e1_256x240.png
211
%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-icons_999999_256x240.png
252
%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-icons_999999_256x240.png
212
%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-icons_fbc856_256x240.png
253
%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/images/ui-icons_fbc856_256x240.png
213
%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/jquery-ui-1.8.9.custom.css
254
%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/jqueryui/overcast/jquery-ui-1.8.15.custom.css
214
%%DATADIR%%/interfaces/smpl/CreativeCommons2-5.txt
255
%%DATADIR%%/interfaces/smpl/CreativeCommons2-5.txt
215
%%DATADIR%%/interfaces/smpl/CreativeCommons3-0.txt
256
%%DATADIR%%/interfaces/smpl/CreativeCommons3-0.txt
216
%%DATADIR%%/interfaces/smpl/GPL2.txt
257
%%DATADIR%%/interfaces/smpl/GPL2.txt
Lines 397-406 Link Here
397
@dirrm %%DATADIR%%/interfaces/Classic/templates
438
@dirrm %%DATADIR%%/interfaces/Classic/templates
398
@dirrm %%DATADIR%%/interfaces/Classic
439
@dirrm %%DATADIR%%/interfaces/Classic
399
@dirrm %%DATADIR%%/interfaces
440
@dirrm %%DATADIR%%/interfaces
441
@dirrm %%DATADIR%%/cherrypy/wsgiserver
442
@dirrm %%DATADIR%%/cherrypy/process
443
@dirrm %%DATADIR%%/cherrypy/lib
444
@dirrm %%DATADIR%%/cherrypy
400
@dirrm %%DATADIR%%
445
@dirrm %%DATADIR%%
401
%%PORTDOCS%%@dirrm %%DOCSDIR%%
446
%%PORTDOCS%%@dirrm %%DOCSDIR%%
402
@dirrmtry sabnzbd
447
@dirrmtry sabnzbd
403
@dirrmtry %%PYTHON_SITELIBDIR%%/sabnzbd/utils
448
@dirrm %%PYTHON_SITELIBDIR%%/sabnzbd/utils
404
@dirrmtry %%PYTHON_SITELIBDIR%%/sabnzbd
449
@dirrm %%PYTHON_SITELIBDIR%%/sabnzbd
405
@dirrmtry %%PYTHON_SITELIBDIR%%
450
@dirrmtry %%PYTHON_SITELIBDIR%%
406
@exec mkdir -p %D/sabnzbd
451
@exec mkdir -p %D/sabnzbd

Return to bug 160710