Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -11678,3 +11678,4 @@
 x11/altyo||2019-03-06|Has expired: Broken for more than 6 months
 x11/pantheon-terminal||2019-03-06|Has expired: Broken for more than 6 months
 x11-wm/e-module-everything-websearch||2019-03-06|Has expired: Broken for more than 6 months
+net-mgmt/py-pysnmp-apps|net-mgmt/py-snmpclitools|2019-02-15|Renamed upstream
Index: head/net-mgmt/Makefile
===================================================================
--- head/net-mgmt/Makefile
+++ head/net-mgmt/Makefile
@@ -320,10 +320,10 @@
     SUBDIR += py-pynxos
     SUBDIR += py-pysmi
     SUBDIR += py-pysnmp
-    SUBDIR += py-pysnmp-apps
     SUBDIR += py-pysnmp-mibs
     SUBDIR += py-pyzabbix
     SUBDIR += py-snmp_passpersist
+    SUBDIR += py-snmpclitools
     SUBDIR += py-yapsnmp
     SUBDIR += qkismet
     SUBDIR += rackmonkey
Index: head/net-mgmt/py-pysnmp-apps/Makefile
===================================================================
--- head/net-mgmt/py-pysnmp-apps/Makefile
+++ head/net-mgmt/py-pysnmp-apps/Makefile
@@ -1,23 +0,0 @@
-# Created by: Martin Jackson <mhjacks@swbell.net>
-# $FreeBSD$
-
-PORTNAME=	pysnmp-apps
-PORTVERSION=	0.5.3
-CATEGORIES=	net-mgmt python
-MASTER_SITES=	CHEESESHOP \
-		SF/pysnmp/pysnmp-apps/${PORTVERSION}
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	mhjacks@swbell.net
-COMMENT=	Command line utilities for pysnmp
-
-LICENSE=	BSD2CLAUSE
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysnmp>=4.3.2:net-mgmt/py-pysnmp@${PY_FLAVOR}
-
-USES=		python
-USE_PYTHON=	distutils autoplist
-
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
Index: head/net-mgmt/py-pysnmp-apps/distinfo
===================================================================
--- head/net-mgmt/py-pysnmp-apps/distinfo
+++ head/net-mgmt/py-pysnmp-apps/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1551310471
-SHA256 (pysnmp-apps-0.5.3.tar.gz) = bf4ea6f3054a25b05e255d29e0b57a8aa8102f509048e3a9c0d93ddc86aff570
-SIZE (pysnmp-apps-0.5.3.tar.gz) = 42810
Index: head/net-mgmt/py-pysnmp-apps/pkg-descr
===================================================================
--- head/net-mgmt/py-pysnmp-apps/pkg-descr
+++ head/net-mgmt/py-pysnmp-apps/pkg-descr
@@ -1,5 +0,0 @@
-PySNMP is fully functional SNMP v1, v2c and v3 engine (agent and manager)
-written entirely in Python.  The -apps distribution contains command-line
-workalikes for snmpwalk, snmpget, etc. written using the PySNMP module.
-
-WWW: http://snmplabs.com/pysnmp/
Index: head/net-mgmt/py-snmpclitools/Makefile
===================================================================
--- head/net-mgmt/py-snmpclitools/Makefile
+++ head/net-mgmt/py-snmpclitools/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME=	snmpclitools
+PORTVERSION=	0.6.1
+CATEGORIES=	net-mgmt python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	mhjacks@swbell.net
+COMMENT=	Command-line SNMP utilities in Python
+
+LICENSE=	BSD2CLAUSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysnmp>=4.4.4:net-mgmt/py-pysnmp@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	concurrent distutils autoplist
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
Index: head/net-mgmt/py-snmpclitools/distinfo
===================================================================
--- head/net-mgmt/py-snmpclitools/distinfo
+++ head/net-mgmt/py-snmpclitools/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1550272891
+SHA256 (snmpclitools-0.6.1.tar.gz) = e459526308c79daf4bc338d84800da82c00de3f791c355580ceb5dd7fa5bf496
+SIZE (snmpclitools-0.6.1.tar.gz) = 43062
Index: head/net-mgmt/py-snmpclitools/pkg-descr
===================================================================
--- head/net-mgmt/py-snmpclitools/pkg-descr
+++ head/net-mgmt/py-snmpclitools/pkg-descr
@@ -0,0 +1,5 @@
+This is the collection of command-line SNMP tools written in pure-Python
+and tightly aligned with the de-facto standard SNMP tools that come with
+Net-SNMP e.g. snmpget, snmpwalk and many others.
+
+WWW: http://snmplabs.com/snmpclitools/