Index: branches/2016Q3/net-p2p/deluge/Makefile =================================================================== --- branches/2016Q3/net-p2p/deluge/Makefile (revision 419145) +++ branches/2016Q3/net-p2p/deluge/Makefile (revision 419146) @@ -1,84 +1,79 @@ # $FreeBSD$ PORTNAME= deluge -PORTVERSION= 1.3.12 +PORTVERSION= 1.3.13 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 tar:lzma twisted:run,web +USES= gettext python:2.7 tar:xz twisted:run,web USE_PYTHON= autoplist distutils -USE_OPENSSL= yes -OPTIONS_DEFINE= GTK2 +OPTIONS_DEFINE= DOCS GTK2 OPTIONS_DEFAULT=GTK2 OPTIONS_SUB= yes -PORTDOCS= ChangeLog README - -.include - -.if ${PORT_OPTIONS:MGTK2} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus \ +GTK2_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 -USE_GNOME+= intltool librsvg2 pygnome2 pygtk2 -USES+= desktop-file-utils -INSTALLS_ICONS= yes -.endif +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 - @${REINPLACE_CMD} -e 's|GTK|GTK;|' \ - ${WRKSRC}/deluge/data/share/applications/deluge.desktop.in 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 -.if ${PORT_OPTIONS:MGTK2} - ${INSTALL_DATA} ${WRKSRC}/deluge/data/share/applications/deluge.desktop \ - ${STAGEDIR}${PREFIX}/share/applications -.endif - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} # 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} .include Index: branches/2016Q3/net-p2p/deluge/distinfo =================================================================== --- branches/2016Q3/net-p2p/deluge/distinfo (revision 419145) +++ branches/2016Q3/net-p2p/deluge/distinfo (revision 419146) @@ -1,2 +1,3 @@ -SHA256 (deluge-1.3.12.tar.lzma) = eb875724a8f52ac36c3890bdcee9f77c648ef03b6375387af5c26d5229fdc65e -SIZE (deluge-1.3.12.tar.lzma) = 1449148 +TIMESTAMP = 1469200565 +SHA256 (deluge-1.3.13.tar.xz) = fe8059a66834abd656693a8736b0829cb3342bb803c55384abad3756097d394e +SIZE (deluge-1.3.13.tar.xz) = 1460948 Index: branches/2016Q3/net-p2p/deluge/files/deluge_web.in =================================================================== --- branches/2016Q3/net-p2p/deluge/files/deluge_web.in (revision 419145) +++ branches/2016Q3/net-p2p/deluge/files/deluge_web.in (revision 419146) @@ -1,76 +1,82 @@ #!/bin/sh # $FreeBSD$ # # 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" Index: branches/2016Q3/net-p2p/deluge/files/patch-setup.py =================================================================== --- branches/2016Q3/net-p2p/deluge/files/patch-setup.py (revision 419145) +++ branches/2016Q3/net-p2p/deluge/files/patch-setup.py (revision 419146) @@ -1,44 +1,18 @@ ---- setup.py.orig 2015-09-13 20:32:11 UTC +--- setup.py.orig 2016-07-20 14:23:28 UTC +++ setup.py -@@ -216,6 +216,8 @@ except ImportError: +@@ -215,6 +215,7 @@ except ImportError: + build_libtorrent = True else: build_libtorrent = False - +build_libtorrent = False -+ + if build_libtorrent: got_libtorrent = False - if not os.path.exists("libtorrent"): -@@ -490,31 +492,7 @@ cmdclass = { - # Data files to be installed to the system. - _data_files = [] - if not windows_check(): -- _data_files = [ -- ('share/icons/hicolor/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']), -- ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']), -- ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']), -- ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']), -- ('share/icons/hicolor/22x22/apps', ['deluge/data/icons/hicolor/22x22/apps/deluge.png']), -- ('share/icons/hicolor/24x24/apps', ['deluge/data/icons/hicolor/24x24/apps/deluge.png']), -- ('share/icons/hicolor/256x256/apps', ['deluge/data/icons/hicolor/256x256/apps/deluge.png']), -- ('share/icons/hicolor/32x32/apps', ['deluge/data/icons/hicolor/32x32/apps/deluge.png']), -- ('share/icons/hicolor/36x36/apps', ['deluge/data/icons/hicolor/36x36/apps/deluge.png']), -- ('share/icons/hicolor/48x48/apps', ['deluge/data/icons/hicolor/48x48/apps/deluge.png']), -- ('share/icons/hicolor/64x64/apps', ['deluge/data/icons/hicolor/64x64/apps/deluge.png']), -- ('share/icons/hicolor/72x72/apps', ['deluge/data/icons/hicolor/72x72/apps/deluge.png']), -- ('share/icons/hicolor/96x96/apps', ['deluge/data/icons/hicolor/96x96/apps/deluge.png']), -- ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']), -- ('share/man/man1', [ -- 'docs/man/deluge.1', -- 'docs/man/deluged.1', -- 'docs/man/deluge-gtk.1', -- 'docs/man/deluge-web.1', -- 'docs/man/deluge-console.1']) -- ] -- -- if os.path.exists(desktop_data): -- _data_files.append(('share/applications', [desktop_data])) +@@ -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": [ Index: branches/2016Q3 =================================================================== --- branches/2016Q3 (revision 419145) +++ branches/2016Q3 (revision 419146) Property changes on: branches/2016Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r418935