Attachment 167850 Details for Bug 207583 – new/sabnzbdplus patch

[patch] new/sabnzbdplus patch

sabnzbdplus.patch (text/plain), 4.39 KB, created by joshruehlig on 2016-03-08 12:03:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joshruehlig

Created: 2016-03-08 12:03:34 UTC

Size: 4.39 KB

patch

obsolete

>diff -urN sabnzbdplus-orig/Makefile sabnzbdplus/Makefile
>--- sabnzbdplus-orig/Makefile	2016-02-28 08:14:42.742171692 -0800
>+++ sabnzbdplus/Makefile	2016-03-08 03:12:04.294987880 -0800
>@@ -16,12 +16,12 @@
> 		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:${PORTSDIR}/devel/py-utils \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
> 
>-USES=		gettext python
>+USES=		gettext python:2.5-2.7
> 
> NO_BUILD=	yes
> WRKSRC=		${WRKDIR}/SABnzbd-${PORTVERSION}
> PLIST_SUB=	PORTNAME=${PORTNAME}
>-SUB_LIST+=	PORTNAME=${PORTNAME} PYTHON_CMD=${PYTHON_CMD}
>+SUB_LIST=	PORTNAME=${PORTNAME} PYTHON_CMD=${PYTHON_CMD}
> SUB_FILES=	pkg-message
> USE_RC_SUBR=	sabnzbd
> 
>@@ -44,30 +44,16 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${PORT_OPTIONS:MPAR2CMDLINE}
>-RUN_DEPENDS+=	par2repair:${PORTSDIR}/archivers/par2cmdline-tbb
>-.endif
>-
>-.if ${PORT_OPTIONS:MFEEDPARSER}
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}feedparser>=0:${PORTSDIR}/textproc/py-feedparser
>-.endif
>-
>-.if ${PORT_OPTIONS:MYENC}
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}yenc>=0:${PORTSDIR}/news/py-yenc
>-.endif
>-
>-.if ${PORT_OPTIONS:MOPENSSL}
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl
>-.endif
>-
>-.if ${PORT_OPTIONS:MUNRAR}
>-RUN_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
>-.endif
>+PAR2CMDLINE_RUN_DEPENDS=	par2repair:${PORTSDIR}/archivers/par2cmdline-tbb
>+FEEDPARSER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=0:${PORTSDIR}/textproc/py-feedparser
>+YENC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yenc>=0:${PORTSDIR}/news/py-yenc
>+OPENSSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl
>+UNRAR_RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
> 
> post-patch:
> 	@${REINPLACE_CMD} -e "s:/usr/bin/python:${PYTHON_CMD}:g" \
> 		 ${WRKSRC}/SABnzbd.py
>-	@${REINPLACE_CMD} -e "s:%%PREFIX%%:'${DATADIR}':g" \
>+	@${REINPLACE_CMD} -e "s:%%DATADIR%%:'${DATADIR}':g" \
> 		 ${WRKSRC}/SABnzbd.py
> 
> # the NO_BUILD option stops execution after configure. This should really be
>@@ -77,7 +63,6 @@
> 	${INSTALL} -d ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd
> 	cd ${WRKSRC}/sabnzbd && ${COPYTREE_SHARE} \* ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd
> 	${INSTALL} -d ${STAGEDIR}${DATADIR}
>-	${INSTALL} -d ${STAGEDIR}${PREFIX}/sabnzbd
> .for i in cherrypy gntp interfaces locale po tools util
> 	${MKDIR} ${STAGEDIR}${DATADIR}/${i}
> 	cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${i}
>@@ -86,7 +71,7 @@
> .if ${PORT_OPTIONS:MDOCS}
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for i in ${PORTDOCS}
>-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
> .endfor
> .endif
> 
>diff -urN sabnzbdplus-orig/files/patch-SABnzbd.py sabnzbdplus/files/patch-SABnzbd.py
>--- sabnzbdplus-orig/files/patch-SABnzbd.py	2016-02-28 08:14:42.677575816 -0800
>+++ sabnzbdplus/files/patch-SABnzbd.py	2016-03-08 02:58:50.032988098 -0800
>@@ -6,7 +6,7 @@
>  
> +# 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,%%PREFIX%%)
>++sys.path.insert(0,%%DATADIR%%)
>  import cherrypy
>  if not cherrypy.__version__.startswith("3.2"):
>      print "Sorry, requires Python module Cherrypy 3.2 (use the included version)"
>@@ -15,7 +15,7 @@
>      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)
>-+    sabnzbd.DIR_PROG = %%PREFIX%%
>++    sabnzbd.DIR_PROG = %%DATADIR%%
>      sabnzbd.DIR_INTERFACES = real_path(sabnzbd.DIR_PROG, DEF_INTERFACES)
>      sabnzbd.DIR_LANGUAGE = real_path(sabnzbd.DIR_PROG, DEF_LANGUAGE)
>      org_dir = os.getcwd()
>diff -urN sabnzbdplus-orig/files/sabnzbd.in sabnzbdplus/files/sabnzbd.in
>--- sabnzbdplus-orig/files/sabnzbd.in	2016-02-28 08:14:42.630364278 -0800
>+++ sabnzbdplus/files/sabnzbd.in	2016-02-28 09:52:02.141989771 -0800
>@@ -46,7 +46,6 @@
> 
> sabnzbd_prestart()
> {
>-	PATH=${PATH}:/usr/local/bin:/usr/local/sbin
> 	for sabdir in ${sabnzbd_conf_dir} ${pidfile%/*}; do
> 		if [ ! -d "${sabdir}" ]; then
> 			install -d -o ${sabnzbd_user} -g ${sabnzbd_group} ${sabdir}
>diff -urN sabnzbdplus-orig/pkg-plist sabnzbdplus/pkg-plist
>--- sabnzbdplus-orig/pkg-plist	2016-02-28 08:14:42.767623752 -0800
>+++ sabnzbdplus/pkg-plist	2016-03-08 02:57:43.498988122 -0800
>@@ -422,4 +422,3 @@
> %%DATADIR%%/util/apireg.py
> %%DATADIR%%/util/mailslot.py
> %%DATADIR%%/util/pystone.py
>-@dir(_sabnzbd,_sabnzbd,755) sabnzbd

Actions: View | Diff

Attachments on bug 207583: 167552 | 167664 | 167848 | 167850