From owner-svn-ports-all@freebsd.org  Thu Jan  7 14:07:18 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2DC4FA663B9;
 Thu,  7 Jan 2016 14:07:18 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D8E7C135F;
 Thu,  7 Jan 2016 14:07:17 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u07E7HT3012596;
 Thu, 7 Jan 2016 14:07:17 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u07E7Hmb012595;
 Thu, 7 Jan 2016 14:07:17 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201601071407.u07E7Hmb012595@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 7 Jan 2016 14:07:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405438 - head/www/py-ws4py
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jan 2016 14:07:18 -0000

Author: amdmi3
Date: Thu Jan  7 14:07:16 2016
New Revision: 405438
URL: https://svnweb.freebsd.org/changeset/ports/405438

Log:
  - Switch to options helpers

Modified:
  head/www/py-ws4py/Makefile

Modified: head/www/py-ws4py/Makefile
==============================================================================
--- head/www/py-ws4py/Makefile	Thu Jan  7 14:06:08 2016	(r405437)
+++ head/www/py-ws4py/Makefile	Thu Jan  7 14:07:16 2016	(r405438)
@@ -18,33 +18,29 @@ 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
-
-.include <bsd.port.options.mk>
+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
 
 # 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>