Update to 0.5.4

3 files changed, 127 insertions, 124 deletions

diff --git a/net/py-medusa/Makefile b/net/py-medusa/Makefile
index 314111ad7e4c..164c8248c02b 100644
--- a/net/py-medusa/Makefile
+++ b/net/py-medusa/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	medusa
-PORTVERSION=	0.5.3
+PORTVERSION=	0.5.4
 CATEGORIES=	net devel python
 MASTER_SITES=	http://www.amk.ca/files/python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,8 +20,8 @@ USE_PYDISTUTILS=	yes
 DIST_SUBDIR=	python
 DOCFILES=	CHANGES.txt INSTALL.txt LICENSE.txt README.txt TODO.txt
 EXAMPLEDIRS=	demo test thread
-DOCSDIR=	${PREFIX}/share/doc/py-medusa
-EXAMPLESDIR=	${PREFIX}/share/examples/py-medusa
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/net/py-medusa/distinfo b/net/py-medusa/distinfo
index 7c8f9a5b4155..b5095516a688 100644
--- a/net/py-medusa/distinfo
+++ b/net/py-medusa/distinfo
@@ -1 +1 @@
-MD5 (python/medusa-0.5.3.tar.gz) = 3b1682379fd93b01577c3b7564e56261
+MD5 (python/medusa-0.5.4.tar.gz) = 5d10505036bc38f8d4cb51d87516e069
diff --git a/net/py-medusa/pkg-plist b/net/py-medusa/pkg-plist
index f075deaca8eb..5ac96bac2ab2 100644
--- a/net/py-medusa/pkg-plist
+++ b/net/py-medusa/pkg-plist
@@ -1,120 +1,123 @@
-lib/%%PYTHON_VERSION%%/site-packages/medusa/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/auth_handler.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/auth_handler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/auth_handler.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/chat_server.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/chat_server.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/chat_server.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/counter.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/counter.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/counter.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/default_handler.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/default_handler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/default_handler.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/event_loop.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/event_loop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/event_loop.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/filesys.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/filesys.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/filesys.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/ftp_server.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/ftp_server.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/ftp_server.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/http_date.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/http_date.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/http_date.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/http_server.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/http_server.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/http_server.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/logger.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/logger.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/logger.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/m_syslog.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/m_syslog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/m_syslog.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/medusa_gif.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/medusa_gif.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/medusa_gif.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/monitor.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/monitor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/monitor.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/monitor_client.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/monitor_client.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/monitor_client.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/monitor_client_win32.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/monitor_client_win32.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/monitor_client_win32.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/producers.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/producers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/producers.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/put_handler.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/put_handler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/put_handler.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/redirecting_handler.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/redirecting_handler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/redirecting_handler.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/resolver.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/resolver.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/resolver.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/rpc_client.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/rpc_client.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/rpc_client.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/rpc_server.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/rpc_server.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/rpc_server.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/script_handler.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/script_handler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/script_handler.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/status_handler.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/status_handler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/status_handler.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/unix_user_handler.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/unix_user_handler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/unix_user_handler.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/virtual_handler.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/virtual_handler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/virtual_handler.pyo
-lib/%%PYTHON_VERSION%%/site-packages/medusa/xmlrpc_handler.py
-lib/%%PYTHON_VERSION%%/site-packages/medusa/xmlrpc_handler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/medusa/xmlrpc_handler.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/medusa
-%%PORTDOCS%%share/examples/py-medusa/demo/publish.py
-%%PORTDOCS%%share/examples/py-medusa/demo/script_server.py
-%%PORTDOCS%%share/examples/py-medusa/demo/simple_anon_ftpd.py
-%%PORTDOCS%%share/examples/py-medusa/demo/start_medusa.py
-%%PORTDOCS%%share/examples/py-medusa/test/asyn_http_bench.py
-%%PORTDOCS%%share/examples/py-medusa/test/bench.py
-%%PORTDOCS%%share/examples/py-medusa/test/max_sockets.py
-%%PORTDOCS%%share/examples/py-medusa/test/test_11.py
-%%PORTDOCS%%share/examples/py-medusa/test/test_lb.py
-%%PORTDOCS%%share/examples/py-medusa/test/test_medusa.py
-%%PORTDOCS%%share/examples/py-medusa/test/test_single_11.py
-%%PORTDOCS%%share/examples/py-medusa/test/tests.txt
-%%PORTDOCS%%share/examples/py-medusa/thread/pi_module.py
-%%PORTDOCS%%share/examples/py-medusa/thread/select_trigger.py
-%%PORTDOCS%%share/examples/py-medusa/thread/test_module.py
-%%PORTDOCS%%share/examples/py-medusa/thread/thread_channel.py
-%%PORTDOCS%%share/examples/py-medusa/thread/thread_handler.py
-%%PORTDOCS%%share/doc/py-medusa/CHANGES.txt
-%%PORTDOCS%%share/doc/py-medusa/INSTALL.txt
-%%PORTDOCS%%share/doc/py-medusa/LICENSE.txt
-%%PORTDOCS%%share/doc/py-medusa/README.txt
-%%PORTDOCS%%share/doc/py-medusa/TODO.txt
-%%PORTDOCS%%share/doc/py-medusa/docs/README.html
-%%PORTDOCS%%share/doc/py-medusa/docs/async_blurbs.txt
-%%PORTDOCS%%share/doc/py-medusa/docs/composing_producers.gif
-%%PORTDOCS%%share/doc/py-medusa/docs/data_flow.gif
-%%PORTDOCS%%share/doc/py-medusa/docs/data_flow.html
-%%PORTDOCS%%share/doc/py-medusa/docs/debugging.txt
-%%PORTDOCS%%share/doc/py-medusa/docs/producers.gif
-%%PORTDOCS%%share/doc/py-medusa/docs/proxy_notes.txt
-%%PORTDOCS%%share/doc/py-medusa/docs/threads.txt
-%%PORTDOCS%%share/doc/py-medusa/docs/tkinter.txt
-%%PORTDOCS%%@dirrm share/examples/py-medusa/thread
-%%PORTDOCS%%@dirrm share/examples/py-medusa/test
-%%PORTDOCS%%@dirrm share/examples/py-medusa/demo
-%%PORTDOCS%%@dirrm share/examples/py-medusa
-%%PORTDOCS%%@dirrm share/doc/py-medusa/docs
-%%PORTDOCS%%@dirrm share/doc/py-medusa
+%%PYTHON_SITELIBDIR%%/medusa/__init__.py
+%%PYTHON_SITELIBDIR%%/medusa/__init__.pyc
+%%PYTHON_SITELIBDIR%%/medusa/__init__.pyo
+%%PYTHON_SITELIBDIR%%/medusa/auth_handler.py
+%%PYTHON_SITELIBDIR%%/medusa/auth_handler.pyc
+%%PYTHON_SITELIBDIR%%/medusa/auth_handler.pyo
+%%PYTHON_SITELIBDIR%%/medusa/chat_server.py
+%%PYTHON_SITELIBDIR%%/medusa/chat_server.pyc
+%%PYTHON_SITELIBDIR%%/medusa/chat_server.pyo
+%%PYTHON_SITELIBDIR%%/medusa/counter.py
+%%PYTHON_SITELIBDIR%%/medusa/counter.pyc
+%%PYTHON_SITELIBDIR%%/medusa/counter.pyo
+%%PYTHON_SITELIBDIR%%/medusa/default_handler.py
+%%PYTHON_SITELIBDIR%%/medusa/default_handler.pyc
+%%PYTHON_SITELIBDIR%%/medusa/default_handler.pyo
+%%PYTHON_SITELIBDIR%%/medusa/event_loop.py
+%%PYTHON_SITELIBDIR%%/medusa/event_loop.pyc
+%%PYTHON_SITELIBDIR%%/medusa/event_loop.pyo
+%%PYTHON_SITELIBDIR%%/medusa/filesys.py
+%%PYTHON_SITELIBDIR%%/medusa/filesys.pyc
+%%PYTHON_SITELIBDIR%%/medusa/filesys.pyo
+%%PYTHON_SITELIBDIR%%/medusa/ftp_server.py
+%%PYTHON_SITELIBDIR%%/medusa/ftp_server.pyc
+%%PYTHON_SITELIBDIR%%/medusa/ftp_server.pyo
+%%PYTHON_SITELIBDIR%%/medusa/http_date.py
+%%PYTHON_SITELIBDIR%%/medusa/http_date.pyc
+%%PYTHON_SITELIBDIR%%/medusa/http_date.pyo
+%%PYTHON_SITELIBDIR%%/medusa/http_server.py
+%%PYTHON_SITELIBDIR%%/medusa/http_server.pyc
+%%PYTHON_SITELIBDIR%%/medusa/http_server.pyo
+%%PYTHON_SITELIBDIR%%/medusa/logger.py
+%%PYTHON_SITELIBDIR%%/medusa/logger.pyc
+%%PYTHON_SITELIBDIR%%/medusa/logger.pyo
+%%PYTHON_SITELIBDIR%%/medusa/m_syslog.py
+%%PYTHON_SITELIBDIR%%/medusa/m_syslog.pyc
+%%PYTHON_SITELIBDIR%%/medusa/m_syslog.pyo
+%%PYTHON_SITELIBDIR%%/medusa/medusa_gif.py
+%%PYTHON_SITELIBDIR%%/medusa/medusa_gif.pyc
+%%PYTHON_SITELIBDIR%%/medusa/medusa_gif.pyo
+%%PYTHON_SITELIBDIR%%/medusa/monitor.py
+%%PYTHON_SITELIBDIR%%/medusa/monitor.pyc
+%%PYTHON_SITELIBDIR%%/medusa/monitor.pyo
+%%PYTHON_SITELIBDIR%%/medusa/monitor_client.py
+%%PYTHON_SITELIBDIR%%/medusa/monitor_client.pyc
+%%PYTHON_SITELIBDIR%%/medusa/monitor_client.pyo
+%%PYTHON_SITELIBDIR%%/medusa/monitor_client_win32.py
+%%PYTHON_SITELIBDIR%%/medusa/monitor_client_win32.pyc
+%%PYTHON_SITELIBDIR%%/medusa/monitor_client_win32.pyo
+%%PYTHON_SITELIBDIR%%/medusa/producers.py
+%%PYTHON_SITELIBDIR%%/medusa/producers.pyc
+%%PYTHON_SITELIBDIR%%/medusa/producers.pyo
+%%PYTHON_SITELIBDIR%%/medusa/put_handler.py
+%%PYTHON_SITELIBDIR%%/medusa/put_handler.pyc
+%%PYTHON_SITELIBDIR%%/medusa/put_handler.pyo
+%%PYTHON_SITELIBDIR%%/medusa/redirecting_handler.py
+%%PYTHON_SITELIBDIR%%/medusa/redirecting_handler.pyc
+%%PYTHON_SITELIBDIR%%/medusa/redirecting_handler.pyo
+%%PYTHON_SITELIBDIR%%/medusa/resolver.py
+%%PYTHON_SITELIBDIR%%/medusa/resolver.pyc
+%%PYTHON_SITELIBDIR%%/medusa/resolver.pyo
+%%PYTHON_SITELIBDIR%%/medusa/rpc_client.py
+%%PYTHON_SITELIBDIR%%/medusa/rpc_client.pyc
+%%PYTHON_SITELIBDIR%%/medusa/rpc_client.pyo
+%%PYTHON_SITELIBDIR%%/medusa/rpc_server.py
+%%PYTHON_SITELIBDIR%%/medusa/rpc_server.pyc
+%%PYTHON_SITELIBDIR%%/medusa/rpc_server.pyo
+%%PYTHON_SITELIBDIR%%/medusa/script_handler.py
+%%PYTHON_SITELIBDIR%%/medusa/script_handler.pyc
+%%PYTHON_SITELIBDIR%%/medusa/script_handler.pyo
+%%PYTHON_SITELIBDIR%%/medusa/status_handler.py
+%%PYTHON_SITELIBDIR%%/medusa/status_handler.pyc
+%%PYTHON_SITELIBDIR%%/medusa/status_handler.pyo
+%%PYTHON_SITELIBDIR%%/medusa/unix_user_handler.py
+%%PYTHON_SITELIBDIR%%/medusa/unix_user_handler.pyc
+%%PYTHON_SITELIBDIR%%/medusa/unix_user_handler.pyo
+%%PYTHON_SITELIBDIR%%/medusa/virtual_handler.py
+%%PYTHON_SITELIBDIR%%/medusa/virtual_handler.pyc
+%%PYTHON_SITELIBDIR%%/medusa/virtual_handler.pyo
+%%PYTHON_SITELIBDIR%%/medusa/xmlrpc_handler.py
+%%PYTHON_SITELIBDIR%%/medusa/xmlrpc_handler.pyc
+%%PYTHON_SITELIBDIR%%/medusa/xmlrpc_handler.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/medusa
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/async_blurbs.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/composing_producers.gif
+%%PORTDOCS%%%%DOCSDIR%%/docs/data_flow.gif
+%%PORTDOCS%%%%DOCSDIR%%/docs/data_flow.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/debugging.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/producers.gif
+%%PORTDOCS%%%%DOCSDIR%%/docs/proxy_notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/threads.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/tkinter.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo/publish.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo/script_server.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo/simple_anon_ftpd.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo/start_medusa.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/asyn_http_bench.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/bench.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/max_sockets.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_11.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_lb.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_medusa.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_single_11.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/tests.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/thread/pi_module.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/thread/select_trigger.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/thread/test_module.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/thread/thread_channel.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/thread/thread_handler.py
+%%PORTDOCS%%/%%DOCSDIR%%/docs/programming.html
+%%PORTDOCS%%/%%EXAMPLESDIR%%/demo/winFTPserver.py
+%%PORTDOCS%%/%%EXAMPLESDIR%%/test/test_producers.py
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/thread
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/test
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/demo
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%