From 69b8343d1c3b49b9fc945da4b5b8e368eb8d49c6 Mon Sep 17 00:00:00 2001
From: martynas <martynas@openbsd.org>
Date: Tue, 11 Aug 2009 23:47:14 +0000
Subject: [PATCH] unlink test_krpc from regress suite.  it breaks the build
 with MODPY_VERSION=2.6;  and we have these tests disabled anyway with/ok
 sthen@

---
 net/BitTorrent/Makefile                       |  6 +++---
 net/BitTorrent/patches/patch-khashmir_test_py | 14 ++++++++++++++
 net/BitTorrent/pkg/PLIST-main                 |  4 ++--
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 net/BitTorrent/patches/patch-khashmir_test_py

diff --git a/net/BitTorrent/Makefile b/net/BitTorrent/Makefile
index 7e17e216d28..fd6566d4400 100644
--- a/net/BitTorrent/Makefile
+++ b/net/BitTorrent/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.28 2009/03/16 22:20:02 kili Exp $
+# $OpenBSD: Makefile,v 1.29 2009/08/11 23:47:14 martynas Exp $
 
 COMMENT-main=	cooperative file distribution system implemented in Python
 COMMENT-gui=	graphical interface components for BitTorrent
 
 VERSION=	4.4.0
 DISTNAME=	BitTorrent-${VERSION}
-PKGNAME-main=	${DISTNAME}p5
-PKGNAME-gui=	BitTorrent-gui-${VERSION}p5
+PKGNAME-main=	${DISTNAME}p6
+PKGNAME-gui=	BitTorrent-gui-${VERSION}p6
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.bittorrent.com/
diff --git a/net/BitTorrent/patches/patch-khashmir_test_py b/net/BitTorrent/patches/patch-khashmir_test_py
new file mode 100644
index 00000000000..d13ed410e47
--- /dev/null
+++ b/net/BitTorrent/patches/patch-khashmir_test_py
@@ -0,0 +1,14 @@
+$OpenBSD: patch-khashmir_test_py,v 1.1 2009/08/11 23:47:14 martynas Exp $
+--- khashmir/test.py.orig	Tue Jan 31 22:16:51 2006
++++ khashmir/test.py	Wed Aug 12 02:13:15 2009
+@@ -13,9 +13,8 @@ import unittest
+ import ktable, khashmir
+ import khash, node, knode
+ import actions
+-import test_krpc
+ import test_khashmir
+ import kstore
+ 
+-tests = unittest.defaultTestLoader.loadTestsFromNames(['kstore', 'khash', 'node', 'knode', 'actions',  'ktable', 'test_krpc', 'test_khashmir'])
++tests = unittest.defaultTestLoader.loadTestsFromNames(['kstore', 'khash', 'node', 'knode', 'actions',  'ktable', 'test_khashmir'])
+ result = unittest.TextTestRunner().run(tests)
diff --git a/net/BitTorrent/pkg/PLIST-main b/net/BitTorrent/pkg/PLIST-main
index 60069c1b6d5..715ca4e2a09 100644
--- a/net/BitTorrent/pkg/PLIST-main
+++ b/net/BitTorrent/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2006/11/22 21:58:24 naddy Exp $
+@comment $OpenBSD: PLIST-main,v 1.2 2009/08/11 23:47:14 martynas Exp $
 @pkgpath net/BitTorrent
 bin/bittorrent-console
 bin/bittorrent-curses
@@ -9,6 +9,7 @@ bin/launchmany-curses
 bin/maketorrent-console
 bin/torrentinfo-console
 lib/python${MODPY_VERSION}/site-packages/BitTorrent/
+lib/python${MODPY_VERSION}/site-packages/BitTorrent-4.4.0-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/BitTorrent/BeautifulSupe.py
 lib/python${MODPY_VERSION}/site-packages/BitTorrent/BeautifulSupe.pyc
 lib/python${MODPY_VERSION}/site-packages/BitTorrent/Choker.py
@@ -141,7 +142,6 @@ lib/python${MODPY_VERSION}/site-packages/khashmir/test.pyc
 lib/python${MODPY_VERSION}/site-packages/khashmir/test_khashmir.py
 lib/python${MODPY_VERSION}/site-packages/khashmir/test_khashmir.pyc
 lib/python${MODPY_VERSION}/site-packages/khashmir/test_krpc.py
-lib/python${MODPY_VERSION}/site-packages/khashmir/test_krpc.pyc
 lib/python${MODPY_VERSION}/site-packages/khashmir/test_kstore.py
 lib/python${MODPY_VERSION}/site-packages/khashmir/test_kstore.pyc
 lib/python${MODPY_VERSION}/site-packages/khashmir/unet.py