Factor out the wxGTK gui in an extra pkg (will be imported next).

Add myself as maintainer.
Bump PKGREVISION.
ok'd by wiz@

5 files changed, 44 insertions, 19 deletions

diff --git a/net/bittorrent/Makefile b/net/bittorrent/Makefile
index 04bbf309cd6..c71b6a5e6a2 100644
--- a/net/bittorrent/Makefile
+++ b/net/bittorrent/Makefile
@@ -1,28 +1,17 @@
-# $NetBSD: Makefile,v 1.14 2004/03/02 15:49:36 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/03 10:02:08 recht Exp $
 #
 
-DISTNAME=	BitTorrent-3.3
-PKGNAME=	${DISTNAME:S/BitT/bitt/}
-PKGREVISION=	4
-CATEGORIES=	net
-MASTER_SITES=	http://bitconjurer.org/BitTorrent/
+.include "Makefile.common"
 
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://bitconjurer.org/BitTorrent/
-COMMENT=	File sharing tool
+PKGNAME=	${DISTNAME:S/BitT/bitt/}
+PKGREVISION=	5
 
 PYDISTUTILSPKG=	YES
-USE_BUILDLINK2=	YES
-
-PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bittorrent
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/bittorrent
 
-.include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../x11/py-wxWindows/buildlink2.mk"
 .include "../../devel/py-cursespanel/buildlink2.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bittorrent/Makefile.common b/net/bittorrent/Makefile.common
new file mode 100644
index 00000000000..475803ebb41
--- /dev/null
+++ b/net/bittorrent/Makefile.common
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile.common,v 1.1 2004/03/03 10:02:08 recht Exp $
+#
+
+DISTNAME=	BitTorrent-3.3
+CATEGORIES=	net
+MASTER_SITES=	http://bitconjurer.org/BitTorrent/
+
+MAINTAINER=	recht@NetBSD.org
+HOMEPAGE=	http://bitconjurer.org/BitTorrent/
+COMMENT=	File sharing tool
+
+DESCR_SRC=	${.CURDIR}/../../net/bittorrent/DESCR
+DISTINFO_FILE=	${.CURDIR}/../../net/bittorrent/distinfo
+FILESDIR=	${.CURDIR}/../../net/bittorrent/files
+PATCHDIR=	${.CURDIR}/../../net/bittorrent/patches
+
+USE_BUILDLINK2=	YES
+
+PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
+
+.include "../../lang/python/application.mk"
diff --git a/net/bittorrent/PLIST b/net/bittorrent/PLIST
index 06bde9427ac..4e02921c812 100644
--- a/net/bittorrent/PLIST
+++ b/net/bittorrent/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2004/03/02 15:49:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/03/03 10:02:08 recht Exp $
 bin/btcompletedir.py
-bin/btcompletedirgui.py
 bin/btdownloadcurses.py
-bin/btdownloadgui.py
 bin/btdownloadheadless.py
 bin/btdownloadlibrary.py
 bin/btlaunchmany.py
diff --git a/net/bittorrent/distinfo b/net/bittorrent/distinfo
index d47fef1967a..21a30c61c78 100644
--- a/net/bittorrent/distinfo
+++ b/net/bittorrent/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.5 2003/10/02 13:11:53 salo Exp $
+$NetBSD: distinfo,v 1.6 2004/03/03 10:02:08 recht Exp $
 
 SHA1 (BitTorrent-3.3.tar.gz) = 45ba1999adf536ca4d96a32ca2f929d4d36803c0
 Size (BitTorrent-3.3.tar.gz) = 168628 bytes
+SHA1 (patch-aa) = 8c3abb81127bda1594b944fd6e11f587e8477e87
diff --git a/net/bittorrent/patches/patch-aa b/net/bittorrent/patches/patch-aa
new file mode 100644
index 00000000000..0962f55c76f
--- /dev/null
+++ b/net/bittorrent/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.4 2004/03/03 10:02:08 recht Exp $
+
+--- setup.py.orig	2004-03-03 01:16:06.000000000 +0100
++++ setup.py	2004-03-03 01:16:42.000000000 +0100
+@@ -18,9 +18,9 @@
+     
+     packages = ["BitTorrent"],
+ 
+-    scripts = ["btdownloadgui.py", "btdownloadheadless.py", "btdownloadlibrary.py", 
++    scripts = ["btdownloadheadless.py", "btdownloadlibrary.py", 
+         "bttrack.py", "btmakemetafile.py", "btlaunchmany.py", "btcompletedir.py",
+-        "btdownloadcurses.py", "btcompletedirgui.py", "btlaunchmanycurses.py", 
++        "btdownloadcurses.py", "btlaunchmanycurses.py", 
+         "btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
+         "bttest.py"]
+     )