From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 1 14:10:20 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7791516A4C9 for ; Mon, 1 Jan 2007 14:10:20 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 602DF13C46A for ; Mon, 1 Jan 2007 14:10:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l01EAH3u068944 for ; Mon, 1 Jan 2007 14:10:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l01EAHLF068939; Mon, 1 Jan 2007 14:10:17 GMT (envelope-from gnats) Resent-Date: Mon, 1 Jan 2007 14:10:17 GMT Resent-Message-Id: <200701011410.l01EAHLF068939@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, Emil Mikulic Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3E0DE16A403; Mon, 1 Jan 2007 14:01:15 +0000 (UTC) (envelope-from emil@dmr.ath.cx) Received: from ipmail03.adl2.internode.on.net (ipmail03.adl2.internode.on.net [203.16.214.135]) by mx1.freebsd.org (Postfix) with ESMTP id 9788F13C442; Mon, 1 Jan 2007 14:01:14 +0000 (UTC) (envelope-from emil@dmr.ath.cx) Received: from ppp162-186.static.internode.on.net ([150.101.162.186]) by ipmail03.adl2.internode.on.net with ESMTP; 02 Jan 2007 00:15:54 +1030 Received: by ppp162-186.static.internode.on.net (Poofix, from userid 1001) id 1B3894079; Tue, 2 Jan 2007 00:45:51 +1100 (EST) Message-Id: <20070101134551.1B3894079@ppp162-186.static.internode.on.net> Date: Tue, 2 Jan 2007 00:45:51 +1100 (EST) From: Emil Mikulic To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: lioux@FreeBSD.org Subject: ports/107395: [PATCH] net-p2p/py-bittorrent stale patches break build X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jan 2007 14:10:20 -0000 >Number: 107395 >Category: ports >Synopsis: [PATCH] net-p2p/py-bittorrent stale patches break build >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Jan 01 14:10:16 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Emil Mikulic >Release: >Organization: >Environment: >Description: Some of the psyco patches in /usr/ports/net-p2p/py-bittorrent/files don't apply because the vendor sources have changed. Patch to fix the patches attached in Fix section. CC'd maintainer. >How-To-Repeat: # portsnap extract net-p2p/py-bittorrent # cd /usr/ports/net-p2p/py-bittorrent/ # make ===> Define WITHOUT_GUI to disable GUI installation ===> Define WITHOUT_PSYCO to disable devel/py-psyco optimization ===> Vulnerability check disabled, database not found ===> Extracting for py24-BitTorrent-4.26.0,1 => MD5 Checksum OK for BitTorrent-4.26.0.tar.gz. => SHA256 Checksum OK for BitTorrent-4.26.0.tar.gz. ===> Patching for py24-BitTorrent-4.26.0,1 ===> Applying extra patch /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-console.py 1 out of 1 hunks failed--saving rejects to bittorrent-console.py.rej *** Error code 1 # >Fix: --- /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-console.py.orig Mon Jan 1 20:03:59 2007 +++ /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-console.py Mon Jan 1 20:04:02 2007 @@ -11,6 +11,6 @@ +except: + pass + + app_name = "BitTorrent" from BitTorrent.translation import _ - - import pdb + import sys --- /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-curses.py.orig Mon Jan 1 20:08:52 2007 +++ /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-curses.py Mon Jan 1 20:08:53 2007 @@ -11,6 +11,6 @@ +except: + pass + + app_name = "BitTorrent" from BitTorrent.translation import _ - SPEW_SCROLL_RATE = 1 --- /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-tracker.py.orig Mon Jan 1 20:10:54 2007 +++ /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-tracker.py Mon Jan 1 20:10:55 2007 @@ -11,6 +11,6 @@ +except: + pass + + app_name = "BitTorrent" if __name__ == '__main__': - from BitTorrent.platform import install_translation - install_translation() + from BitTorrent.translation import _ --- /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent.py.orig Mon Jan 1 20:13:04 2007 +++ /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent.py Mon Jan 1 20:13:05 2007 @@ -11,6 +11,6 @@ +except: + pass + + app_name = "BitTorrent" import os import sys - try: --- /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-changetracker-console.py.orig Mon Jan 1 20:15:36 2007 +++ /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-changetracker-console.py Mon Jan 1 20:15:37 2007 @@ -11,6 +11,6 @@ +except: + pass + + app_name = "BitTorrent" from BitTorrent.translation import _ - from os.path import basename --- /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent.py.orig Tue Jan 2 00:34:52 2007 +++ /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent.py Tue Jan 2 00:34:53 2007 @@ -11,6 +11,6 @@ +except: + pass + - from BitTorrent.translation import _ + app_name = "BitTorrent" + from BTL.translation import _ - import os --- /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-torrentinfo-console.py.orig Tue Jan 2 00:36:09 2007 +++ /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-torrentinfo-console.py Tue Jan 2 00:36:10 2007 @@ -11,6 +11,6 @@ +except: + pass + - from BitTorrent.translation import _ + app_name = "BitTorrent" + from BTL.translation import _ - from sys import * --- /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-launchmany-curses.py.orig Sun Jun 25 06:17:41 2006 +++ /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-launchmany-curses.py Mon Jan 1 20:17:05 2007 @@ -1,9 +1,9 @@ --- launchmany-curses.py.orig Tue Jun 6 20:43:42 2006 +++ launchmany-curses.py Thu Jun 15 14:46:16 2006 -@@ -14,6 +14,13 @@ +@@ -13,6 +13,14 @@ from __future__ import division - ++ +try: + import psyco + assert psyco.__version__ >= 0x010300f0 @@ -11,6 +11,6 @@ +except: + pass + - from BitTorrent.translation import _ + app_name = "BitTorrent" + from BTL.translation import _ - DOWNLOAD_SCROLL_RATE = 1 >Release-Note: >Audit-Trail: >Unformatted: