From owner-svn-ports-head@FreeBSD.ORG Tue Dec 16 06:08:31 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F35E9423; Tue, 16 Dec 2014 06:08:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D5536AC2; Tue, 16 Dec 2014 06:08:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBG68UdI069682; Tue, 16 Dec 2014 06:08:30 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBG68UJF069679; Tue, 16 Dec 2014 06:08:30 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201412160608.sBG68UJF069679@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 16 Dec 2014 06:08:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374786 - in head/sysutils/py-zfs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Dec 2014 06:08:31 -0000 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 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 -@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