- add YAML option

- bump PORTREVISION because of dependencies change
- use GITHUB mastersite instead of CHEESESHOP
- switch to setuptools, update pkg-plist accordingly
- remove setup.py patch
- add TEST_DEPENDS and regression-test target
- fix typo in Makefile header: s/Creates by/Created by

PR:		173903
Submitted by:	Kubilay Kocak <koobs.freebsd at gmail dot com> (maintainer)
Feature safe:	yes

4 files changed, 57 insertions, 33 deletions

diff --git a/www/py-slumber/Makefile b/www/py-slumber/Makefile
index 348babc45945..4b2836195acf 100644
--- a/www/py-slumber/Makefile
+++ b/www/py-slumber/Makefile
@@ -1,10 +1,10 @@
-# Creates by: Kubilay Kocak <koobs.freebsd@gmail.com>
+# Created by: Kubilay Kocak <koobs.freebsd@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	slumber
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs.freebsd@gmail.com
@@ -14,7 +14,28 @@ LICENSE=	BSD
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
 
+OPTIONS_DEFINE=		YAML
+YAML_DESC=		Enable YAML serializer support
+OPTIONSFILE?=		${PORT_DBDIR}/py-${PORTNAME}/options
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MYAML}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml
+.endif
+
+USE_GITHUB=		yes
 USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
+
+GH_ACCOUNT=	dstufft
+GH_COMMIT=	e5bde78
+GH_TAGNAME=	v${DISTVERSION}
+
+TEST_DEPENDS:=	${RUN_DEPENDS} \
+		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+
+regression-test: build
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
 
 .include <bsd.port.mk>
diff --git a/www/py-slumber/distinfo b/www/py-slumber/distinfo
index a4278f59bba9..63765ac700d3 100644
--- a/www/py-slumber/distinfo
+++ b/www/py-slumber/distinfo
@@ -1,2 +1,2 @@
-SHA256 (slumber-0.5.1.tar.gz) = da3ede8ea882b7db6f60094329884fd18700b7111c2527d14f5c75601616fe83
-SIZE (slumber-0.5.1.tar.gz) = 9078
+SHA256 (slumber-0.5.1.tar.gz) = e6dc6d2eaa2de4c88e2ffdeadb2925c1262a33283085bac40e96d750e3ece670
+SIZE (slumber-0.5.1.tar.gz) = 13847
diff --git a/www/py-slumber/files/patch-setup.py b/www/py-slumber/files/patch-setup.py
deleted file mode 100644
index 3f7a0a14a44d..000000000000
--- a/www/py-slumber/files/patch-setup.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./setup.py.orig	2012-04-16 21:56:18.000000000 +1000
-+++ ./setup.py	2012-06-02 20:40:02.000000000 +1000
-@@ -1,5 +1,5 @@
- import os.path
--from setuptools import setup, find_packages
-+from distutils.core import setup
- import sys
- 
- install_requires = ["requests"]
-@@ -20,7 +20,7 @@
-     url = "http://slumber.in/",
-     author = "Donald Stufft",
-     author_email = "donald.stufft@gmail.com",
--    packages = find_packages(),
-+    packages = ["slumber"],
-     zip_safe = False,
-     install_requires = install_requires,
-     test_suite = "tests.get_tests",
diff --git a/www/py-slumber/pkg-plist b/www/py-slumber/pkg-plist
index 51bf02a5d722..726d06e41e3b 100644
--- a/www/py-slumber/pkg-plist
+++ b/www/py-slumber/pkg-plist
@@ -1,11 +1,32 @@
 @comment $FreeBSD$
-%%PYTHON_SITELIBDIR%%/slumber/__init__.py
-%%PYTHON_SITELIBDIR%%/slumber/__init__.pyc
-%%PYTHON_SITELIBDIR%%/slumber/__init__.pyo
-%%PYTHON_SITELIBDIR%%/slumber/exceptions.py
-%%PYTHON_SITELIBDIR%%/slumber/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/slumber/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/slumber/serialize.py
-%%PYTHON_SITELIBDIR%%/slumber/serialize.pyc
-%%PYTHON_SITELIBDIR%%/slumber/serialize.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/slumber
+%%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/requires.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/slumber/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/slumber/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/slumber/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/slumber/exceptions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/slumber/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/slumber/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/slumber/serialize.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/slumber/serialize.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/slumber/serialize.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/resource.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/resource.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/resource.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/serializer.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/serializer.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/serializer.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/utils.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/utils.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/utils.pyo
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/slumber
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%