From d2f4806d977525cfa48c12a9bb1a43066aff06e1 Mon Sep 17 00:00:00 2001 From: DPorts Builder Date: Fri, 4 Nov 2016 10:26:47 -0700 Subject: [PATCH] Update net-p2p/deluge to version 1.3.13_1,1 --- net-p2p/deluge/Makefile | 69 ++---------- net-p2p/deluge/distinfo | 3 - net-p2p/deluge/files/deluge_web.in | 82 -------------- net-p2p/deluge/files/deluged.in | 81 -------------- .../deluge/files/patch-deluge_core_core.py | 14 --- net-p2p/deluge/files/patch-setup.py | 18 ---- net-p2p/deluge/pkg-plist | 100 ------------------ 7 files changed, 6 insertions(+), 361 deletions(-) delete mode 100644 net-p2p/deluge/distinfo delete mode 100644 net-p2p/deluge/files/deluge_web.in delete mode 100644 net-p2p/deluge/files/deluged.in delete mode 100644 net-p2p/deluge/files/patch-deluge_core_core.py delete mode 100644 net-p2p/deluge/files/patch-setup.py delete mode 100644 net-p2p/deluge/pkg-plist diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile index 848364020a4..cd772e3b567 100644 --- a/net-p2p/deluge/Makefile +++ b/net-p2p/deluge/Makefile @@ -2,78 +2,21 @@ PORTNAME= deluge PORTVERSION= 1.3.13 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-p2p python -MASTER_SITES= http://download.deluge-torrent.org/source/ MAINTAINER= rm@FreeBSD.org COMMENT= Bittorrent client using Python, GTK2, and libtorrent-rasterbar LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg \ - ${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:net-p2p/libtorrent-rasterbar-python \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet \ - ${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako - -USE_RC_SUBR= deluged deluge_web -SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} - -NO_ARCH= yes -USES= gettext python:2.7 tar:xz twisted:run,web -USE_PYTHON= autoplist distutils - -OPTIONS_DEFINE= DOCS GTK2 -OPTIONS_DEFAULT=GTK2 -OPTIONS_SUB= yes - -GTK2_RUN_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus \ ${PYTHON_PKGNAMEPREFIX}game>=1.8.1:devel/py-game \ ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify \ - xdg-utils>=1.0.2:devel/xdg-utils -GTK2_USE= gnome=intltool,librsvg2,pygnome2,pygtk2 -GTK2_USES= desktop-file-utils -GTK2_VARS= installs_icons=yes - -PORTDOCS= ChangeLog README - -post-patch: - @${REINPLACE_CMD} -e '/"new_release_check":/s|True,|False,|g ; \ - /"geoip_db_location":/s|/usr/share/GeoIP/GeoIP.dat|${LOCALBASE}/share/GeoIP/GeoIP.dat|g' \ - ${WRKSRC}/deluge/core/preferencesmanager.py - @${REINPLACE_CMD} -e '/"check_new_releases":/s|True,|False,|g ; \ - /"show_new_releases":/s|True,|False,|g' \ - ${WRKSRC}/deluge/ui/gtkui/gtkui.py - -post-install: -# do these by hand, else they wind up in the wrong place - @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ; \ - ${INSTALL_DATA} ${WRKSRC}/deluge/data/icons/scalable/apps/deluge.svg \ - ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps -.for size in 16 22 24 32 36 48 64 72 96 128 192 256 - @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps ; \ - ${INSTALL_DATA} ${WRKSRC}/deluge/data/icons/hicolor/${size}x${size}/apps/deluge.png \ - ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps -.endfor -.for pic in png xpm - ${INSTALL_DATA} ${WRKSRC}/deluge/data/pixmaps/deluge.${pic} \ - ${STAGEDIR}${PREFIX}/share/pixmaps -.endfor - -# install man pages -.for man in deluge.1 deluge-console.1 deluge-gtk.1 deluge-web.1 deluged.1 - ${INSTALL_MAN} ${WRKSRC}/docs/man/${man} ${STAGEDIR}${MANPREFIX}/man/man1/ -.endfor - -post-install-GTK2-on: - ${INSTALL_DATA} ${WRKSRC}/deluge/data/share/applications/deluge.desktop \ - ${STAGEDIR}${PREFIX}/share/applications - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + xdg-utils>=1.0.2:devel/xdg-utils \ + deluge:net-p2p/deluge-cli +USE_GNOME= librsvg2 pygtk2 +USES= python:-2.7 metaport .include diff --git a/net-p2p/deluge/distinfo b/net-p2p/deluge/distinfo deleted file mode 100644 index 0b23eeba0e2..00000000000 --- a/net-p2p/deluge/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1469200565 -SHA256 (deluge-1.3.13.tar.xz) = fe8059a66834abd656693a8736b0829cb3342bb803c55384abad3756097d394e -SIZE (deluge-1.3.13.tar.xz) = 1460948 diff --git a/net-p2p/deluge/files/deluge_web.in b/net-p2p/deluge/files/deluge_web.in deleted file mode 100644 index eebbc41dc12..00000000000 --- a/net-p2p/deluge/files/deluge_web.in +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh - -# $FreeBSD: head/net-p2p/deluge/files/deluge_web.in 418935 2016-07-22 20:49:47Z rm $ -# -# PROVIDE: deluge_web -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# MANDATORY: -# -# deluge_web_enable (bool): Set to NO by default. -# Set it to YES to enable deluge_web. -# -# deluge_web_user (str): The UNPRIVILEGED user to run as -# -# OPTIONAL: -# -# deluge_web_flags (str): Set as needed -# See deluge-web(1) for more information -# -# deluge_web_confdir (path): Set to /home/$deluge_web_user/.config/deluge -# by default -# -# deluge_web_loglevel (str): Set to "error" by default -# -# deluge_web_logfile (path): Set to /var/tmp/deluge_web.log by default - -. /etc/rc.subr - -name="deluge_web" -rcvar=${name}_enable - -command=%%PREFIX%%/bin/deluge-web -command_interpreter=%%PYTHON_CMD%% - -start_precmd=${name}_prestart -stop_postcmd=${name}_poststop - -deluge_web_prestart() -{ - if [ "$deluge_web_user" = 'asjklasdfjklasdf' ]; then - err 1 "You must set deluge_web_user to a real, unprivileged user" - fi - - if [ ! -d "/var/run/${name}" ]; then - if [ -e "/var/run/${name}" ]; then - unlink /var/run/${name} - fi - mkdir -p /var/run/${name} - fi - - if [ ! -d "/home/${deluge_web_user}/.python-eggs" ]; then - mkdir -p /home/${deluge_web_user}/.python-eggs - fi - - chmod 0755 /var/run/${name} - chown -R $deluge_web_user /var/run/${name} - chown -R $deluge_web_user /home/${deluge_web_user}/.python-eggs - export PYTHON_EGG_CACHE="/home/${deluge_web_user}/.python-eggs" -} - -deluge_web_poststop() -{ - [ -e "$deluge_web_logfile" -a ! -s "$deluge_web_logfile" ] && - unlink $deluge_web_logfile -} - -load_rc_config $name - -: ${deluge_web_enable:="NO"} -: ${deluge_web_user:="asjklasdfjklasdf"} -: ${deluge_web_confdir:="/home/${deluge_web_user}/.config/deluge"} -: ${deluge_web_loglevel:="error"} -: ${deluge_web_logfile:="/var/tmp/${name}.log"} - -required_dirs="$deluge_web_confdir" -command_args="-f -c $required_dirs -L $deluge_web_loglevel -l $deluge_web_logfile" - -run_rc_command "$1" diff --git a/net-p2p/deluge/files/deluged.in b/net-p2p/deluge/files/deluged.in deleted file mode 100644 index ba121e63d4b..00000000000 --- a/net-p2p/deluge/files/deluged.in +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -# $FreeBSD: head/net-p2p/deluge/files/deluged.in 340872 2014-01-24 00:14:07Z mat $ -# -# PROVIDE: deluged -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# MANDATORY: -# -# deluged_enable (bool): Set to NO by default. -# Set it to YES to enable deluged. -# -# deluged_user (str): The UNPRIVILEGED user to run as -# -# OPTIONAL: -# -# deluged_flags (str): Set as needed -# See deluged(1) for more information -# -# deluged_confdir (path): Set to /home/$deluged_user/.config/deluge -# by default -# -# deluged_loglevel (str): Set to "error" by default -# -# deluged_logfile (path): Set to /var/tmp/deluged.log by default - -. /etc/rc.subr - -name="deluged" -rcvar=deluged_enable - -command=%%PREFIX%%/bin/${name} -command_interpreter=%%PYTHON_CMD%% - -pidfile=/var/run/${name}/pid - -start_precmd=${name}_prestart -stop_postcmd=${name}_poststop - -deluged_prestart() -{ - if [ "$deluged_user" = 'asjklasdfjklasdf' ]; then - err 1 "You must set deluged_user to a real, unprivileged user" - fi - - if [ ! -d "/var/run/${name}" ]; then - if [ -e "/var/run/${name}" ]; then - unlink /var/run/${name} - fi - mkdir -p /var/run/${name} - fi - - chmod 0755 /var/run/${name} - chown -R $deluged_user /var/run/${name} -} - -deluged_poststop() -{ - [ -e "$pidfile" ] && unlink $pidfile - [ -d "${pidfile%/pid}" ] && rmdir ${pidfile%/pid} - - [ -e "$deluged_logfile" -a ! -s "$deluged_logfile" ] && - unlink $deluged_logfile -} - -load_rc_config $name - -: ${deluged_enable:="NO"} -: ${deluged_user:="asjklasdfjklasdf"} -: ${deluged_confdir:="/home/${deluged_user}/.config/deluge"} -: ${deluged_loglevel:="error"} -: ${deluged_logfile:="/var/tmp/${name}.log"} - -required_dirs="$deluged_confdir" -command_args="-c $required_dirs -L $deluged_loglevel -l $deluged_logfile -P $pidfile" - -run_rc_command "$1" diff --git a/net-p2p/deluge/files/patch-deluge_core_core.py b/net-p2p/deluge/files/patch-deluge_core_core.py deleted file mode 100644 index d7b2e29ba71..00000000000 --- a/net-p2p/deluge/files/patch-deluge_core_core.py +++ /dev/null @@ -1,14 +0,0 @@ -This patch fixes upload rate speed problem discussed here: -http://forum.deluge-torrent.org/viewtopic.php?f=7&t=33839 - ---- deluge/core/core.py.orig 2014-07-09 19:08:22 UTC -+++ deluge/core/core.py -@@ -93,7 +93,7 @@ - self.__load_session_state() - - # Set the user agent -- self.settings = lt.session_settings() -+ self.settings = lt.high_performance_seed() - self.settings.user_agent = "Deluge %s" % deluge.common.get_version() - # Increase the alert queue size so that alerts don't get lost - self.settings.alert_queue_size = 10000 diff --git a/net-p2p/deluge/files/patch-setup.py b/net-p2p/deluge/files/patch-setup.py deleted file mode 100644 index d177e179580..00000000000 --- a/net-p2p/deluge/files/patch-setup.py +++ /dev/null @@ -1,18 +0,0 @@ ---- setup.py.orig 2016-07-20 14:23:28 UTC -+++ setup.py -@@ -215,6 +215,7 @@ except ImportError: - build_libtorrent = True - else: - build_libtorrent = False -+build_libtorrent = False - - if build_libtorrent: - got_libtorrent = False -@@ -515,6 +516,7 @@ if not windows_check() and not osx_check - - if os.path.exists(desktop_data): - _data_files.append(('share/applications', [desktop_data])) -+ _data_files = [] - - entry_points = { - "console_scripts": [ diff --git a/net-p2p/deluge/pkg-plist b/net-p2p/deluge/pkg-plist deleted file mode 100644 index 339458fd904..00000000000 --- a/net-p2p/deluge/pkg-plist +++ /dev/null @@ -1,100 +0,0 @@ -%%PYTHON_SITELIBDIR%%/deluge/i18n/af/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ar/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ast/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/be/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/bg/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/bn/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/bs/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ca/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/cs/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/cy/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/da/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/de/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/el/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/en_AU/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/en_CA/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/en_GB/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/eo/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/es/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/et/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/eu/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/fa/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/fi/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/fo/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/fr/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/fy/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ga/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/gl/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/he/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/hi/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/hr/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/hu/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/id/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/is/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/it/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/iu/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ja/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ka/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/kk/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/km/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/kn/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ko/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ku/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ky/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/la/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/lb/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/lt/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/lv/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/mk/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ml/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ms/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/nap/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/nb/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/nds/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/nl/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/nn/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/oc/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/pl/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/pms/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/pt/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/pt_BR/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ro/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ru/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/si/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/sk/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/sl/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/sr/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/sv/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ta/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/te/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/th/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/tl/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/tlh/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/tr/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/uk/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/ur/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/vi/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/zh_CN/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/zh_HK/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/deluge/i18n/zh_TW/LC_MESSAGES/deluge.mo -man/man1/deluge.1.gz -man/man1/deluge-console.1.gz -man/man1/deluge-gtk.1.gz -man/man1/deluge-web.1.gz -man/man1/deluged.1.gz -%%GTK2%%share/applications/deluge.desktop -share/icons/hicolor/128x128/apps/deluge.png -share/icons/hicolor/16x16/apps/deluge.png -share/icons/hicolor/192x192/apps/deluge.png -share/icons/hicolor/22x22/apps/deluge.png -share/icons/hicolor/24x24/apps/deluge.png -share/icons/hicolor/256x256/apps/deluge.png -share/icons/hicolor/32x32/apps/deluge.png -share/icons/hicolor/36x36/apps/deluge.png -share/icons/hicolor/48x48/apps/deluge.png -share/icons/hicolor/64x64/apps/deluge.png -share/icons/hicolor/72x72/apps/deluge.png -share/icons/hicolor/96x96/apps/deluge.png -share/icons/hicolor/scalable/apps/deluge.svg -share/pixmaps/deluge.png -share/pixmaps/deluge.xpm -- 2.41.0