svn commit: r374786 - in head/sysutils/py-zfs: . files

[Xin LI]

Author: delphij
Date: Tue Dec 16 06:08:29 2014
New Revision: 374786
URL: https://svnweb.freebsd.org/changeset/ports/374786
QAT: https://qat.redports.org/buildarchive/r374786/

Log:
  Modernize and fix staged pre-compiled code.

Deleted:
  head/sysutils/py-zfs/files/compile.py.in
Modified:
  head/sysutils/py-zfs/Makefile
  head/sysutils/py-zfs/pkg-plist

Modified: head/sysutils/py-zfs/Makefile
==============================================================================
--- head/sysutils/py-zfs/Makefile	Tue Dec 16 05:38:33 2014	(r374785)
+++ head/sysutils/py-zfs/Makefile	Tue Dec 16 06:08:29 2014	(r374786)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zfs
-PORTVERSION=	1
-PORTREVISION=	4
+PORTVERSION=	1.1
 CATEGORIES=	sysutils python
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +20,6 @@ MAKE_ARGS+=	PYTHON_INCLUDEDIR="${PYTHON_
 		PYTHON_LDFLAGS="-L${LOCALBASE}/lib -l${PYTHON_VERSION}"
 NO_WRKSUBDIR=	yes
 
-SUB_FILES+=	compile.py
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 PYFILES=	__init__.py \
@@ -78,12 +76,14 @@ do-install:
 	${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>

Modified: head/sysutils/py-zfs/pkg-plist
==============================================================================
--- head/sysutils/py-zfs/pkg-plist	Tue Dec 16 05:38:33 2014	(r374785)
+++ head/sysutils/py-zfs/pkg-plist	Tue Dec 16 06:08:29 2014	(r374786)
@@ -26,9 +26,8 @@
 %%PYTHON_SITELIBDIR%%/zfs/util.py
 %%PYTHON_SITELIBDIR%%/zfs/util.pyc
 %%PYTHON_SITELIBDIR%%/zfs/util.pyo
- at dirrm %%PYTHON_SITELIBDIR%%/zfs
- at cwd /usr/lib
-zfs/pyzfs.py
-zfs/pyzfs.pyc
-zfs/pyzfs.pyo
- at dirrm zfs
+ at dir %%PYTHON_SITELIBDIR%%/zfs
+/usr/lib/zfs/pyzfs.py
+/usr/lib/zfs/pyzfs.pyc
+/usr/lib/zfs/pyzfs.pyo
+ at dir /usr/lib/zfs