diff --git a/filesystems/py-libzfs/Makefile b/filesystems/py-libzfs/Makefile index 5b39bd449964..35bed6c55700 100644 --- a/filesystems/py-libzfs/Makefile +++ b/filesystems/py-libzfs/Makefile @@ -1,41 +1,47 @@ PORTNAME= libzfs PORTVERSION= 1.1.2023020700 PORTREVISION= 2 CATEGORIES= filesystems devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= meka@tilda.center COMMENT= Python libzfs bindings WWW= https://github.com/freenas/py-libzfs LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= truenas GH_PROJECT= py-libzfs GH_TAGNAME= c1bd4a0 HAS_CONFIGURE= yes USES= compiler:c11 python USE_PYTHON= autoplist distutils cython CONFIGURE_ENV= freebsd_src=${SRC_BASE} MAKE_ENV= freebsd_src=${SRC_BASE} .include -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1500018 || (${OSVERSION} >= 1401000 && ${OSVERSION} < 1500000)) +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1401000 EXTRA_PATCHES+= ${FILESDIR}/extra-zpool-add.patch .endif .if !exists(${SRC_BASE}/sys/Makefile) IGNORE= requires kernel source files in ${SRC_BASE} .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000 PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 0b2ab0594997c44e80e3fdfe9d2add106d81149a.diff:-p1 # backport of https://github.com/truenas/py-libzfs/pull/251 +PATCHFILES+= 0b2ab0594997c44e80e3fdfe9d2add106d81149a.diff:-p1 # backport of https://github.com/truenas/py-libzfs/pull/251 +.endif + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500000 +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 0ce0c8be75ae4c8873824b3c6e8f0a1736cd673b.diff:-p1 # backport of https://github.com/truenas/py-libzfs/pull/297 +PATCHFILES+= 9882ea5d43407b3be71621a2988e7cdaaf87aa09.diff:-p1 # backport of https://github.com/truenas/py-libzfs/pull/297 .endif .include diff --git a/filesystems/py-libzfs/distinfo b/filesystems/py-libzfs/distinfo index 96872e080854..c6a97b79022b 100644 --- a/filesystems/py-libzfs/distinfo +++ b/filesystems/py-libzfs/distinfo @@ -1,5 +1,9 @@ -TIMESTAMP = 1734977733 +TIMESTAMP = 1764867359 SHA256 (truenas-py-libzfs-1.1.2023020700-c1bd4a0_GH0.tar.gz) = 23b2d6e1b6ed78be2d12068f9b1b0b01270afaaf0f017817a5fb109d358aa818 SIZE (truenas-py-libzfs-1.1.2023020700-c1bd4a0_GH0.tar.gz) = 99656 SHA256 (0b2ab0594997c44e80e3fdfe9d2add106d81149a.diff) = 1fb37c3a678dbaadd47999f7d29631824a404561ca5f2237613d2b22b42fa138 SIZE (0b2ab0594997c44e80e3fdfe9d2add106d81149a.diff) = 1453 +SHA256 (0ce0c8be75ae4c8873824b3c6e8f0a1736cd673b.diff) = 19b00cd7f7441ad705dba7b35c79cfc95eb2d1dd118636b74da6a1be581eb00c +SIZE (0ce0c8be75ae4c8873824b3c6e8f0a1736cd673b.diff) = 7515 +SHA256 (9882ea5d43407b3be71621a2988e7cdaaf87aa09.diff) = 337ac1dda8890935e582f36eff551813ecb5d1a74f9ffe7c9fa23c0a2a7badca +SIZE (9882ea5d43407b3be71621a2988e7cdaaf87aa09.diff) = 10116