Clean the !@#@#$%^ mess with documentation and image files so now binary

packages actually work..

Bump PKGREVISIONs.

6 files changed, 41 insertions, 20 deletions

diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile
index 3fdcadc140e..8daa1133993 100644
--- a/net/bittorrent-gui/Makefile
+++ b/net/bittorrent-gui/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:24 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/19 02:49:23 salo Exp $
 #
 
 .include "../../net/bittorrent/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/BitTorrent/bittorrent-gui/}
+PKGREVISION=	1
 
 COMMENT+=	(GTK+ GUI)
 
@@ -18,6 +19,8 @@ do-build:	# empty
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/btdownloadgui.py ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/btmaketorrentgui.py ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/images/*.png ${PREFIX}/share/pixmaps/${DISTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/images/*.ico ${PREFIX}/share/pixmaps/${DISTNAME}/
 
 .include "../../lang/python/application.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/net/bittorrent-gui/PLIST b/net/bittorrent-gui/PLIST
index 68c03baa72d..901e19d8912 100644
--- a/net/bittorrent-gui/PLIST
+++ b/net/bittorrent-gui/PLIST
@@ -1,3 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2005/03/28 14:43:10 recht Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/06/19 02:49:24 salo Exp $
 bin/btdownloadgui.py
 bin/btmaketorrentgui.py
+share/pixmaps/BitTorrent-4.0.1/bittorrent.ico
+share/pixmaps/BitTorrent-4.0.1/broken.png
+share/pixmaps/BitTorrent-4.0.1/finished.png
+share/pixmaps/BitTorrent-4.0.1/info.png
+share/pixmaps/BitTorrent-4.0.1/pause.png
+share/pixmaps/BitTorrent-4.0.1/paused.png
+share/pixmaps/BitTorrent-4.0.1/play.png
+share/pixmaps/BitTorrent-4.0.1/queued.png
+share/pixmaps/BitTorrent-4.0.1/remove.png
+share/pixmaps/BitTorrent-4.0.1/running.png
diff --git a/net/bittorrent/Makefile b/net/bittorrent/Makefile
index 636a920fd26..2428943471a 100644
--- a/net/bittorrent/Makefile
+++ b/net/bittorrent/Makefile
@@ -1,18 +1,13 @@
-# $NetBSD: Makefile,v 1.25 2005/03/28 14:43:10 recht Exp $
+# $NetBSD: Makefile,v 1.26 2005/06/19 02:49:23 salo Exp $
 #
 
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME:S/BitT/bitt/}
+PKGREVISION=	1
 
 PYDISTUTILSPKG=	YES
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bittorrent
-	${INSTALL_DATA} ${WRKSRC}/credits.txt ${PREFIX}/share/doc/bittorrent
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/bittorrent
-	${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${PREFIX}/share/doc/bittorrent
-
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../devel/py-cursespanel/buildlink3.mk"
diff --git a/net/bittorrent/PLIST b/net/bittorrent/PLIST
index 55c9d245ed8..b037f85ee91 100644
--- a/net/bittorrent/PLIST
+++ b/net/bittorrent/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2005/03/28 14:43:10 recht Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/06/19 02:49:23 salo Exp $
 bin/btdownloadcurses.py
 bin/btdownloadheadless.py
 bin/btlaunchmany.py
@@ -125,8 +125,13 @@ ${PYSITELIB}/BitTorrent/track.pyo
 ${PYSITELIB}/BitTorrent/zurllib.py
 ${PYSITELIB}/BitTorrent/zurllib.pyc
 ${PYSITELIB}/BitTorrent/zurllib.pyo
-share/doc/bittorrent/LICENSE.txt
-share/doc/bittorrent/README.txt
-share/doc/bittorrent/credits.txt
-@dirrm share/doc/bittorrent
+share/doc/BitTorrent-4.0.1/credits.txt
+share/doc/BitTorrent-4.0.1/LICENSE.txt
+share/doc/BitTorrent-4.0.1/README.txt
+share/doc/BitTorrent-4.0.1/redirdonate.html
+share/pixmaps/BitTorrent-4.0.1/logo/bittorrent_32.png
+share/pixmaps/BitTorrent-4.0.1/logo/bittorrent_96.png
+@dirrm share/pixmaps/BitTorrent-4.0.1/logo
+@dirrm share/pixmaps/BitTorrent-4.0.1
+@dirrm share/doc/BitTorrent-4.0.1
 @dirrm ${PYSITELIB}/BitTorrent
diff --git a/net/bittorrent/distinfo b/net/bittorrent/distinfo
index 89040cf8af8..f2de3b41f9b 100644
--- a/net/bittorrent/distinfo
+++ b/net/bittorrent/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2005/03/28 14:43:10 recht Exp $
+$NetBSD: distinfo,v 1.15 2005/06/19 02:49:23 salo Exp $
 
 SHA1 (BitTorrent-4.0.1.tar.gz) = 577db045897e02dcf8d3546f93a2525c5b7ba6cf
 RMD160 (BitTorrent-4.0.1.tar.gz) = 9ccec667802df40aa21c00be7930ac5ad4d65821
 Size (BitTorrent-4.0.1.tar.gz) = 154427 bytes
-SHA1 (patch-aa) = 0acdf112a748cfa0b615c9113f7519cb732bd181
+SHA1 (patch-aa) = fad5fb4d6b6c4aed9988cd4484aad042a3de5cef
diff --git a/net/bittorrent/patches/patch-aa b/net/bittorrent/patches/patch-aa
index 95e508dd446..559647106bd 100644
--- a/net/bittorrent/patches/patch-aa
+++ b/net/bittorrent/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2005/03/28 14:43:10 recht Exp $
+$NetBSD: patch-aa,v 1.7 2005/06/19 02:49:23 salo Exp $
 
---- setup.py.orig	Mon Mar 28 16:23:38 2005
-+++ setup.py	Mon Mar 28 16:26:30 2005
-@@ -19,8 +19,8 @@
+--- setup.py.orig	2005-03-24 23:30:24.000000000 +0100
++++ setup.py	2005-06-19 04:18:09.000000000 +0200
+@@ -19,15 +19,14 @@
  
  import glob
  
@@ -13,3 +13,11 @@ $NetBSD: patch-aa,v 1.6 2005/03/28 14:43:10 recht Exp $
             "btlaunchmany.py", "btlaunchmanycurses.py",
             "bttrack.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py"]
  
+ img_root, doc_root = BitTorrent.calc_unix_dirs()
+ 
+-data_files = [ (img_root        , glob.glob('images/*png')+['images/bittorrent.ico',]),
+-               (img_root+'/logo', glob.glob('images/logo/bittorrent_[0-9]*.png')     ),
++data_files = [ (img_root+'/logo', glob.glob('images/logo/bittorrent_[0-9]*.png')     ),
+                (doc_root        , ['credits.txt', 'LICENSE.txt',
+                                    'README.txt', 'redirdonate.html']       ),
+                ]