sabnzbd: some cleanups.

This commit is contained in:
Olaf Seibert 2020-02-27 23:17:57 +01:00
parent 73d4a3aaf3
commit 1c46799c0a
3 changed files with 11 additions and 11 deletions

View File

@ -4,20 +4,20 @@ DISTNAME= sabnzbd-${DISTVERSION}
DISTVERSION= 2.3.9
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_GITHUB:=sabnzbd/}
GITHUB_PROJECT= sabnzbd
GITHUB_PROJECT= sabnzbd
GITHUB_TAG= ${DISTVERSION}
MAINTAINER= rhialto@NetBSD.org
HOMEPAGE= https://sabnzbd.org
HOMEPAGE= https://sabnzbd.org/
COMMENT= Web-interface based binary newsgrabber in python, with nzb support
LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND modified-bsd AND mit
DEPENDS+= ${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
DEPENDS+= ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-sabyenc-[0-9]*:../../wip/py-sabyenc
DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
# DEPENDS+= ${PYPKGPREFIX}-configobj-[0-9]*:../../devel/py-configobj #??
# DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 #??
# DEPENDS+= ${PYPKGPREFIX}-xml-[0-9]*:../../textproc/py-xml #??
# in options.mk
@ -26,10 +26,10 @@ DEPENDS+= ${PYPKGPREFIX}-sabyenc-[0-9]*:../../wip/py-sabyenc
DEPENDS+= unzip-[0-9]*:../../archivers/unzip
DEPENDS+= p7zip-[0-9]*:../../archivers/p7zip
NO_BUILD= yes
#PYDISTUTILSPKG=YES
USE_TOOLS= pax git
USE_LANGUAGES+= c
NO_BUILD= yes
#PYDISTUTILSPKG= YES
USE_TOOLS= pax
USE_LANGUAGES+= c
PYTHON_VERSIONS_ACCEPTED= 27 # py-cheetah, py-xml
@ -50,7 +50,7 @@ SUBST_CLASSES+= fix-paths
SUBST_STAGE.fix-paths= pre-configure
SUBST_MESSAGE.fix-paths= Fix absolute paths.
SUBST_FILES.fix-paths= SABnzbd.py
SUBST_SED.fix-paths= -e 's,%%PREFIX%%,${PREFIX},g'
SUBST_VARS.fix-paths= PREFIX
do-install:
${MKDIR} ${DESTDIR}/${PREFIX}/bin

View File

@ -4,4 +4,4 @@ SHA1 (sabnzbd-2.3.9.tar.gz) = eec095bdc51ab745c42fa45523cfb2bde35531f5
RMD160 (sabnzbd-2.3.9.tar.gz) = 2de2968a60b07a4f766a5cf9ecf07976753f85bf
SHA512 (sabnzbd-2.3.9.tar.gz) = d555bd2c61d075d9bd181bc9f8f7958be2edc63cb3543fd6630aba3ff2487ad936ce061078477bf32dc191c746fe4d2fb96de1ce26f3ac631a6848fbe8efe18f
Size (sabnzbd-2.3.9.tar.gz) = 4610937 bytes
SHA1 (patch-SABnzbd.py) = 7a80fb565ca7ca178c25ee752276c48904af03d5
SHA1 (patch-SABnzbd.py) = 7b6de86e427e7a17c9e3ca7bf0928dfe59953c02

View File

@ -10,7 +10,7 @@ Fix path.
+# 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%%/share/sabnzbd')
+sys.path.insert(0,'@PREFIX@/share/sabnzbd')
+
try:
import Cheetah
@ -21,7 +21,7 @@ Fix path.
sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME)
- sabnzbd.DIR_PROG = os.path.dirname(sabnzbd.MY_FULLNAME)
+ # sabnzbd.DIR_PROG = os.path.dirname(sabnzbd.MY_FULLNAME)
+ sabnzbd.DIR_PROG = "%%PREFIX%%/share/sabnzbd"
+ sabnzbd.DIR_PROG = "@PREFIX@/share/sabnzbd"
sabnzbd.DIR_INTERFACES = real_path(sabnzbd.DIR_PROG, DEF_INTERFACES)
sabnzbd.DIR_LANGUAGE = real_path(sabnzbd.DIR_PROG, DEF_LANGUAGE)
org_dir = os.getcwd()