Index: head/www/py-ws4py/Makefile
===================================================================
--- head/www/py-ws4py/Makefile	(revision 405437)
+++ head/www/py-ws4py/Makefile	(revision 405438)
@@ -1,50 +1,46 @@
 # Created by: rene@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	ws4py
 PORTVERSION=	0.3.4
 CATEGORIES=	www python
 MASTER_SITES=	http://www.defuze.org/oss/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WebSocket package for Python
 
 LICENSE=	BSD3CLAUSE
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	CHERRYPY GEVENT TORNADO
-OPTIONS_DEFAULT=	CHERRYPY GEVENT
+OPTIONS_DEFAULT=CHERRYPY GEVENT
 CHERRYPY_DESC=	CherryPy server support
 GEVENT_DESC=	gevent-based client/server support
 TORNADO_DESC=	Tornado client support
 
-CHERRYPY_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2.2:${PORTSDIR}/www/py-cherrypy
-GEVENT_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:${PORTSDIR}/devel/py-gevent
-TORNADO_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tornado>=3.1:${PORTSDIR}/www/py-tornado
+CHERRYPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2.2:${PORTSDIR}/www/py-cherrypy
+GEVENT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:${PORTSDIR}/devel/py-gevent
+TORNADO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>=3.1:${PORTSDIR}/www/py-tornado
 
-.include <bsd.port.options.mk>
-
 # Do not install files which will not work
-post-patch:
-.if ! ${PORT_OPTIONS:MCHERRYPY}
+post-patch-CHERRYPY-off:
 .for f in test/test_cherrypy.py ws4py/server/cherrypyserver.py
-	${RM} ${WRKSRC}/${f}
+	@${RM} ${WRKSRC}/${f}
 .endfor
-.endif
-.if ! ${PORT_OPTIONS:MGEVENT}
+
+post-patch-GEVENT-off:
 .for f in ws4py/client/geventclient.py ws4py/server/geventserver.py
-	${RM} ${WRKSRC}/${f}
+	@${RM} ${WRKSRC}/${f}
 .endfor
-.endif
-.if ! ${PORT_OPTIONS:MTORNADO}
+
+post-patch-TORNADO-off:
 .for f in ws4py/client/tornadoclient.py
-	${RM} ${WRKSRC}/${f}
+	@${RM} ${WRKSRC}/${f}
 .endfor
-.endif
 
 .include <bsd.port.mk>