[pkgsrc/trunk]: pkgsrc Use py-Pillow6

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/32343e6ea7bc
branches:  trunk
changeset: 448594:32343e6ea7bc
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Mar 10 18:51:51 2021 +0000

description:
Use py-Pillow6

diffstat:

 graphics/py-mcomix/Makefile  |   4 ++--
 misc/calibre/Makefile        |   4 ++--
 security/volatility/Makefile |  22 +++++++++++++---------
 3 files changed, 17 insertions(+), 13 deletions(-)

diffs (77 lines):

diff -r d07029178698 -r 32343e6ea7bc graphics/py-mcomix/Makefile
--- a/graphics/py-mcomix/Makefile       Wed Mar 10 18:51:00 2021 +0000
+++ b/graphics/py-mcomix/Makefile       Wed Mar 10 18:51:51 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/03/20 11:57:52 nia Exp $
+# $NetBSD: Makefile,v 1.21 2021/03/10 18:51:51 adam Exp $
 
 DISTNAME=      mcomix-1.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@
 LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-gtk2>=2.12.0:../../x11/py-gtk2
-DEPENDS+=      ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
+DEPENDS+=      ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow6
 DEPENDS+=      ${PYPKGPREFIX}-subprocess32-[0-9]*:../../devel/py-subprocess32
 DEPENDS+=      ${PYPKGPREFIX}-czipfile-[0-9]*:../../archivers/py-czipfile
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
diff -r d07029178698 -r 32343e6ea7bc misc/calibre/Makefile
--- a/misc/calibre/Makefile     Wed Mar 10 18:51:00 2021 +0000
+++ b/misc/calibre/Makefile     Wed Mar 10 18:51:51 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.246 2020/12/04 20:45:29 nia Exp $
+# $NetBSD: Makefile,v 1.247 2021/03/10 18:51:51 adam Exp $
 
 DISTNAME=      calibre-3.40.1
 PKGREVISION=   23
@@ -28,7 +28,7 @@
 DEPENDS+=      ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
 DEPENDS+=      ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
 DEPENDS+=      ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
-DEPENDS+=      ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow
+DEPENDS+=      ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow6
 DEPENDS+=      ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
 DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 DEPENDS+=      ${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex
diff -r d07029178698 -r 32343e6ea7bc security/volatility/Makefile
--- a/security/volatility/Makefile      Wed Mar 10 18:51:00 2021 +0000
+++ b/security/volatility/Makefile      Wed Mar 10 18:51:51 2021 +0000
@@ -1,24 +1,28 @@
-# $NetBSD: Makefile,v 1.12 2019/11/04 21:13:03 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2021/03/10 18:51:52 adam Exp $
 
-DISTNAME=      volatility-2.4
-PKGREVISION=   1
+DISTNAME=      volatility-2.6.1
 CATEGORIES=    security
-MASTER_SITES=  http://downloads.volatilityfoundation.org/releases/2.4/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=volatilityfoundation/}
 
 MAINTAINER=    pettai%NetBSD.org@localhost
-HOMEPAGE=      http://volatilityfoundation.org/
+HOMEPAGE=      https://www.volatilityfoundation.org/
 COMMENT=       Advanced memory forensics framework
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto
+# Recommended packages
+# from https://github.com/volatilityfoundation/volatility/wiki/Installation
+DEPENDS+=      ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow6
+DEPENDS+=      ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome
 DEPENDS+=      ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
 DEPENDS+=      ${PYPKGPREFIX}-distorm3-[0-9]*:../../devel/py-distorm3
+DEPENDS+=      ${PYPKGPREFIX}-openpyxl-[0-9]*:../../textproc/py-openpyxl
+DEPENDS+=      ${PYPKGPREFIX}-ujson-[0-9]*:../../textproc/py-ujson
+DEPENDS+=      ${PYPKGPREFIX}-yara-[0-9]*:../../security/py-yara
 
-PYDISTUTILSPKG=        yes
-REPLACE_PYTHON=        tools/vtype_diff.py
+REPLACE_PYTHON= tools/vtype_diff.py
 
 PYTHON_VERSIONS_ACCEPTED=      27
 
+.include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"