Index: head/www/py-bleach/Makefile
===================================================================
--- head/www/py-bleach/Makefile	(revision 366587)
+++ head/www/py-bleach/Makefile	(revision 366588)
@@ -1,31 +1,32 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	bleach
-PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTVERSION=	1.4
 CATEGORIES=	www python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Easy whitelist-based HTML-sanitizing tool for Python
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}html5lib>=0.95:${PORTSDIR}/www/py-html5lib
-TEST_DEPENDS:=	${RUN_DEPENDS} \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}html5lib>=0.95:${PORTSDIR}/www/py-html5lib \
 		nosetests:${PORTSDIR}/devel/py-nose
 
-USE_GITHUB=		yes
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+OPTIONS_DEFINE=	TESTS
 
-GH_ACCOUNT=	jsocol
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	baf1eac
+TESTS_DESC=		Install tools for test suite
+TESTS_BUILD_DEPENDS=	${TEST_DEPENDS}
 
+USES=		python
+USE_PYTHON=	distutils autoplist
+
 regression-test: build
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
Index: head/www/py-bleach/distinfo
===================================================================
--- head/www/py-bleach/distinfo	(revision 366587)
+++ head/www/py-bleach/distinfo	(revision 366588)
@@ -1,2 +1,2 @@
-SHA256 (bleach-1.2.2.tar.gz) = 2e7a29881eff2b7f2aa9a24e052edcd296d12c1c206957cd8be9f9e140f266b0
-SIZE (bleach-1.2.2.tar.gz) = 27607
+SHA256 (bleach-1.4.tar.gz) = ab6947515ac2cc2fb894e718cbab1beeb342843fd816d4c2a277599ddbefba7b
+SIZE (bleach-1.4.tar.gz) = 17454