ports/107395: [PATCH] net-p2p/py-bittorrent stale patches break build

[Emil Mikulic]

>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: