From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 27 00:40:09 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0625106566C for ; Sun, 27 Mar 2011 00:40:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EC9AA8FC12 for ; Sun, 27 Mar 2011 00:40:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p2R0e8Fa075904 for ; Sun, 27 Mar 2011 00:40:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p2R0e8GB075903; Sun, 27 Mar 2011 00:40:08 GMT (envelope-from gnats) Resent-Date: Sun, 27 Mar 2011 00:40:08 GMT Resent-Message-Id: <201103270040.p2R0e8GB075903@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Maxim Samsonov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D9E1106566B for ; Sun, 27 Mar 2011 00:33:41 +0000 (UTC) (envelope-from xors@mne.ru) Received: from external.cgp.agava.net (external.cgp.agava.net [89.108.65.69]) by mx1.freebsd.org (Postfix) with ESMTP id C1E178FC0C for ; Sun, 27 Mar 2011 00:33:40 +0000 (UTC) Received: from cgp.agava.net (cgp.agava.net [89.108.66.11]) by external.cgp.agava.net (Postfix) with ESMTP id 31BDFB17619 for ; Sat, 26 Mar 2011 23:48:35 +0000 (UTC) Received: from [91.77.119.60] (account xors@mne.ru HELO xors.pg.org) by cgp.agava.net (CommuniGate Pro SMTP 4.2.9) with ESMTP-TLS id 586194152 for FreeBSD-gnats-submit@freebsd.org; Sun, 27 Mar 2011 03:48:14 +0400 Received: by xors.pg.org (Postfix, from userid 1001) id 9B554119E7; Sun, 27 Mar 2011 03:48:33 +0400 (MSD) Message-Id: <20110326234833.9B554119E7@xors.pg.org> Date: Sun, 27 Mar 2011 03:48:33 +0400 (MSD) From: Maxim Samsonov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/155957: [PATCH]: net-p2p/deluge Fix build with python 2.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Maxim Samsonov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Mar 2011 00:40:10 -0000 >Number: 155957 >Category: ports >Synopsis: [PATCH]: net-p2p/deluge Fix build with python 2.7 >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Mar 27 00:40:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Maxim Samsonov >Release: FreeBSD 8.2-STABLE i386 >Organization: >Environment: >Description: Fix build with python 2.7 >How-To-Repeat: >Fix: --- net-p2p-deluge.patch begins here --- diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile --- a/net-p2p/deluge/Makefile +++ b/net-p2p/deluge/Makefile @@ -7,6 +7,7 @@ PORTNAME= deluge DISTVERSION= 1.3.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-p2p python MASTER_SITES= http://download.deluge-torrent.org/source/ @@ -15,21 +16,21 @@ MAINTAINER= lioux@FreeBSD.org COMMENT= Bittorrent client using Python, GTK+2 and libtorrent-rasterbar +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE + 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 \ - ${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar$>=0.15.1:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15-python \ + ${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 \ ${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:${PORTSDIR}/textproc/py-mako -BROKEN= bad dependency object - USE_RC_SUBR= deluged SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} @@ -63,6 +64,8 @@ WITHOUT_PSYCO= yes .endif +PLIST_SUB+= PYTHON_VER=${PYTHON_VER} + # things that happen when PREFIX differs from LOCALBASE .if ${PREFIX} != ${LOCALBASE} @@ -93,6 +96,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:${PORTSDIR}/devel/py-dbus \ ${PYTHON_PKGNAMEPREFIX}game>=1.8.1:${PORTSDIR}/devel/py-game \ ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:${PORTSDIR}/devel/py-notify \ + ${PYTHON_PKGNAMEPREFIX}gobject>=2.20.0:${PORTSDIR}/devel/py-gobject \ xdg-utils>=1.0.2:${PORTSDIR}/devel/xdg-utils USE_GNOME+= desktopfileutils librsvg2 pygtk2 diff --git a/net-p2p/deluge/pkg-plist b/net-p2p/deluge/pkg-plist --- a/net-p2p/deluge/pkg-plist +++ b/net-p2p/deluge/pkg-plist @@ -439,14 +439,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-py2.6.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Blocklist-1.2-py2.6.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Execute-1.2-py2.6.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Extractor-0.1-py2.6.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Label-0.1-py2.6.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Notifications-0.1-py2.6.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Scheduler-0.2-py2.6.egg -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/WebUi-0.1-py2.6.egg +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/AutoAdd-1.02-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 --- net-p2p-deluge.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: