diff options
| -rw-r--r-- | net-p2p/deluge/Makefile | 44 | ||||
| -rw-r--r-- | net-p2p/deluge/distinfo | 4 | ||||
| -rw-r--r-- | net-p2p/deluge/files/patch-setup.py | 23 | ||||
| -rw-r--r-- | net-p2p/deluge/pkg-plist | 27 |
4 files changed, 50 insertions, 48 deletions
diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile index 16f86faec1b9..73d6fa9a81f0 100644 --- a/net-p2p/deluge/Makefile +++ b/net-p2p/deluge/Makefile @@ -6,23 +6,19 @@ # PORTNAME= deluge -DISTVERSION= 1.3.2 +DISTVERSION= 1.3.3 PORTEPOCH= 1 CATEGORIES= net-p2p python MASTER_SITES= http://download.deluge-torrent.org/source/ EXTRACT_SUFX= .tar.lzma -MAINTAINER= jsa@FreeBSD.org +MAINTAINER= cvs-src@yandex.ru COMMENT= Bittorrent client using Python, GTK+2 and libtorrent-rasterbar -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0.6:${PORTSDIR}/devel/py-setuptools -LIB_DEPENDS= boost_python:${PORTSDIR}/devel/boost-python-libs \ - GeoIP:${PORTSDIR}/net/GeoIP -RUN_DEPENDS= boost-python-libs>=1.41.0:${PORTSDIR}/devel/boost-python-libs \ - ${PYTHON_PKGNAMEPREFIX}gobject>=2.20.0:${PORTSDIR}/devel/py-gobject \ - ${PYTHON_PKGNAMEPREFIX}setuptools>=0.6:${PORTSDIR}/devel/py-setuptools \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.9:${PORTSDIR}/devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:${PORTSDIR}/devel/py-xdg \ +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:${PORTSDIR}/devel/py-xdg \ ${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0.15.1:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15-python \ ${PYTHON_PKGNAMEPREFIX}openssl>=0.8:${PORTSDIR}/security/py-openssl \ ${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:${PORTSDIR}/textproc/py-chardet \ @@ -30,13 +26,14 @@ RUN_DEPENDS= boost-python-libs>=1.41.0:${PORTSDIR}/devel/boost-python-libs \ USE_RC_SUBR= deluged SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} +PLIST_SUB+= PYTHON_VER=${PYTHON_VER} USE_XZ= yes WANT_GNOME= yes USE_GETTEXT= yes USE_OPENSSL= yes USE_PYTHON= 2.5+ -USE_TWISTED= web +USE_TWISTED_RUN= web USE_PYDISTUTILS= easy_install PYDISTUTILS_BUILD_TARGET= build bdist_egg @@ -47,11 +44,9 @@ MAN1= deluge.1 deluge-console.1 deluge-gtk.1 deluge-web.1 deluged.1 PORTDOCS= * -PLIST_SUB+= PYDOTVER="${PYTHON_VERSION:S/thon//}" - .include <bsd.port.pre.mk> -.if ${ARCH} != "i386" +.if ${ARCH} != "i386" || ${PYTHON_REL} > 260 .undef WITH_PSYCO WITHOUT_PSYCO= yes .endif @@ -60,17 +55,20 @@ WITHOUT_PSYCO= yes .if ${PREFIX} != ${LOCALBASE} # only touch easy-install.pth if we installed it ourselves -. if !exists(${PYTHONPREFIX_SITELIBDIR}/easy-install.pth) +.if !exists(${PYTHONPREFIX_SITELIBDIR}/easy-install.pth) PLIST_FILES+= ${PYTHON_SITELIBDIR:S;${LOCALBASE}/;;}/easy-install.pth -. endif +.endif # only touch site.py{c,o} if we installed it ourselves -. for file in site.py site.pyc site.pyo -. if !exists(${PYTHONPREFIX_SITELIBDIR}/${file}) +.for file in site.py site.pyc site.pyo +.if !exists(${PYTHONPREFIX_SITELIBDIR}/${file}) PLIST_FILES+= ${PYTHON_SITELIBDIR:S;${LOCALBASE}/;;}/${file} -. endif -. endfor +.endif +.endfor +.endif +.if ${PYTHON_REL} < 260 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.9:${PORTSDIR}/devel/py-simplejson .endif .if defined(WITH_PSYCO) @@ -100,7 +98,7 @@ post-patch: /"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 + ${WRKSRC}/deluge/data/share/applications/deluge.desktop.in post-install: # do these by hand, else they wind up in the wrong place @@ -129,11 +127,11 @@ post-install: ${PREFIX}/share/pixmaps .endfor .if !defined(WITHOUT_PYGTK) - -update-desktop-database + @-update-desktop-database .endif .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} -.for i in ChangeLog LICENSE README +.for i in ChangeLog README ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif diff --git a/net-p2p/deluge/distinfo b/net-p2p/deluge/distinfo index 96b60b59087f..e8b27c773b87 100644 --- a/net-p2p/deluge/distinfo +++ b/net-p2p/deluge/distinfo @@ -1,2 +1,2 @@ -SHA256 (deluge-1.3.2.tar.lzma) = 7420221d861d05357edc338868294b6f600b4ac9783c568e65da389aeea4bf21 -SIZE (deluge-1.3.2.tar.lzma) = 2088854 +SHA256 (deluge-1.3.3.tar.lzma) = c40e0f5757bc3912e9628e1a68dfa41cd487beca370c315f5d31261b931cea05 +SIZE (deluge-1.3.3.tar.lzma) = 2094978 diff --git a/net-p2p/deluge/files/patch-setup.py b/net-p2p/deluge/files/patch-setup.py index 59518c0744ab..82b61c48b379 100644 --- a/net-p2p/deluge/files/patch-setup.py +++ b/net-p2p/deluge/files/patch-setup.py @@ -1,14 +1,15 @@ ---- ./setup.py.orig 2011-07-08 18:15:27.000000000 -0400 -+++ ./setup.py 2011-07-08 18:16:21.000000000 -0400 -@@ -213,6 +213,7 @@ - build_libtorrent = True +--- setup.py.orig 2011-07-22 22:12:47.000000000 +0400 ++++ setup.py 2011-07-24 23:08:20.000000000 +0400 +@@ -210,7 +210,7 @@ + try: + from deluge._libtorrent import lt + except ImportError: +- build_libtorrent = True ++ build_libtorrent = False else: build_libtorrent = False -+build_libtorrent = False - if build_libtorrent: - got_libtorrent = False -@@ -401,27 +402,6 @@ +@@ -474,31 +474,8 @@ # Data files to be installed to the system _data_files = [ @@ -25,7 +26,6 @@ - ('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/applications', ['deluge/data/share/applications/deluge.desktop']), - ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']), - ('share/man/man1', [ - 'docs/man/deluge.1', @@ -35,4 +35,9 @@ - 'docs/man/deluge-console.1']) ] +-if not windows_check(): +- _data_files.append(('share/applications', ['deluge/data/share/applications/deluge.desktop'])) +- entry_points = { + "console_scripts": [ + "deluge-console = deluge.ui.console:start", diff --git a/net-p2p/deluge/pkg-plist b/net-p2p/deluge/pkg-plist index 0af0439e3b3b..45728884a51b 100644 --- a/net-p2p/deluge/pkg-plist +++ b/net-p2p/deluge/pkg-plist @@ -1,3 +1,8 @@ +bin/deluge +bin/deluge-console +bin/deluge-gtk +bin/deluge-web +bin/deluged %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt @@ -370,7 +375,6 @@ %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/cy/LC_MESSAGES/deluge.mo %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/da/LC_MESSAGES/deluge.mo %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/de/LC_MESSAGES/deluge.mo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/deluge.pot %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/el/LC_MESSAGES/deluge.mo %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/en_AU/LC_MESSAGES/deluge.mo %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/en_CA/LC_MESSAGES/deluge.mo @@ -449,14 +453,14 @@ %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/pluginmanagerbase.py %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/pluginmanagerbase.pyc %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/pluginmanagerbase.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/AutoAdd-1.02-%%PYDOTVER%%.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Blocklist-1.2-%%PYDOTVER%%.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Execute-1.2-%%PYDOTVER%%.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Extractor-0.1-%%PYDOTVER%%.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Label-0.1-%%PYDOTVER%%.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Notifications-0.1-%%PYDOTVER%%.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Scheduler-0.2-%%PYDOTVER%%.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/WebUi-0.1-%%PYDOTVER%%.egg +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/AutoAdd-1.03-py%%PYTHON_VER%%.egg +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Blocklist-1.2-py%%PYTHON_VER%%.egg +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Execute-1.2-py%%PYTHON_VER%%.egg +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Extractor-0.1-py%%PYTHON_VER%%.egg +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Label-0.1-py%%PYTHON_VER%%.egg +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Notifications-0.1-py%%PYTHON_VER%%.egg +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Scheduler-0.2-py%%PYTHON_VER%%.egg +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/WebUi-0.1-py%%PYTHON_VER%%.egg %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/__init__.py %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/__init__.pyc %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/__init__.pyo @@ -1406,11 +1410,6 @@ share/icons/hicolor/96x96/apps/deluge.png share/icons/hicolor/scalable/apps/deluge.svg share/pixmaps/deluge.png share/pixmaps/deluge.xpm -bin/deluge -bin/deluge-console -bin/deluge-gtk -bin/deluge-web -bin/deluged @dirrmtry share/pixmaps @dirrmtry share/icons/hicolor/scalable/apps @dirrmtry share/icons/hicolor/scalable |