5 files changed, 0 insertions, 140 deletions
diff --git a/sysutils/py-zfs/files/Makefile.lib b/sysutils/py-zfs/files/Makefile.lib
deleted file mode 100644
index e5a351ee58b8..000000000000
--- a/sysutils/py-zfs/files/Makefile.lib
+++ /dev/null
@@ -1,31 +0,0 @@
-# $FreeBSD$
-
-SRCDIR?=	/usr/src
-
-.PATH:	${SRCDIR}/cddl/contrib/opensolaris/lib/pyzfs/common
-
-SRCS=	ioctl.c
-
-SHLIB_NAME=	ioctl.so
-LIB=	ioctl
-DPADD=	${LIBGEOM} ${LIBZFS} ${LIBZFS_CORE} ${LIBNVPAIR} ${LIBUUTIL}
-LDADD=	-lgeom -lzfs -lzfs_core -lnvpair -luutil ${PYTHON_LDFLAGS}
-
-CFLAGS+= -DNEED_SOLARIS_BOOLEAN
-CFLAGS+= -I${SRCDIR}/sys/cddl/compat/opensolaris
-CFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/include
-CFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/lib/libumem
-CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/common/zfs
-CFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/head
-CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs_core/common
-CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${PYTHON_INCLUDEDIR}
-
-.include <bsd.lib.mk>
diff --git a/sysutils/py-zfs/files/Makefile.lib.v28 b/sysutils/py-zfs/files/Makefile.lib.v28
deleted file mode 100644
index e26574cabc0d..000000000000
--- a/sysutils/py-zfs/files/Makefile.lib.v28
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-SRCDIR?=	/usr/src
-
-.PATH:	${SRCDIR}/cddl/contrib/opensolaris/lib/pyzfs/common
-
-SRCS=	ioctl.c
-
-SHLIB_NAME=	ioctl.so
-LIB=	ioctl
-DPADD=	${LIBGEOM} ${LIBZFS} ${LIBNVPAIR} ${LIBUUTIL}
-LDADD=	-lgeom -lzfs -lnvpair -luutil ${PYTHON_LDFLAGS}
-
-CFLAGS+= -DNEED_SOLARIS_BOOLEAN
-CFLAGS+= -I${SRCDIR}/sys/cddl/compat/opensolaris
-CFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/include
-CFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/lib/libumem
-CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/common/zfs
-CFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/head
-CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${PYTHON_INCLUDEDIR}
-
-.include <bsd.lib.mk>
diff --git a/sysutils/py-zfs/files/compile.py.in b/sysutils/py-zfs/files/compile.py.in
deleted file mode 100644
index ceef660ab03c..000000000000
--- a/sysutils/py-zfs/files/compile.py.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#!%%PYTHON_CMD%%
-import sys
-import compileall
-
-import sys
-
-try:
-        sys.argv[1]
-except IndexError:
-        print "Path missing"
-else:
-	compileall.compile_dir(sys.argv[1], force=True)
diff --git a/sysutils/py-zfs/files/extra-patch-userspace.py b/sysutils/py-zfs/files/extra-patch-userspace.py
deleted file mode 100644
index 58b574be7cef..000000000000
--- a/sysutils/py-zfs/files/extra-patch-userspace.py
+++ /dev/null
@@ -1,43 +0,0 @@
---- userspace.py.orig	2010-12-23 09:35:39.917675583 +0100
-+++ userspace.py	2010-12-23 09:52:20.873003971 +0100
-@@ -30,7 +30,6 @@
- import pwd
- import grp
- import errno
--import solaris.misc
- import zfs.util
- import zfs.ioctl
- import zfs.dataset
-@@ -68,9 +67,9 @@
- 		idstr = "%u" % rid
- 
- 	(typename, mapfunc) = {
--	    (1, 1): ("SMB Group",   lambda id: solaris.misc.sid_to_name(id, 0)),
-+	    (1, 1): ("SMB Group",   id),
- 	    (1, 0): ("POSIX Group", lambda id: grp.getgrgid(int(id)).gr_name),
--	    (0, 1): ("SMB User",    lambda id: solaris.misc.sid_to_name(id, 1)),
-+	    (0, 1): ("SMB User",    id),
- 	    (0, 0): ("POSIX User",  lambda id: pwd.getpwuid(int(id)).pw_name)
- 	}[isgroup, bool(domain)]
- 
-@@ -107,13 +106,13 @@
- 	(domain, rid, value) = elem
- 	(field, isgroup) = props[prop]
- 
--	if options.translate and domain:
--		try:
--			rid = solaris.misc.sid_to_id("%s-%u" % (domain, rid),
--			    not isgroup)
--			domain = None
--		except KeyError:
--			pass;
-+#	if options.translate and domain:
-+#		try:
-+#			rid = solaris.misc.sid_to_id("%s-%u" % (domain, rid),
-+#			    not isgroup)
-+#			domain = None
-+#		except KeyError:
-+#			pass;
- 	key = (isgroup, domain, rid)
- 		
- 	try:
diff --git a/sysutils/py-zfs/files/extra-patch-util.py b/sysutils/py-zfs/files/extra-patch-util.py
deleted file mode 100644
index d1f77623f561..000000000000
--- a/sysutils/py-zfs/files/extra-patch-util.py
+++ /dev/null
@@ -1,24 +0,0 @@
---- util.py.orig	2010-12-23 09:07:09.188744296 +0100
-+++ util.py	2010-12-23 09:10:16.315849339 +0100
-@@ -28,7 +28,6 @@
- import gettext
- import errno
- import os
--import solaris.misc
- # Note: this module (zfs.util) should not import zfs.ioctl, because that
- # would introduce a circular dependency
- 
-@@ -37,11 +36,8 @@
- 
- dev = open("/dev/zfs", "w")
- 
--try:
--	_ = gettext.translation("SUNW_OST_OSLIB", "/usr/lib/locale",
--	    fallback=True).gettext
--except:
--	_ = solaris.misc.gettext
-+_ = gettext.translation("SUNW_OST_OSLIB", "/usr/lib/locale",
-+    fallback=True).gettext
- 
- def default_repr(self):
- 	"""A simple __repr__ function."""