Index: head/www/py-puppetboard/Makefile
===================================================================
--- head/www/py-puppetboard/Makefile	(revision 521954)
+++ head/www/py-puppetboard/Makefile	(revision 521955)
@@ -1,34 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	puppetboard
-PORTVERSION=	0.0.4
+PORTVERSION=	1.1.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	allanjude@FreeBSD.org
+MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Web interface to PuppetDB
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}CommonMark>=0.7.2:textproc/py-CommonMark@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Flask>=0.12:www/py-flask@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.14.2:www/py-flask-wtf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pypuppetdb>=0.1.1:databases/py-pypuppetdb@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pypuppetdb>=0.3.3:databases/py-pypuppetdb@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.13.0:www/py-requests@${PY_FLAVOR}
 
-CONFLICTS_INSTALL=puppetboard02-* puppetboard03-*
+USES=		python
 USE_GITHUB=	yes
-GH_ACCOUNT=	voxpupuli
-
-USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
+CONFLICTS_INSTALL=puppetboard02-* puppetboard03-*
+
+GH_ACCOUNT=	voxpupuli
 PLIST_FILES=	"@sample etc/puppetboard/default_settings.py.sample"
+
+post-patch:
+	${REINPLACE_CMD} -e '/requirements_for_tests/,+2d' \
+		${WRKSRC}/setup.py
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppetboard
 	${CP} ${WRKSRC}/puppetboard/default_settings.py ${STAGEDIR}${PREFIX}/etc/puppetboard/default_settings.py.sample
 
 .include <bsd.port.mk>
Index: head/www/py-puppetboard/distinfo
===================================================================
--- head/www/py-puppetboard/distinfo	(revision 521954)
+++ head/www/py-puppetboard/distinfo	(revision 521955)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476513137
-SHA256 (voxpupuli-puppetboard-v0.0.4_GH0.tar.gz) = 95ce69e4b017d56d38b7ea8aa2ca131b7702a18228c68d41fcfd0d7080732817
-SIZE (voxpupuli-puppetboard-v0.0.4_GH0.tar.gz) = 2851486
+TIMESTAMP = 1577856625
+SHA256 (voxpupuli-puppetboard-v1.1.0_GH0.tar.gz) = 74b63b6ed5af4e06a6ac9513516273843af7ad0fd6b806f50c9bb79a1944c598
+SIZE (voxpupuli-puppetboard-v1.1.0_GH0.tar.gz) = 2277196
Index: head/www/py-puppetboard/files/patch-puppetboard_app.py
===================================================================
--- head/www/py-puppetboard/files/patch-puppetboard_app.py	(nonexistent)
+++ head/www/py-puppetboard/files/patch-puppetboard_app.py	(revision 521955)
@@ -0,0 +1,20 @@
+--- puppetboard/app.py.orig	2017-10-16 10:44:29 UTC
++++ puppetboard/app.py
+@@ -25,7 +25,7 @@ from puppetboard.utils import (get_or_abort, yield_or_
+ from puppetboard.dailychart import get_daily_reports_chart
+ 
+ import werkzeug.exceptions as ex
+-import CommonMark
++import commonmark
+ 
+ from puppetboard.core import get_app, get_puppetdb, environments
+ import puppetboard.errors
+@@ -546,7 +546,7 @@ def report(env, node_name, report_id):
+     except StopIteration:
+         abort(404)
+ 
+-    report.version = CommonMark.commonmark(report.version)
++    report.version = commonmark.commonmark(report.version)
+ 
+     return render_template(
+         'report.html',

Property changes on: head/www/py-puppetboard/files/patch-puppetboard_app.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/py-puppetboard02/Makefile
===================================================================
--- head/www/py-puppetboard02/Makefile	(revision 521954)
+++ head/www/py-puppetboard02/Makefile	(revision 521955)
@@ -1,37 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	puppetboard
 PORTVERSION=	0.2.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	02
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Web interface to PuppetDB
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-DEPRECATED=	Consider switching to www/py-puppetboard03
+DEPRECATED=	Use www/py-puppetboard instead
+EXPIRATION_DATE=2020-04-01
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pypuppetdb03>=0.2.0:databases/py-pypuppetdb03@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests@${PY_FLAVOR}
 
 CONFLICTS_INSTALL=puppetboard-* puppetboard03-*
 USE_GITHUB=	yes
 GH_ACCOUNT=	voxpupuli
 
 USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 PLIST_FILES=	"@sample etc/puppetboard/default_settings.py.sample"
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppetboard
 	${CP} ${WRKSRC}/puppetboard/default_settings.py ${STAGEDIR}${PREFIX}/etc/puppetboard/default_settings.py.sample
 
 .include <bsd.port.mk>
Index: head/www/py-puppetboard03/Makefile
===================================================================
--- head/www/py-puppetboard03/Makefile	(revision 521954)
+++ head/www/py-puppetboard03/Makefile	(revision 521955)
@@ -1,38 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=	puppetboard
 PORTVERSION=	0.3.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	03
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Web interface to PuppetDB
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+DEPRECATED=	Use www/py-puppetboard instead
+EXPIRATION_DATE=2020-04-01
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}CommonMark>=0.7.2:textproc/py-CommonMark@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask>=0.12:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.14.2:www/py-flask-wtf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pypuppetdb03>=0.3.3:databases/py-pypuppetdb03@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.13.0:www/py-requests@${PY_FLAVOR}
 
 USES=		python:2.7
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 
 CONFLICTS_INSTALL=puppetboard-* puppetboard02-*
 
 GH_ACCOUNT=	voxpupuli
 PLIST_FILES=	"@sample etc/puppetboard/default_settings.py.sample"
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppetboard
 	${CP} ${WRKSRC}/puppetboard/default_settings.py ${STAGEDIR}${PREFIX}/etc/puppetboard/default_settings.py.sample
 
 .include <bsd.port.mk>