From 70e551ad4681789e17f2c546728297fbcf3804b9 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Fri, 28 Oct 2016 14:58:53 +0000
Subject: [PATCH] www/py-octoprint: unblock newer py-serial and py-flask-login

- Require py-serial at least 3.2 for arbitrary baud rate support
  on *BSDs, allowing OctoPrint to operate at the natural 250k baud rate
  that a lot of 3D printer firmware defaults to.

PR:		213842
Submitted by:	Kyle Evans (maintainer)
---
 www/py-octoprint/Makefile             | 3 ++-
 www/py-octoprint/files/patch-setup.py | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/www/py-octoprint/Makefile b/www/py-octoprint/Makefile
index 2e9d3bb42ebe..8f8c5e245576 100644
--- a/www/py-octoprint/Makefile
+++ b/www/py-octoprint/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	octoprint
 PORTVERSION=	1.3.0.a
+PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -21,7 +22,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.11.1:www/py-flask \
 		${PYTHON_PKGNAMEPREFIX}Flask-Babel>=0.11.1:devel/py-flask-babel \
 		${PYTHON_PKGNAMEPREFIX}Flask-Assets>=0.12:www/py-flask-assets \
 		${PYTHON_PKGNAMEPREFIX}markdown>=2.6.4:textproc/py-markdown \
-		${PYTHON_PKGNAMEPREFIX}serial>=2.7:comms/py-serial \
+		${PYTHON_PKGNAMEPREFIX}serial>=3.2:comms/py-serial \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.17:net/py-netaddr \
 		${PYTHON_PKGNAMEPREFIX}watchdog>=0.8.2:devel/py-watchdog \
 		${PYTHON_PKGNAMEPREFIX}sarge>=0.1.4:devel/py-sarge \
diff --git a/www/py-octoprint/files/patch-setup.py b/www/py-octoprint/files/patch-setup.py
index 547e43ff8c4d..fb9cc14cb532 100644
--- a/www/py-octoprint/files/patch-setup.py
+++ b/www/py-octoprint/files/patch-setup.py
@@ -6,13 +6,14 @@
  	"sockjs-tornado>=1.0.2,<1.1",
 -	"PyYAML>=3.12,<3.13",
 +	"PyYAML>=3.11,<3.13",
- 	"Flask-Login>=0.3,<0.4",
+-	"Flask-Login>=0.3,<0.4",
++	"Flask-Login>=0.3",
  	"Flask-Principal>=0.4,<0.5",
  	"Flask-Babel>=0.11,<0.12",
 @@ -26,15 +26,15 @@ INSTALL_REQUIRES = [
  	"markdown>=2.6.4,<2.7",
 -	"pyserial>=3.1.1,<3.2",
-+	"pyserial>=2.7,<3.2",
++	"pyserial>=3.2",
  	"netaddr>=0.7.17,<0.8",
 -	"watchdog>=0.8.3,<0.9",
 +	"watchdog>=0.8.2,<0.9",