Index: head/www/py-cherrypy/Makefile
===================================================================
--- head/www/py-cherrypy/Makefile	(revision 417407)
+++ head/www/py-cherrypy/Makefile	(revision 417408)
@@ -1,64 +1,63 @@
 # Created by: Nicola Vitale	<nivit@email.it>
 # $FreeBSD$
 
 PORTNAME=	cherrypy
-PORTVERSION=	3.2.6
-PORTREVISION=	0
+PORTVERSION=	5.4.0
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	CherryPy-${PORTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Pythonic, object-oriented web development framework
 
 LICENSE=	BSD3CLAUSE
 
 EXAMPLES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah \
 			${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS_DEFINE=	EXAMPLES
 
 PORTEXAMPLES=	*
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.options.mk>
 
 # handle tutorial separately, and remove cherrypy.process from data_files
 # otherwise it confuses build_py.get_outputs() and breaks PYDISTUTILS_AUTOPLIST
 post-patch:
-	@${REINPLACE_CMD} -e '89,96d' -e '68s/"cherrypy.tutorial",//1' \
-		-e '78d' -i.bak ${WRKSRC}/${PYSETUP}
+	@${REINPLACE_CMD} -e '99,106d' -e '78s/"cherrypy.tutorial",//1' \
+		-e '88d' -i.bak ${WRKSRC}/${PYSETUP}
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/cherrypy/tutorial && \
 	${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	(cd ${STAGEDIR}${PREFIX} && \
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${EXAMPLESDIR} ${EXAMPLESDIR:S,${PREFIX}/,,})
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} >= 3000    # devel/py-cheetah doesn't yet build with Python 3
 .undef EXAMPLES_RUN_DEPENDS
 .endif
 
 # The package cherrypy.wsgiserver includes both Python 2 and Python 3 modules,
 # so it breaks PYDISTUTILS_AUTOPLIST.
 # Instead of defining a cherrypy_build_py.get_outputs() method in setup.py
 # we simply remove unwanted modules (see cherrypy_build_py() in setup.py)
 post-extract:
 .if ${PYTHON_REL} >= 3000
 	@(cd ${WRKSRC}/cherrypy && ${RM} _cpcompat_subprocess.py && \
 	cd wsgiserver && ${RM} ssl_pyopenssl.py wsgiserver2.py)
 .else
 	@${RM} ${WRKSRC}/cherrypy/wsgiserver/wsgiserver3.py
 .endif
 
 .include <bsd.port.post.mk>
Index: head/www/py-cherrypy/distinfo
===================================================================
--- head/www/py-cherrypy/distinfo	(revision 417407)
+++ head/www/py-cherrypy/distinfo	(revision 417408)
@@ -1,2 +1,3 @@
-SHA256 (CherryPy-3.2.6.tar.gz) = bb20185786e852ef6ab5836a0b12c0f17d454cbbc4d073291535481978315b86
-SIZE (CherryPy-3.2.6.tar.gz) = 423894
+TIMESTAMP = 1464940005
+SHA256 (CherryPy-5.4.0.tar.gz) = bc8702099f6071ddd8b6404c110e22bb93e6a007fd9455e27f056be59a2ca801
+SIZE (CherryPy-5.4.0.tar.gz) = 435759