4 files changed, 32 insertions, 18 deletions

diff --git a/net-p2p/gnome-btdownload/Makefile b/net-p2p/gnome-btdownload/Makefile
index dbed7070bbd2..d2dcd245550a 100644
--- a/net-p2p/gnome-btdownload/Makefile
+++ b/net-p2p/gnome-btdownload/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnome-btdownload
-PORTVERSION=	0.0.11
-PORTREVISION=	1
+PORTVERSION=	0.0.16
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnome-bt
@@ -15,21 +14,29 @@ MASTER_SITE_SUBDIR=	gnome-bt
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A simple Gnome interface designed as a mime-sink for BitTorrent files
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/BitTorrent/__init__.py:${PORTSDIR}/net/py-bittorrent-core \
-		${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/BitTorrent/__init__.py:${PORTSDIR}/net/py-bittorrent-core
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix
+USE_GNOME=	gnomehack gnomeprefix pygnome2
 GNU_CONFIGURE=	yes
 
 MAN1=		gnome-btdownload.1
+DOCS=		AUTHORS COPYING ChangeLog INSTALL README
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%X11PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/src/${PORTNAME}
 
+.ifndef (NOPORTDOCS)
+post-install:
+	@${MKDIR} ${DOCSDIR}
+.for i in ${DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
+
 .include <bsd.port.mk>
diff --git a/net-p2p/gnome-btdownload/distinfo b/net-p2p/gnome-btdownload/distinfo
index c831249cbde7..d79ada8f0f9b 100644
--- a/net-p2p/gnome-btdownload/distinfo
+++ b/net-p2p/gnome-btdownload/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome-btdownload-0.0.11.tar.bz2) = 023786c0b2d6096f45ab841699658c23
-SIZE (gnome-btdownload-0.0.11.tar.bz2) = 83482
+MD5 (gnome-btdownload-0.0.16.tar.bz2) = f54826a4b5bc82367cff3f3ca8095f9d
+SIZE (gnome-btdownload-0.0.16.tar.bz2) = 85870
diff --git a/net-p2p/gnome-btdownload/files/patch-src::gnome-btdownload b/net-p2p/gnome-btdownload/files/patch-src::gnome-btdownload
index 80ed19fb1cc1..3a7a77da040a 100644
--- a/net-p2p/gnome-btdownload/files/patch-src::gnome-btdownload
+++ b/net-p2p/gnome-btdownload/files/patch-src::gnome-btdownload
@@ -1,17 +1,17 @@
---- src/gnome-btdownload.orig	Thu Jan  8 22:13:40 2004
-+++ src/gnome-btdownload	Thu Jan  8 22:14:05 2004
+--- src/gnome-btdownload.orig	Tue Jun 15 00:16:22 2004
++++ src/gnome-btdownload	Tue Jun 15 00:17:17 2004
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/env python
  
+ # BitTorrent related modules.
  import BitTorrent.download, BitTorrent.bencode
- import os.path, threading, sys, time, re
-@@ -49,7 +49,7 @@
- if not locate_file or not get_url:
- 	try:
- 		def fallback_locate_attempt_prefixes(path):
--			prefixes = ['', 'usr/', 'usr/local/']
-+			prefixes = ['', '%%X11PREFIX%%/', 'usr/', 'usr/local/']
+@@ -72,7 +72,7 @@
+ # Fallback wrapper
+ if not locate_file:
+ 	def fallback_locate_attempt_prefixes(path):
+-		prefixes = ['', 'usr/', 'usr/local/']
++		prefixes = ['', '%%X11PREFIX%%/', 'usr/', 'usr/local/']
  
- 			# Try them locally
- 			for prefix in prefixes:
+ 		# Try them locally
+ 		for prefix in prefixes:
diff --git a/net-p2p/gnome-btdownload/pkg-plist b/net-p2p/gnome-btdownload/pkg-plist
index c737fca5eb7b..0d23ca8ee2ca 100644
--- a/net-p2p/gnome-btdownload/pkg-plist
+++ b/net-p2p/gnome-btdownload/pkg-plist
@@ -1,5 +1,11 @@
 bin/gnome-btdownload
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
 share/gnome/application-registry/gnome-btdownload.applications
+share/gnome/gnome-btdownload/glade/contdiag.glade
 share/gnome/gnome-btdownload/glade/dlsession.glade
 share/gnome/gnome-btdownload/glade/errdiag.glade
 share/gnome/gnome-btdownload/pixmaps/download.png
@@ -8,3 +14,4 @@ share/gnome/mime-info/gnome-btdownload.mime
 @dirrm share/gnome/gnome-btdownload/pixmaps
 @dirrm share/gnome/gnome-btdownload/glade
 @dirrm share/gnome/gnome-btdownload
+%%PORTDOCS%%@dirrm %%DOCSDIR%%