diff options
| author | mm <mm@FreeBSD.org> | 2010-11-22 22:10:29 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2010-11-22 22:10:29 +0800 |
| commit | 2815e87acd250486861d5d1c9529e4d49696b2c6 (patch) | |
| tree | 7a8b8000caf26c6c33dee85d9fe87f0961aa6955 | |
| parent | a2d815ac02084d494f6df8542883bc98e28a9174 (diff) | |
| download | freebsd-ports-gnome-2815e87acd250486861d5d1c9529e4d49696b2c6.tar.gz freebsd-ports-gnome-2815e87acd250486861d5d1c9529e4d49696b2c6.tar.zst freebsd-ports-gnome-2815e87acd250486861d5d1c9529e4d49696b2c6.zip | |
- Support only Python 2.4-2.7 [1]
- Prepare for ZFSv28
PR: ports/151980 [1]
Submitted by: sunpoet@FreeBSD.org [1]
| -rw-r--r-- | sysutils/py-zfs/Makefile | 12 | ||||
| -rw-r--r-- | sysutils/py-zfs/pkg-plist | 6 |
2 files changed, 17 insertions, 1 deletions
diff --git a/sysutils/py-zfs/Makefile b/sysutils/py-zfs/Makefile index 19eaed527183..c64325b8249e 100644 --- a/sysutils/py-zfs/Makefile +++ b/sysutils/py-zfs/Makefile @@ -7,6 +7,7 @@ PORTNAME= zfs PORTVERSION= 1 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= # none PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +16,7 @@ DISTFILES= # none MAINTAINER= mm@FreeBSD.org COMMENT= Python ZFS library -USE_PYTHON= 2.4+ +USE_PYTHON= 2.4-2.7 MAKEFILE= ${FILESDIR}/Makefile.lib MAKE_ARGS+= PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \ PYTHON_LDFLAGS="-L${LOCALBASE}/lib -l${PYTHON_VERSION}" @@ -38,6 +39,15 @@ PYFILES= __init__.py \ IGNORE= requires ZFS v15 or higher sources with pyzfs (in ${SRCDIR}) .endif +.if exists(${SRCDIR}/cddl/contrib/opensolaris/lib/pyzfs/common/holds.py) && \ +exists(${SRCDIR}/cddl/contrib/opensolaris/lib/pyzfs/common/table.py) +PYFILES+= holds.py \ + table.py +PLIST_SUB+= V28="" +.else +PLIST_SUB+= V28="@comment " +.endif + post-patch: @${MKDIR} ${WRKSRC} @${SED} -e "s|/usr/bin/python2.4|${PYTHON_CMD}|g" \ diff --git a/sysutils/py-zfs/pkg-plist b/sysutils/py-zfs/pkg-plist index cf5e3f4ab9dc..df6af218a10c 100644 --- a/sysutils/py-zfs/pkg-plist +++ b/sysutils/py-zfs/pkg-plist @@ -10,7 +10,13 @@ %%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 |