3 files changed, 28 insertions, 11 deletions

diff --git a/net-p2p/btqueue/Makefile b/net-p2p/btqueue/Makefile
index f69fe1c50ae9..44ad47550fab 100644
--- a/net-p2p/btqueue/Makefile
+++ b/net-p2p/btqueue/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	btqueue
-PORTVERSION=	0.0.17
+PORTVERSION=	0.0.18
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,4 +21,15 @@ CONFLICTS=	py??-*[Bb]it[Tt]ornado* py??-*[Bb]it[Tt]orrent*
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
-.include <bsd.port.mk>
+DATADIR=	${PREFIX}/share/BTQueue
+DOCSDIR=	${PREFIX}/share/doc/BTQueue
+
+OPTIONS=	PYXML "Add dependency on PyXML (needed for crawler only)" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_PYXML)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net-p2p/btqueue/distinfo b/net-p2p/btqueue/distinfo
index e4e301b88fbc..cf7e646bf2a6 100644
--- a/net-p2p/btqueue/distinfo
+++ b/net-p2p/btqueue/distinfo
@@ -1,2 +1,2 @@
-MD5 (BTQueue-0.0.17.tar.gz) = 9bf43e966d9f581a7e6ae5c7030b5aca
-SIZE (BTQueue-0.0.17.tar.gz) = 1201553
+MD5 (BTQueue-0.0.18.tar.gz) = 5afd619feccc185ba3a5737f269ceb4b
+SIZE (BTQueue-0.0.18.tar.gz) = 1204822
diff --git a/net-p2p/btqueue/pkg-plist b/net-p2p/btqueue/pkg-plist
index 459bfe32863b..80634ae0d09f 100644
--- a/net-p2p/btqueue/pkg-plist
+++ b/net-p2p/btqueue/pkg-plist
@@ -83,6 +83,9 @@ bin/btshowmetainfo.py
 %%PYTHON_SITELIBDIR%%/BitQueue/timeoutsocket.py
 %%PYTHON_SITELIBDIR%%/BitQueue/timeoutsocket.pyc
 %%PYTHON_SITELIBDIR%%/BitQueue/timeoutsocket.pyo
+%%PYTHON_SITELIBDIR%%/BitQueue/util.py
+%%PYTHON_SITELIBDIR%%/BitQueue/util.pyc
+%%PYTHON_SITELIBDIR%%/BitQueue/util.pyo
 %%PYTHON_SITELIBDIR%%/BitQueue/webservice.py
 %%PYTHON_SITELIBDIR%%/BitQueue/webservice.pyc
 %%PYTHON_SITELIBDIR%%/BitQueue/webservice.pyo
@@ -116,6 +119,9 @@ bin/btshowmetainfo.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/PiecePicker.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/PiecePicker.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/PiecePicker.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/PiecePicker.new.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/PiecePicker.new.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/PiecePicker.new.pyo
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/Rerequester.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/Rerequester.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/Rerequester.pyo
@@ -236,14 +242,14 @@ bin/btshowmetainfo.py
 %%PYTHON_SITELIBDIR%%/BitTornado/zurllib.py
 %%PYTHON_SITELIBDIR%%/BitTornado/zurllib.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/zurllib.pyo
-share/BTQueue/alias.conf
-share/BTQueue/ip2cc.db
-share/doc/BTQueue/examples/interest.xml
-share/doc/BTQueue/examples/tracker.xml
+%%DATADIR%%/alias.conf
+%%DATADIR%%/ip2cc.db
+%%DOCSDIR%%/examples/interest.xml
+%%DOCSDIR%%/examples/tracker.xml
 @dirrm %%PYTHON_SITELIBDIR%%/BitCrawler
 @dirrm %%PYTHON_SITELIBDIR%%/BitQueue
 @dirrm %%PYTHON_SITELIBDIR%%/BitTornado/BT1
 @dirrm %%PYTHON_SITELIBDIR%%/BitTornado
-@dirrm share/BTQueue
-@dirrm share/doc/BTQueue/examples
-@dirrm share/doc/BTQueue
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%/examples
+@dirrm %%DOCSDIR%%