Index: branches/2020Q2/net-mgmt/py-napalm/files/patch-test_junos_conftest.py
===================================================================
--- branches/2020Q2/net-mgmt/py-napalm/files/patch-test_junos_conftest.py	(revision 536380)
+++ branches/2020Q2/net-mgmt/py-napalm/files/patch-test_junos_conftest.py	(nonexistent)
@@ -1,18 +0,0 @@
-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/2020Q2/net-mgmt/py-napalm/files/patch-test_junos_conftest.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2020Q2/net-mgmt/py-napalm/Makefile
===================================================================
--- branches/2020Q2/net-mgmt/py-napalm/Makefile	(revision 536380)
+++ branches/2020Q2/net-mgmt/py-napalm/Makefile	(revision 536381)
@@ -1,45 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	napalm
-DISTVERSION=	2.5.0
+DISTVERSION=	3.0.1
 CATEGORIES=	net-mgmt python
 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}lxml>=4.3.0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}textfsm>0:textproc/py-textfsm@${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.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}netmiko>=3.1.0:security/py-netmiko@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}paramiko>=2.6.0:security/py-paramiko@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${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}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:3.6+
 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/2020Q2/net-mgmt/py-napalm/distinfo
===================================================================
--- branches/2020Q2/net-mgmt/py-napalm/distinfo	(revision 536380)
+++ branches/2020Q2/net-mgmt/py-napalm/distinfo	(revision 536381)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571639020
-SHA256 (napalm-automation-napalm-2.5.0_GH0.tar.gz) = c30254303f0d908f64902d89ea73673a922d3a27f94c2af674264a1b5a230249
-SIZE (napalm-automation-napalm-2.5.0_GH0.tar.gz) = 1104384
+TIMESTAMP = 1589873376
+SHA256 (napalm-automation-napalm-3.0.1_GH0.tar.gz) = a2d159e91a2d1355fc1eed323a189981999f99776d15c628a8b6aba822fb855a
+SIZE (napalm-automation-napalm-3.0.1_GH0.tar.gz) = 1197783
Index: branches/2020Q2/net-mgmt/py-napalm/pkg-message
===================================================================
--- branches/2020Q2/net-mgmt/py-napalm/pkg-message	(nonexistent)
+++ branches/2020Q2/net-mgmt/py-napalm/pkg-message	(revision 536381)
@@ -0,0 +1,20 @@
+[
+{ type: upgrade
+  maximum_version: "3.0.1"
+  message: <<EOD
+Release 3.0.0 introduced support for the Arista FN 0039 command changes (Github
+issue #1093), by replacing the old style commands with the new style commands.
+
+This also affected the way NAPALM loads the configuration on the device (i.e.,
+it would transform the configuration before loading).
+
+In order to prevent this, and avoid unexpected results, a new optional argument
+"eos_fn0039_config" was introduced, defaulting to "False", which can be used to
+select whether NAPALM should convert the configuration command before loading.
+
+By default, NAPALM won't transform the configuration, but setting the variable
+"eos_fn0039_config" to "True" it would help one to transition to newer EOS
+versions.
+EOD
+}
+]

Property changes on: branches/2020Q2/net-mgmt/py-napalm/pkg-message
___________________________________________________________________
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/2020Q2
===================================================================
--- branches/2020Q2	(revision 536380)
+++ branches/2020Q2	(revision 536381)

Property changes on: branches/2020Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r535274,536372