Index: head/sysutils/py-zfs/Makefile
===================================================================
--- head/sysutils/py-zfs/Makefile	(revision 374785)
+++ head/sysutils/py-zfs/Makefile	(revision 374786)
@@ -1,89 +1,89 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	zfs
-PORTVERSION=	1
-PORTREVISION=	4
+PORTVERSION=	1.1
 CATEGORIES=	sysutils python
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	# none
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python ZFS library
 
 LICENSE=	CDDL
 LICENSE_FILE=	${WRKSRC}/OPENSOLARIS.LICENSE
 
 USES=		python:2
 MAKEFILE=	${FILESDIR}/Makefile.lib
 MAKE_ARGS+=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
 		PYTHON_LDFLAGS="-L${LOCALBASE}/lib -l${PYTHON_VERSION}"
 NO_WRKSUBDIR=	yes
 
-SUB_FILES+=	compile.py
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 PYFILES=	__init__.py \
 		allow.py \
 		dataset.py \
 		groupspace.py\
 		unallow.py \
 		userspace.py \
 		util.py
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${SRC_BASE}/cddl/contrib/opensolaris/lib/pyzfs) || \
  !exists(${SRC_BASE}/cddl/contrib/opensolaris/cmd/pyzfs)
 IGNORE=	requires ZFS v15 or higher sources with pyzfs (in ${SRC_BASE})
 .endif
 
 .if !exists(${SRC_BASE}/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h)
 MAKEFILE=	${FILESDIR}/Makefile.lib.v28
 .endif
 
 .if exists(${SRC_BASE}/cddl/contrib/opensolaris/lib/pyzfs/common/holds.py) && \
 exists(${SRC_BASE}/cddl/contrib/opensolaris/lib/pyzfs/common/table.py)
 PYFILES+=	holds.py \
 		table.py
 PLIST_SUB+=	V28=""
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-util.py \
 		${FILESDIR}/extra-patch-userspace.py
 .else
 PLIST_SUB+=	V28="@comment "
 .endif
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@${CP} ${SRC_BASE}/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE \
 	${WRKSRC}/OPENSOLARIS.LICENSE
 	@${CP} ${SRC_BASE}/cddl/contrib/opensolaris/cmd/pyzfs/pyzfs.py \
 	${WRKSRC}/pyzfs.py
 .for PYFILE in ${PYFILES}
 	@${CP} ${SRC_BASE}/cddl/contrib/opensolaris/lib/pyzfs/common/${PYFILE} \
 	${WRKSRC}/${PYFILE}
 .endfor
 
 post-patch:
 
 .for PYFILE in pyzfs.py ${PYFILES}
 	@${REINPLACE_CMD} -e "s|#! /usr/bin/python.*|#! ${PYTHON_CMD}|g" \
 		${WRKSRC}/${PYFILE}
 .endfor
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/zfs
 .for PYFILE in ${PYFILES}
 	${INSTALL_DATA} ${WRKSRC}/${PYFILE} \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/zfs
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/ioctl.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/zfs
-	@${PYTHON_CMD} ${WRKDIR}/compile.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/zfs
-	@${PYTHON_CMD} -O ${WRKDIR}/compile.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/zfs
+	${INSTALL_LIB} ${WRKSRC}/ioctl.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/zfs
+	(cd ${STAGEDIR}${PREFIX} && \
+	    ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} && \
+	    ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 	${MKDIR} ${STAGEDIR}/usr/lib/zfs
 	${INSTALL_SCRIPT} ${WRKSRC}/pyzfs.py ${STAGEDIR}/usr/lib/zfs
-	@${PYTHON_CMD} ${WRKDIR}/compile.py ${STAGEDIR}/usr/lib/zfs
-	@${PYTHON_CMD} -O ${WRKDIR}/compile.py ${STAGEDIR}/usr/lib/zfs
+	(cd ${STAGEDIR}/usr/lib/zfs && \
+	    ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d /usr/lib/zfs -f ${STAGEDIR}/usr/lib/zfs && \
+	    ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d /usr/lib/zfs -f ${STAGEDIR}/usr/lib/zfs)
 
 .include <bsd.port.post.mk>
Index: head/sysutils/py-zfs/files/compile.py.in
===================================================================
--- head/sysutils/py-zfs/files/compile.py.in	(revision 374785)
+++ head/sysutils/py-zfs/files/compile.py.in	(nonexistent)
@@ -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)

Property changes on: head/sysutils/py-zfs/files/compile.py.in
___________________________________________________________________
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: head/sysutils/py-zfs/pkg-plist
===================================================================
--- head/sysutils/py-zfs/pkg-plist	(revision 374785)
+++ head/sysutils/py-zfs/pkg-plist	(revision 374786)
@@ -1,34 +1,33 @@
 %%PYTHON_SITELIBDIR%%/zfs/__init__.py
 %%PYTHON_SITELIBDIR%%/zfs/__init__.pyc
 %%PYTHON_SITELIBDIR%%/zfs/__init__.pyo
 %%PYTHON_SITELIBDIR%%/zfs/allow.py
 %%PYTHON_SITELIBDIR%%/zfs/allow.pyc
 %%PYTHON_SITELIBDIR%%/zfs/allow.pyo
 %%PYTHON_SITELIBDIR%%/zfs/dataset.py
 %%PYTHON_SITELIBDIR%%/zfs/dataset.pyc
 %%PYTHON_SITELIBDIR%%/zfs/dataset.pyo
 %%PYTHON_SITELIBDIR%%/zfs/groupspace.py
 %%PYTHON_SITELIBDIR%%/zfs/groupspace.pyc
 %%PYTHON_SITELIBDIR%%/zfs/groupspace.pyo
 %%V28%%%%PYTHON_SITELIBDIR%%/zfs/holds.py
 %%V28%%%%PYTHON_SITELIBDIR%%/zfs/holds.pyc
 %%V28%%%%PYTHON_SITELIBDIR%%/zfs/holds.pyo
 %%PYTHON_SITELIBDIR%%/zfs/ioctl.so
 %%V28%%%%PYTHON_SITELIBDIR%%/zfs/table.py
 %%V28%%%%PYTHON_SITELIBDIR%%/zfs/table.pyc
 %%V28%%%%PYTHON_SITELIBDIR%%/zfs/table.pyo
 %%PYTHON_SITELIBDIR%%/zfs/unallow.py
 %%PYTHON_SITELIBDIR%%/zfs/unallow.pyc
 %%PYTHON_SITELIBDIR%%/zfs/unallow.pyo
 %%PYTHON_SITELIBDIR%%/zfs/userspace.py
 %%PYTHON_SITELIBDIR%%/zfs/userspace.pyc
 %%PYTHON_SITELIBDIR%%/zfs/userspace.pyo
 %%PYTHON_SITELIBDIR%%/zfs/util.py
 %%PYTHON_SITELIBDIR%%/zfs/util.pyc
 %%PYTHON_SITELIBDIR%%/zfs/util.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/zfs
-@cwd /usr/lib
-zfs/pyzfs.py
-zfs/pyzfs.pyc
-zfs/pyzfs.pyo
-@dirrm zfs
+@dir %%PYTHON_SITELIBDIR%%/zfs
+/usr/lib/zfs/pyzfs.py
+/usr/lib/zfs/pyzfs.pyc
+/usr/lib/zfs/pyzfs.pyo
+@dir /usr/lib/zfs