- Unbreak and minor tweaks

Submitted by:	Frank Fenor <frank@fenor.de> (maintainer)
Reported by:	pointyhat via Pav

3 files changed, 121 insertions, 123 deletions

diff --git a/www/toofpy/Makefile b/www/toofpy/Makefile
index b955b62b83c1..a456c9e63e7f 100644
--- a/www/toofpy/Makefile
+++ b/www/toofpy/Makefile
@@ -16,19 +16,17 @@ DISTFILES=	toolserver-snapshot.tar.gz
 MAINTAINER=	frank@fenor.de
 COMMENT=	Toolserver Framework for Python
 
-BROKEN=		does not patch
-
-WRKSRC=		work/Toolserver-${PORTVERSION}
-USE_RC_SUBR=	toolserver
-PYDISTUTILS_PKGNAME=	Toolserver
-
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/medusa:${PORTSDIR}/net/py-medusa \
 		${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst \
 		${PYTHON_SITELIBDIR}/SOAPpy:${PORTSDIR}/net/py-soappy
 
+WRKSRC=		${WRKDIR}/Toolserver-${PORTVERSION}
+LATEST_LINK=	py-${PORTNAME}
+USE_RC_SUBR=	toolserver
+USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	Toolserver
+
 OPTIONS=	PYCRYPTO "Use pycrypto (for RSA authentication)" off
 
 .include <bsd.port.pre.mk>
diff --git a/www/toofpy/distinfo b/www/toofpy/distinfo
index 414dbbfb969c..582512a17a05 100644
--- a/www/toofpy/distinfo
+++ b/www/toofpy/distinfo
@@ -1,3 +1,3 @@
-MD5 (toolserver-snapshot.tar.gz) = 8237749ede5af107eb59d388ba5b695d
-SHA256 (toolserver-snapshot.tar.gz) = ec399b16f2a726f1c9883c6f0827d5e94ec96a6d213881539ef3c567083660e7
+MD5 (toolserver-snapshot.tar.gz) = c1c6676074391562c76614a76e66d56d
+SHA256 (toolserver-snapshot.tar.gz) = 8a465761ca4d8a9bb2b971d190575efaad7793b572dd3d16f8d473d94636a2f3
 SIZE (toolserver-snapshot.tar.gz) = 95625
diff --git a/www/toofpy/pkg-plist b/www/toofpy/pkg-plist
index f8c76eb6ac54..6d218905c578 100644
--- a/www/toofpy/pkg-plist
+++ b/www/toofpy/pkg-plist
@@ -1,115 +1,115 @@
 bin/tsctl
-lib/python2.5/site-packages/Toolserver/AsyncCall.py
-lib/python2.5/site-packages/Toolserver/AsyncCall.pyc
-lib/python2.5/site-packages/Toolserver/AsyncCall.pyo
-lib/python2.5/site-packages/Toolserver/Authentication.py
-lib/python2.5/site-packages/Toolserver/Authentication.pyc
-lib/python2.5/site-packages/Toolserver/Authentication.pyo
-lib/python2.5/site-packages/Toolserver/CRAMUtils.py
-lib/python2.5/site-packages/Toolserver/CRAMUtils.pyc
-lib/python2.5/site-packages/Toolserver/CRAMUtils.pyo
-lib/python2.5/site-packages/Toolserver/Client.py
-lib/python2.5/site-packages/Toolserver/Client.pyc
-lib/python2.5/site-packages/Toolserver/Client.pyo
-lib/python2.5/site-packages/Toolserver/ClientMachinery.py
-lib/python2.5/site-packages/Toolserver/ClientMachinery.pyc
-lib/python2.5/site-packages/Toolserver/ClientMachinery.pyo
-lib/python2.5/site-packages/Toolserver/ClientRegistry.py
-lib/python2.5/site-packages/Toolserver/ClientRegistry.pyc
-lib/python2.5/site-packages/Toolserver/ClientRegistry.pyo
-lib/python2.5/site-packages/Toolserver/Config.py
-lib/python2.5/site-packages/Toolserver/Config.pyc
-lib/python2.5/site-packages/Toolserver/Config.pyo
-lib/python2.5/site-packages/Toolserver/Context.py
-lib/python2.5/site-packages/Toolserver/Context.pyc
-lib/python2.5/site-packages/Toolserver/Context.pyo
-lib/python2.5/site-packages/Toolserver/Daemonize.py
-lib/python2.5/site-packages/Toolserver/Daemonize.pyc
-lib/python2.5/site-packages/Toolserver/Daemonize.pyo
-lib/python2.5/site-packages/Toolserver/DefaultConfig.py
-lib/python2.5/site-packages/Toolserver/DefaultConfig.pyc
-lib/python2.5/site-packages/Toolserver/DefaultConfig.pyo
-lib/python2.5/site-packages/Toolserver/Factory.py
-lib/python2.5/site-packages/Toolserver/Factory.pyc
-lib/python2.5/site-packages/Toolserver/Factory.pyo
-lib/python2.5/site-packages/Toolserver/HTTPHandler.py
-lib/python2.5/site-packages/Toolserver/HTTPHandler.pyc
-lib/python2.5/site-packages/Toolserver/HTTPHandler.pyo
-lib/python2.5/site-packages/Toolserver/LRUCache.py
-lib/python2.5/site-packages/Toolserver/LRUCache.pyc
-lib/python2.5/site-packages/Toolserver/LRUCache.pyo
-lib/python2.5/site-packages/Toolserver/Linda.py
-lib/python2.5/site-packages/Toolserver/Linda.pyc
-lib/python2.5/site-packages/Toolserver/Linda.pyo
-lib/python2.5/site-packages/Toolserver/Monitor.py
-lib/python2.5/site-packages/Toolserver/Monitor.pyc
-lib/python2.5/site-packages/Toolserver/Monitor.pyo
-lib/python2.5/site-packages/Toolserver/MonitorWin32.py
-lib/python2.5/site-packages/Toolserver/MonitorWin32.pyc
-lib/python2.5/site-packages/Toolserver/MonitorWin32.pyo
-lib/python2.5/site-packages/Toolserver/PickleRPCClient.py
-lib/python2.5/site-packages/Toolserver/PickleRPCClient.pyc
-lib/python2.5/site-packages/Toolserver/PickleRPCClient.pyo
-lib/python2.5/site-packages/Toolserver/ProcessQueue.py
-lib/python2.5/site-packages/Toolserver/ProcessQueue.pyc
-lib/python2.5/site-packages/Toolserver/ProcessQueue.pyo
-lib/python2.5/site-packages/Toolserver/RESTCall.py
-lib/python2.5/site-packages/Toolserver/RESTCall.pyc
-lib/python2.5/site-packages/Toolserver/RESTCall.pyo
-lib/python2.5/site-packages/Toolserver/RESTHandler.py
-lib/python2.5/site-packages/Toolserver/RESTHandler.pyc
-lib/python2.5/site-packages/Toolserver/RESTHandler.pyo
-lib/python2.5/site-packages/Toolserver/RPCHandler.py
-lib/python2.5/site-packages/Toolserver/RPCHandler.pyc
-lib/python2.5/site-packages/Toolserver/RPCHandler.pyo
-lib/python2.5/site-packages/Toolserver/ReactorChain.py
-lib/python2.5/site-packages/Toolserver/ReactorChain.pyc
-lib/python2.5/site-packages/Toolserver/ReactorChain.pyo
-lib/python2.5/site-packages/Toolserver/RewriteHandler.py
-lib/python2.5/site-packages/Toolserver/RewriteHandler.pyc
-lib/python2.5/site-packages/Toolserver/RewriteHandler.pyo
-lib/python2.5/site-packages/Toolserver/SOAPClient.py
-lib/python2.5/site-packages/Toolserver/SOAPClient.pyc
-lib/python2.5/site-packages/Toolserver/SOAPClient.pyo
-lib/python2.5/site-packages/Toolserver/SOAPHandler.py
-lib/python2.5/site-packages/Toolserver/SOAPHandler.pyc
-lib/python2.5/site-packages/Toolserver/SOAPHandler.pyo
-lib/python2.5/site-packages/Toolserver/Server.py
-lib/python2.5/site-packages/Toolserver/Server.pyc
-lib/python2.5/site-packages/Toolserver/Server.pyo
-lib/python2.5/site-packages/Toolserver/SyncCall.py
-lib/python2.5/site-packages/Toolserver/SyncCall.pyc
-lib/python2.5/site-packages/Toolserver/SyncCall.pyo
-lib/python2.5/site-packages/Toolserver/TagRenderer.py
-lib/python2.5/site-packages/Toolserver/TagRenderer.pyc
-lib/python2.5/site-packages/Toolserver/TagRenderer.pyo
-lib/python2.5/site-packages/Toolserver/Tool.py
-lib/python2.5/site-packages/Toolserver/Tool.pyc
-lib/python2.5/site-packages/Toolserver/Tool.pyo
-lib/python2.5/site-packages/Toolserver/Utils.py
-lib/python2.5/site-packages/Toolserver/Utils.pyc
-lib/python2.5/site-packages/Toolserver/Utils.pyo
-lib/python2.5/site-packages/Toolserver/Worker.py
-lib/python2.5/site-packages/Toolserver/Worker.pyc
-lib/python2.5/site-packages/Toolserver/Worker.pyo
-lib/python2.5/site-packages/Toolserver/XMLRPCClient.py
-lib/python2.5/site-packages/Toolserver/XMLRPCClient.pyc
-lib/python2.5/site-packages/Toolserver/XMLRPCClient.pyo
-lib/python2.5/site-packages/Toolserver/XMLRPCHandler.py
-lib/python2.5/site-packages/Toolserver/XMLRPCHandler.pyc
-lib/python2.5/site-packages/Toolserver/XMLRPCHandler.pyo
-lib/python2.5/site-packages/Toolserver/__init__.py
-lib/python2.5/site-packages/Toolserver/__init__.pyc
-lib/python2.5/site-packages/Toolserver/__init__.pyo
-lib/python2.5/site-packages/Toolserver/autoreload.py
-lib/python2.5/site-packages/Toolserver/autoreload.pyc
-lib/python2.5/site-packages/Toolserver/autoreload.pyo
-lib/python2.5/site-packages/Toolserver/select_trigger.py
-lib/python2.5/site-packages/Toolserver/select_trigger.pyc
-lib/python2.5/site-packages/Toolserver/select_trigger.pyo
-lib/python2.5/site-packages/Toolserver/timeoutsocket.py
-lib/python2.5/site-packages/Toolserver/timeoutsocket.pyc
-lib/python2.5/site-packages/Toolserver/timeoutsocket.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/AsyncCall.py
+%%PYTHON_SITELIBDIR%%/Toolserver/AsyncCall.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/AsyncCall.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/Authentication.py
+%%PYTHON_SITELIBDIR%%/Toolserver/Authentication.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/Authentication.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/CRAMUtils.py
+%%PYTHON_SITELIBDIR%%/Toolserver/CRAMUtils.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/CRAMUtils.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/Client.py
+%%PYTHON_SITELIBDIR%%/Toolserver/Client.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/Client.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/ClientMachinery.py
+%%PYTHON_SITELIBDIR%%/Toolserver/ClientMachinery.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/ClientMachinery.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/ClientRegistry.py
+%%PYTHON_SITELIBDIR%%/Toolserver/ClientRegistry.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/ClientRegistry.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/Config.py
+%%PYTHON_SITELIBDIR%%/Toolserver/Config.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/Config.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/Context.py
+%%PYTHON_SITELIBDIR%%/Toolserver/Context.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/Context.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/Daemonize.py
+%%PYTHON_SITELIBDIR%%/Toolserver/Daemonize.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/Daemonize.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/DefaultConfig.py
+%%PYTHON_SITELIBDIR%%/Toolserver/DefaultConfig.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/DefaultConfig.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/Factory.py
+%%PYTHON_SITELIBDIR%%/Toolserver/Factory.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/Factory.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/HTTPHandler.py
+%%PYTHON_SITELIBDIR%%/Toolserver/HTTPHandler.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/HTTPHandler.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/LRUCache.py
+%%PYTHON_SITELIBDIR%%/Toolserver/LRUCache.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/LRUCache.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/Linda.py
+%%PYTHON_SITELIBDIR%%/Toolserver/Linda.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/Linda.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/Monitor.py
+%%PYTHON_SITELIBDIR%%/Toolserver/Monitor.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/Monitor.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/MonitorWin32.py
+%%PYTHON_SITELIBDIR%%/Toolserver/MonitorWin32.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/MonitorWin32.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/PickleRPCClient.py
+%%PYTHON_SITELIBDIR%%/Toolserver/PickleRPCClient.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/PickleRPCClient.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/ProcessQueue.py
+%%PYTHON_SITELIBDIR%%/Toolserver/ProcessQueue.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/ProcessQueue.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/RESTCall.py
+%%PYTHON_SITELIBDIR%%/Toolserver/RESTCall.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/RESTCall.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/RESTHandler.py
+%%PYTHON_SITELIBDIR%%/Toolserver/RESTHandler.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/RESTHandler.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/RPCHandler.py
+%%PYTHON_SITELIBDIR%%/Toolserver/RPCHandler.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/RPCHandler.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/ReactorChain.py
+%%PYTHON_SITELIBDIR%%/Toolserver/ReactorChain.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/ReactorChain.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/RewriteHandler.py
+%%PYTHON_SITELIBDIR%%/Toolserver/RewriteHandler.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/RewriteHandler.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/SOAPClient.py
+%%PYTHON_SITELIBDIR%%/Toolserver/SOAPClient.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/SOAPClient.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/SOAPHandler.py
+%%PYTHON_SITELIBDIR%%/Toolserver/SOAPHandler.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/SOAPHandler.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/Server.py
+%%PYTHON_SITELIBDIR%%/Toolserver/Server.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/Server.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/SyncCall.py
+%%PYTHON_SITELIBDIR%%/Toolserver/SyncCall.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/SyncCall.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/TagRenderer.py
+%%PYTHON_SITELIBDIR%%/Toolserver/TagRenderer.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/TagRenderer.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/Tool.py
+%%PYTHON_SITELIBDIR%%/Toolserver/Tool.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/Tool.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/Utils.py
+%%PYTHON_SITELIBDIR%%/Toolserver/Utils.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/Utils.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/Worker.py
+%%PYTHON_SITELIBDIR%%/Toolserver/Worker.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/Worker.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/XMLRPCClient.py
+%%PYTHON_SITELIBDIR%%/Toolserver/XMLRPCClient.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/XMLRPCClient.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/XMLRPCHandler.py
+%%PYTHON_SITELIBDIR%%/Toolserver/XMLRPCHandler.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/XMLRPCHandler.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/__init__.py
+%%PYTHON_SITELIBDIR%%/Toolserver/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/autoreload.py
+%%PYTHON_SITELIBDIR%%/Toolserver/autoreload.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/autoreload.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/select_trigger.py
+%%PYTHON_SITELIBDIR%%/Toolserver/select_trigger.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/select_trigger.pyo
+%%PYTHON_SITELIBDIR%%/Toolserver/timeoutsocket.py
+%%PYTHON_SITELIBDIR%%/Toolserver/timeoutsocket.pyc
+%%PYTHON_SITELIBDIR%%/Toolserver/timeoutsocket.pyo
 share/toolserver/INSTALL-FROM-SOURCE
 share/toolserver/LICENSE
 share/toolserver/README
@@ -134,4 +134,4 @@ share/toolserver/tools/WSGITool.py
 @dirrm share/toolserver/tools
 @dirrm share/toolserver/samples
 @dirrm share/toolserver
-@dirrm lib/python2.5/site-packages/Toolserver
+@dirrm %%PYTHON_SITELIBDIR%%/Toolserver