ports/159175: [UPDATE] net-p2p/deluge: update to 1.3.3

Ruslan Mahmatkhanov cvs-src at yandex.ru
Mon Jul 25 04:20:08 UTC 2011 

>Number:         159175
>Category:       ports
>Synopsis:       [UPDATE] net-p2p/deluge: update to 1.3.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 25 04:20:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Ruslan Mahmatkhanov
>Release:        9.0-CURRENT
>Organization:
>Environment:
9.0-CURRENT i386
>Description:
- update to 1.3.3
- install license with license framework, not manually
- eliminate explicit setuptools dependency because build/run dependency on it
  already implied when USE_DISTUTILS=easy_install is set (see bsd.python.mk)
- remove boost-python-libs dependency - it is needed only for bundled 
  libtorrent-rasterbar-python, while we install libtorrent-rasterbar-python 
  from ports tree
- remove GeoIP dependency. it will be installed anyway as devel/libtorrent-rasterbar-15 dependency (LIB_DEPENDS)
- move pygobject dependency into !(WITHOUT_PYGTK) case
- depend on simplejson only if python < 2.6 (it is included into >=2.6)
- use PYTHON_VER instead of homebrew PYDOTVER (yeah, i know they are not 
  the same, but PYTHON_VER is sufficient in this case)
- www/py-twistedWeb dependency is needed only at runtime, so use USE_TWISTED_RUN
  instead
- unset WITH_PSYCO if python version > 2.6 (psyco doesn't works with 2.6+)
- fix some whitespace

I use deluge with this changes and all is working fine.

PS. i actually dislike the idea of not using setup.py to install deluge, cause
it makes additional mess. For example, if we really care that the icons and
stuff not going to PYTHON_SITELIBDIR, why we don't care about installing
i18n locale files and data/pixmaps? I believe it's just make maintainance more 
hard.

PPS. ports/158717 may be closed since i merged all the changes from there into 
this new patch.

changelog:
http://dev.deluge-torrent.org/wiki/ChangeLog

tinderbuild logs:
7.4 - http://happy-nation.by.ru/ports/tb/7.4-deluge-1.3.3,1.log
8.2 - http://happy-nation.by.ru/ports/tb/8.2-deluge-1.3.3,1.log
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruNa deluge.orig/Makefile deluge/Makefile
--- deluge.orig/Makefile	2011-07-11 18:36:19.000000000 +0400
+++ deluge/Makefile	2011-07-24 22:38:21.000000000 +0400
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	deluge
-DISTVERSION=	1.3.2
+DISTVERSION=	1.3.3
 PORTEPOCH=	1
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://download.deluge-torrent.org/source/
@@ -15,13 +15,10 @@
 MAINTAINER=	jsa at FreeBSD.org
 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 \
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	GeoIP:${PORTSDIR}/net/GeoIP \
 		${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 \
@@ -30,13 +27,14 @@
 
 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 +45,9 @@
 
 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 +56,20 @@
 .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)
@@ -88,7 +87,7 @@
 		${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:${PORTSDIR}/devel/py-notify \
 		xdg-utils>=1.0.2:${PORTSDIR}/devel/xdg-utils
 
-USE_GNOME+=	desktopfileutils librsvg2 pygtk2
+USE_GNOME+=	desktopfileutils librsvg2 pygobject pygtk2
 INSTALLS_ICONS=	yes
 .endif
 
@@ -100,7 +99,7 @@
 		/"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 +128,11 @@
 		${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 -ruNa deluge.orig/distinfo deluge/distinfo
--- deluge.orig/distinfo	2011-07-11 18:36:19.000000000 +0400
+++ deluge/distinfo	2011-07-24 21:11:43.000000000 +0400
@@ -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 -ruNa deluge.orig/files/patch-setup.py deluge/files/patch-setup.py
--- deluge.orig/files/patch-setup.py	2011-07-11 18:36:19.000000000 +0400
+++ deluge/files/patch-setup.py	2011-07-24 23:08:35.000000000 +0400
@@ -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 -ruNa deluge.orig/pkg-plist deluge/pkg-plist
--- deluge.orig/pkg-plist	2011-07-11 18:36:19.000000000 +0400
+++ deluge/pkg-plist	2011-07-24 23:09:08.000000000 +0400
@@ -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,12 +1410,7 @@
 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
- at dirrmtry share/pixmaps
+ at dirrmtry share/applications
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/96x96/apps
@@ -1440,7 +1439,7 @@
 @dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
- at dirrmtry share/applications
+ at dirrmtry share/pixmaps
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/themes/images/vista/toolbar
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/themes/images/vista/tabs
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/themes/images/vista/sizer


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list