Index: head/www/py-kallithea/Makefile
===================================================================
--- head/www/py-kallithea/Makefile	(revision 488510)
+++ head/www/py-kallithea/Makefile	(revision 488511)
@@ -1,57 +1,58 @@
 # Created by: Ilia Skalozubov <freebsd@skinc.ru>
 # $FreeBSD$
 
 PORTNAME=	kallithea
-PORTVERSION=	0.3.2
-PORTREVISION=	3
+PORTVERSION=	0.3.6
 CATEGORIES=	www devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Kallithea-${PORTVERSION}
 
 MAINTAINER=	freebsd@skinc.ru
 COMMENT=	Fast and powerful management tool for Mercurial and Git
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}waitress>=0.8.8:www/py-waitress@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:www/py-webob@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}WebTest>=1.4.3:www/py-WebTest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beaker>=1.6.4:www/py-beaker@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.10:databases/py-sqlalchemy10@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0.9.0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}celery>=2.2.5:devel/py-celery@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urlobject>=2.3.4:www/py-urlobject@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}routes>=1.13:www/py-routes@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dulwich>=0.9.9:devel/dulwich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bcrypt>=0.3.0:security/py-bcrypt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}bleach>=2.1.3:www/py-bleach@${PY_FLAVOR} \
 		mercurial>=2.9:devel/mercurial
 
 USES=		python:2.7 shebangfix
-SHEBANG_FILES=	kallithea/tests/scripts/manual_test_crawler.py
 USE_PYTHON=	distutils autoplist
+
+SHEBANG_FILES=	kallithea/tests/scripts/manual_test_crawler.py
 
 NO_ARCH=	yes
 
 USE_RC_SUBR=	kallithea
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	GIT LDAP
 GIT_DESC=	Git repositories support
 
 GIT_RUN_DEPENDS=	git:devel/git
 LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap:net/py-ldap@${PY_FLAVOR}
 
 .include <bsd.port.mk>
Index: head/www/py-kallithea/distinfo
===================================================================
--- head/www/py-kallithea/distinfo	(revision 488510)
+++ head/www/py-kallithea/distinfo	(revision 488511)
@@ -1,2 +1,3 @@
-SHA256 (Kallithea-0.3.2.tar.gz) = 891a7f88cf02a887c8eb711bfe56ff79f053a9051e0748fc29293bc7fa6ef0b3
-SIZE (Kallithea-0.3.2.tar.gz) = 5347665
+TIMESTAMP = 1545895082
+SHA256 (Kallithea-0.3.6.tar.gz) = 745b2032ab85be07f94b8ee499059a3b015a619262d64dee067d4b7198d64180
+SIZE (Kallithea-0.3.6.tar.gz) = 6374356
Index: head/www/py-kallithea/files/patch-setup.py
===================================================================
--- head/www/py-kallithea/files/patch-setup.py	(revision 488510)
+++ head/www/py-kallithea/files/patch-setup.py	(revision 488511)
@@ -1,60 +1,64 @@
---- setup.py.orig	2016-05-02 16:57:01 UTC
+--- setup.py.orig	2018-11-04 20:39:44 UTC
 +++ setup.py
-@@ -35,36 +35,36 @@ __platform__ = platform.system()
+@@ -35,38 +35,38 @@ __platform__ = platform.system()
  is_windows = __platform__ in ['Windows']
  
  requirements = [
+-    "setuptools<34", # setuptools==34 has an undeclared requirement of pyparsing >=2.1, but celery<2.3 requires pyparsing<2
 -    "waitress==0.8.8",
 -    "webob>=1.0.8,<=1.1.1",
 -    "webtest==1.4.3",
--    "Pylons>=1.0.0,<=1.0.2",
+-    "Pylons>=1.0.0,<=1.0.3",
 -    "Beaker==1.6.4",
 -    "WebHelpers==1.3",
 -    "formencode>=1.2.4,<=1.2.6",
 -    "SQLAlchemy==0.7.10",
 -    "Mako>=0.9.0,<=1.0.0",
++    "setuptools",
 +    "waitress>=0.8.8",
 +    "webob>=1.0.8",
 +    "webtest>=1.4.3",
 +    "Pylons>=1.0.0",
 +    "Beaker>=1.6.4",
 +    "WebHelpers>=1.3",
 +    "formencode>=1.2.4",
 +    "SQLAlchemy>=0.7.10",
 +    "Mako>=0.9.0",
      "pygments>=1.5",
 -    "whoosh>=2.4.0,<=2.5.7",
 -    "celery>=2.2.5,<2.3",
 -    "babel>=0.9.6,<=1.3",
 -    "python-dateutil>=1.5.0,<2.0.0",
 -    "markdown==2.2.1",
 -    "docutils>=0.8.1,<=0.11",
 +    "whoosh>=2.4.0",
 +    "celery>=2.2.5",
 +    "babel>=0.9.6",
 +    "python-dateutil>=1.5.0",
 +    "markdown>=2.2.1",
 +    "docutils>=0.8.11",
      "mock",
 -    "URLObject==2.3.4",
 -    "Routes==1.13",
 -    "dulwich>=0.9.9,<=0.9.9",
--    "mercurial>=2.9,<3.8",
+-    "mercurial>=2.9,<4.3",
+-    "bleach >= 3.0, < 3.1",
 +    "URLObject>=2.3.4",
 +    "Routes>=1.13",
 +    "dulwich>=0.9.9",
 +    "mercurial>=2.9",
++    "bleach>=2.1.3",
  ]
  
  if sys.version_info < (2, 7):
 -    requirements.append("importlib==1.0.1")
 +    requirements.append("importlib>=1.0.1")
      requirements.append("unittest2")
      requirements.append("argparse")
  
  if not is_windows:
 -    requirements.append("py-bcrypt>=0.3.0,<=0.4")
-+    requirements.append("py-bcrypt>=0.3.0")
++    requirements.append("bcrypt>=0.3.0")
  
  
  dependency_links = [