Index: devel/py-libzfs/Makefile
===================================================================
--- devel/py-libzfs/Makefile
+++ devel/py-libzfs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libzfs
-PORTVERSION=	1.0.20181220
+PORTVERSION=	1.0.20190402
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -17,17 +17,14 @@
 
 RUN_DEPENDS=	${PY_ENUM34}
 
-USE_GITHUB=     yes
-GH_ACCOUNT=	freenas
-GH_PROJECT=	py-libzfs
-GH_TAGNAME=	3362fd4
-
-HAS_CONFIGURE=	yes
 USES=		python
+
 USE_PYTHON=	autoplist distutils cython
 
-CONFIGURE_ENV=	FREEBSD_SRC=${SRC_BASE}
-MAKE_ENV=	FREEBSD_SRC=${SRC_BASE}
+USE_GITHUB=     yes
+GH_ACCOUNT=	freenas
+GH_PROJECT=	py-libzfs
+GH_TAGNAME=	383afa0
 
 .include <bsd.port.options.mk>
 
@@ -35,4 +32,6 @@
 IGNORE=	requires kernel source files in ${SRC_BASE}
 .endif
 
+WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}
+
 .include <bsd.port.mk>
Index: devel/py-libzfs/distinfo
===================================================================
--- devel/py-libzfs/distinfo
+++ devel/py-libzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545299995
-SHA256 (freenas-py-libzfs-1.0.20181220-3362fd4_GH0.tar.gz) = 247de9a6ac7460fe05e86fea56910ce53a648415e43870168299bedc3e7ab9a3
-SIZE (freenas-py-libzfs-1.0.20181220-3362fd4_GH0.tar.gz) = 69930
+TIMESTAMP = 1575414306
+SHA256 (freenas-py-libzfs-1.0.20190402-383afa0_GH0.tar.gz) = b951f6900bb10dcee96ae1b875f6b01f01ee7e3d0d9a9126fa6a23b44756b20e
+SIZE (freenas-py-libzfs-1.0.20190402-383afa0_GH0.tar.gz) = 30541
Index: devel/py-libzfs/files/patch-libzfs.pyx
===================================================================
--- /dev/null
+++ devel/py-libzfs/files/patch-libzfs.pyx
@@ -0,0 +1,11 @@
+--- libzfs.pyx.orig	2019-12-05 13:14:34 UTC
++++ libzfs.pyx
+@@ -2292,7 +2292,7 @@ cdef class ZFSDataset(ZFSObject):
+ 
+             memset(&iter, 0, sizeof(iter))
+             with nogil:
+-                libzfs.zfs_iter_snapshots(self.handle, False, self.__iterate, <void*>&iter)
++                libzfs.zfs_iter_snapshots(self.handle, False, self.__iterate, <void*>&iter, 0, 0)
+ 
+             try:
+                 for h in range(0, iter.length):
Index: devel/py-libzfs/files/patch-pxd_libzfs.pxd
===================================================================
--- /dev/null
+++ devel/py-libzfs/files/patch-pxd_libzfs.pxd
@@ -0,0 +1,13 @@
+--- pxd/libzfs.pxd.orig	2019-12-05 13:14:49 UTC
++++ pxd/libzfs.pxd
+@@ -394,8 +394,8 @@ cdef extern from "libzfs.h" nogil:
+     extern int zfs_iter_children(zfs_handle_t *, zfs_iter_f, void *)
+     extern int zfs_iter_dependents(zfs_handle_t *, int, zfs_iter_f, void *)
+     extern int zfs_iter_filesystems(zfs_handle_t *, zfs_iter_f, void *)
+-    extern int zfs_iter_snapshots(zfs_handle_t *, int, zfs_iter_f, void *)
+-    extern int zfs_iter_snapshots_sorted(zfs_handle_t *, zfs_iter_f, void *)
++    extern int zfs_iter_snapshots(zfs_handle_t *, int, zfs_iter_f, void *, uint64_t, uint64_t)
++    extern int zfs_iter_snapshots_sorted(zfs_handle_t *, zfs_iter_f, void *, uint64_t, uint64_t)
+     extern int zfs_iter_snapspec(zfs_handle_t *, const char *, zfs_iter_f, void *)
+     extern int zfs_iter_bookmarks(zfs_handle_t *, zfs_iter_f, void *)
+ 
Index: devel/sope4/Makefile
===================================================================
--- devel/sope4/Makefile
+++ devel/sope4/Makefile
@@ -14,7 +14,10 @@
 BROKEN_powerpc64=	fails to build: bundle.make:301: STXSaxDriver.sax/Resources/Info-gnustep.plist] Illegal instruction (core dumped)
 
 LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
-			libmemcached.so:databases/libmemcached
+			libmemcached.so:databases/libmemcached \
+			libiconv.so:converters/libiconv
+
+USES=			gmake iconv gnustep
 
 WRKSRC=			${WRKDIR}/SOPE
 
@@ -27,7 +30,6 @@
 PGSQL_DESC=		Build with PostgreSQL support
 MEMCACHED_DESC=		Install memcached
 
-USES=			gmake iconv gnustep
 USE_GNUSTEP=		base build
 USE_LDCONFIG=		${GNUSTEP_LOCAL_LIBRARIES}
 LLD_UNSAFE=		yes # PR 230608
Index: sysutils/virt-what/pkg-plist
===================================================================
--- /dev/null
+++ sysutils/virt-what/pkg-plist
@@ -0,0 +1,3 @@
+libexec/virt-what-cpuid-helper
+man/man1/virt-what.1.gz
+sbin/virt-what