sysutils/openzfs*: Switch to merged OpenZFS repo

FreeBSD support has been merged into the openzfs/zfs repo on Github.

Switch the port to use the new upstream.  Update maintainer to be me.

Reviewed by:	kmoore, mav, wg
Approved by:	kmoore (maintainer)
Approved by:	mav (mentor)
Sponsored by:	iXsystems, Inc.
Differential Revision:	https://reviews.freebsd.org/D24434

3 files changed, 30 insertions, 10 deletions

diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
index 5780f01fce34..de0d3ae552aa 100644
--- a/sysutils/openzfs/Makefile
+++ b/sysutils/openzfs/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	openzfs
-PORTVERSION=	2020031600
+PORTVERSION=	2020041501
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
-MAINTAINER=	kmoore@FreeBSD.org
+MAINTAINER=	freqlabs@FreeBSD.org
 COMMENT=	OpenZFS userland for FreeBSD
 
 LICENSE=	CDDL
@@ -26,9 +26,9 @@ TESTS_DESC=	Install the ZFS Test Suite
 OPTIONS_SUB=	yes
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	zfsonfreebsd
-GH_PROJECT=	ZoF
-GH_TAGNAME=	152cc960a
+GH_ACCOUNT=	openzfs
+GH_PROJECT=	zfs
+GH_TAGNAME=	a7929f313
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/openzfs/distinfo b/sysutils/openzfs/distinfo
index f066a22590cd..36d29f49d661 100644
--- a/sysutils/openzfs/distinfo
+++ b/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1584339511
-SHA256 (zfsonfreebsd-ZoF-v2020031600-152cc960a_GH0.tar.gz) = 6cd0a80e621e8fdaad7563052b0d597212cec9548f847fd6189c09b5d6413dd5
-SIZE (zfsonfreebsd-ZoF-v2020031600-152cc960a_GH0.tar.gz) = 6806435
+TIMESTAMP = 1586981748
+SHA256 (openzfs-zfs-v2020041501-a7929f313_GH0.tar.gz) = 38d06f39ff4b9412dfa58812261fcf87d005dbd74103447ef7441468f71718e3
+SIZE (openzfs-zfs-v2020041501-a7929f313_GH0.tar.gz) = 6827371
diff --git a/sysutils/openzfs/pkg-plist b/sysutils/openzfs/pkg-plist
index 4c5c96f2b784..b49079640796 100644
--- a/sysutils/openzfs/pkg-plist
+++ b/sysutils/openzfs/pkg-plist
@@ -125,6 +125,7 @@ include/libspl/ucred.h
 include/libspl/umem.h
 include/libspl/unistd.h
 include/libspl/zone.h
+include/libzfs/cityhash.h
 include/libzfs/libnvpair.h
 include/libzfs/libuutil.h
 include/libzfs/libuutil_common.h
@@ -146,7 +147,6 @@ include/libzfs/sys/bpobj.h
 include/libzfs/sys/bptree.h
 include/libzfs/sys/bqueue.h
 include/libzfs/sys/btree.h
-include/libzfs/sys/cityhash.h
 include/libzfs/sys/crypto/api.h
 include/libzfs/sys/crypto/common.h
 include/libzfs/sys/crypto/icp.h
@@ -422,6 +422,7 @@ man/man8/zfs-unload-key.8.gz
 man/man8/zfs-unmount.8.gz
 man/man8/zfs-upgrade.8.gz
 man/man8/zfs-userspace.8.gz
+man/man8/zfs-wait.8.gz
 man/man8/zfs.8.gz
 man/man8/zfsconcepts.8.gz
 man/man8/zfsprops.8.gz
@@ -460,6 +461,7 @@ man/man8/zpool-wait.8.gz
 man/man8/zpool.8.gz
 man/man8/zpoolconcepts.8.gz
 man/man8/zpoolprops.8.gz
+man/man8/zstream.8.gz
 man/man8/zstreamdump.8.gz
 sbin/fsck.zfs
 sbin/zdb
@@ -467,6 +469,7 @@ sbin/zfs
 sbin/zhack
 sbin/zinject
 sbin/zpool
+sbin/zstream
 sbin/zstreamdump
 sbin/ztest
 share/pkgconfig/libzfs.pc
@@ -581,8 +584,9 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cache/cache_007_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cache/cache_008_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cache/cache_009_pos.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/cache/cache_010_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cache/cache_010_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cache/cache_011_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cache/cache_012_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cache/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cache/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cachefile/cachefile.cfg
@@ -925,6 +929,7 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_013_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_014_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_015_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_016_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_from_encrypted.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw_-d.ksh
@@ -1081,6 +1086,10 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_006_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_007_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait.kshlib
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait_deleteq.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool/zpool_001_neg.ksh
@@ -1800,6 +1809,17 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs-tests/tests/functional/online_offline/online_offline_002_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/online_offline/online_offline_003_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/online_offline/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc.cfg
+%%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_002_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_003_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_004_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_005_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_006_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_007_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_008_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pool_checkpoint/checkpoint_after_rewind.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pool_checkpoint/checkpoint_big_rewind.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pool_checkpoint/checkpoint_capacity.ksh