--- ./Makefile	2012-05-30 22:08:24.000000000 +1000
+++ ./Makefile	2012-07-15 01:00:44.000000000 +1000
@@ -19,16 +19,16 @@ 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 
-OPTIONS=	PYYAML	"YAML support"	on
+OPTIONS_DEFINE=	YAML
+OPTIONS_DEFAULT=	YAML
+YAML_DESC=	Support parsing YAML reponses
 
 # bypass infrastructure bug
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/${PYEASYINSTALL_EGG}
-
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PYYAML)
+.if ${PORT_OPTIONS:MYAML}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml
 .endif
 
--- ./files/patch-setup.py	1970-01-01 10:00:00.000000000 +1000
+++ ./files/patch-setup.py	2012-07-15 01:01:53.000000000 +1000
@@ -0,0 +1,8 @@ 
+--- ./setup.py.orig	2012-07-15 01:01:36.000000000 +1000
++++ ./setup.py	2012-07-15 01:01:49.000000000 +1000
+@@ -30,4 +30,5 @@
+         'Programming Language :: Python',
+         'Topic :: Software Development :: Libraries :: Python Modules',
+     ],
++    zip_safe=False,
+ )
--- ./pkg-plist	1970-01-01 10:00:00.000000000 +1000
+++ ./pkg-plist	2012-07-15 01:04:26.000000000 +1000
@@ -0,0 +1,10 @@ 
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beanstalkc.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beanstalkc.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beanstalkc.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%