Index: branches/2019Q4/net-mgmt/py-napalm/Makefile
===================================================================
--- branches/2019Q4/net-mgmt/py-napalm/Makefile	(revision 515270)
+++ branches/2019Q4/net-mgmt/py-napalm/Makefile	(revision 515271)
@@ -1,38 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	napalm
-DISTVERSION=	2.4.0
-PORTREVISION=	1
+DISTVERSION=	2.5.0
 CATEGORIES=	net-mgmt python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Net Automation and Progr. Abstraction Layer with Multivendor support
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}textfsm>0:textproc/py-textfsm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}junos-eznc>=2.2.0:net-mgmt/py-junos-eznc@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}junos-eznc>=2.2.1:net-mgmt/py-junos-eznc@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}netmiko>=2.3.0:security/py-netmiko@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}netmiko>=2.4.2:security/py-netmiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>=2.4.2:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nxapi-plumbing>=0.5.2:net-mgmt/py-nxapi-plumbing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyeapi>=0.8.2:net-mgmt/py-pyeapi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyIOSXR>=0.53:net-mgmt/py-pyIOSXR@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scp>0:security/py-scp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}cffi>=1.11.3:devel/py-cffi@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}cffi>=1.11.3:devel/py-cffi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ciscoconfparse>0:net-mgmt/py-ciscoconfparse@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.6.4:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ddt>=1.2.0:devel/py-ddt@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
+USE_GITHUB=	yes
+GH_ACCOUNT=	napalm-automation
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|==|>=|' ${WRKSRC}/requirements.txt
+
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.mk>
Index: branches/2019Q4/net-mgmt/py-napalm/distinfo
===================================================================
--- branches/2019Q4/net-mgmt/py-napalm/distinfo	(revision 515270)
+++ branches/2019Q4/net-mgmt/py-napalm/distinfo	(revision 515271)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550784668
-SHA256 (napalm-2.4.0.tar.gz) = 97e4021bec2200490d91d2829ffcef534ce3d841eef5b3251e2d1d50accd63ab
-SIZE (napalm-2.4.0.tar.gz) = 158163
+TIMESTAMP = 1571639020
+SHA256 (napalm-automation-napalm-2.5.0_GH0.tar.gz) = c30254303f0d908f64902d89ea73673a922d3a27f94c2af674264a1b5a230249
+SIZE (napalm-automation-napalm-2.5.0_GH0.tar.gz) = 1104384
Index: branches/2019Q4/net-mgmt/py-napalm/files/patch-test_junos_conftest.py
===================================================================
--- branches/2019Q4/net-mgmt/py-napalm/files/patch-test_junos_conftest.py	(nonexistent)
+++ branches/2019Q4/net-mgmt/py-napalm/files/patch-test_junos_conftest.py	(revision 515271)
@@ -0,0 +1,18 @@
+Fixes unittests with net-mgmt/py-junos-eznc >= 2.3.0
+
+See also:
+https://github.com/napalm-automation/napalm/issues/1060
+
+--- test/junos/conftest.py.orig	2019-10-10 10:31:18 UTC
++++ test/junos/conftest.py
+@@ -77,6 +77,10 @@ class FakeJunOSDevice(BaseTestDouble):
+         }
+         self._uptime = 4380
+ 
++        # Since junos-eznc 2.3.0 the new SAX parser is used as default. Thus
++        # disable it to use the DOM parser which was used prior.
++        self._use_filter = False
++
+     @property
+     def facts(self):
+         # we want to reinitialize it every time to avoid side effects

Property changes on: branches/2019Q4/net-mgmt/py-napalm/files/patch-test_junos_conftest.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: branches/2019Q4
===================================================================
--- branches/2019Q4	(revision 515270)
+++ branches/2019Q4	(revision 515271)

Property changes on: branches/2019Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r515170