- Update MASTER_SITES and WWW: line

- Support PORTEXAMPLES
- Switch to optionsng

PR:           ports/169421
Submitted by: KATO Tsuguru <tkato432 _at_ yahoo.com>
Approved by:  beat (mentor)

3 files changed, 24 insertions, 55 deletions

diff --git a/net/py-medusa/Makefile b/net/py-medusa/Makefile
index c74a1f78409f..c7027cb73929 100644
--- a/net/py-medusa/Makefile
+++ b/net/py-medusa/Makefile
@@ -7,30 +7,40 @@
 
 PORTNAME=	medusa
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	net devel python
-MASTER_SITES=	http://www.amk.ca/files/python/
+MASTER_SITES=	CHEESESHOP/source/m/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR=	python
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Asynchronous socket-based server framework for Python
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 USE_PYTHON=	yes
 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/${PKGNAMEPREFIX}${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
+
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
 post-install:
-	@${MKDIR} ${DOCSDIR}/docs
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}/docs
-.for exdir in ${EXAMPLEDIRS}
-	@${MKDIR} ${EXAMPLESDIR}/${exdir}
-	@${INSTALL_DATA} ${WRKSRC}/${exdir}/* ${EXAMPLESDIR}/${exdir}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for doc in CHANGES.txt INSTALL.txt LICENSE.txt README.txt TODO.txt
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+.endfor
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR})
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+.for exdir in demo test thread
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${exdir} ${EXAMPLESDIR})
 .endfor
 .endif
 
diff --git a/net/py-medusa/pkg-descr b/net/py-medusa/pkg-descr
index a062de03ff89..526ad7b60563 100644
--- a/net/py-medusa/pkg-descr
+++ b/net/py-medusa/pkg-descr
@@ -5,4 +5,4 @@ extremely high-traffic sites to distributed data processing systems.
 It is an elegant and efficient solution to a difficult programming
 problem.
 
-WWW: http://www.amk.ca/python/code/medusa.html
+WWW: http://pypi.python.org/pypi/medusa/
diff --git a/net/py-medusa/pkg-plist b/net/py-medusa/pkg-plist
index 76d54fe64517..619f4ad026d6 100644
--- a/net/py-medusa/pkg-plist
+++ b/net/py-medusa/pkg-plist
@@ -80,44 +80,3 @@
 %%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/programming.html
-%%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%%/demo/winFTPserver.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_producers.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%%@dirrm %%EXAMPLESDIR%%/thread
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/test
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/demo
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%