summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2021-03-10 18:51:51 +0000
committeradam <adam@pkgsrc.org>2021-03-10 18:51:51 +0000
commit7026808b796665fdd071ef5d07dc785bb8980f99 (patch)
tree650ac87fd9a945b48e3f8ddb94a69a39b3db81df
parenta8e0413312087b1f45f3110730f8609fab7d6e03 (diff)
downloadpkgsrc-7026808b796665fdd071ef5d07dc785bb8980f99.tar.gz
Use py-Pillow6
-rw-r--r--graphics/py-mcomix/Makefile4
-rw-r--r--misc/calibre/Makefile4
-rw-r--r--security/volatility/Makefile22
3 files changed, 17 insertions, 13 deletions
diff --git a/graphics/py-mcomix/Makefile b/graphics/py-mcomix/Makefile
index 2d9a5e06fda..1bdef666bdb 100644
--- a/graphics/py-mcomix/Makefile
+++ b/graphics/py-mcomix/Makefile
@@ -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 @@ COMMENT= GTK2 comic book viewer
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 --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index da06327c9e3..cc372c19fd7 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -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}-markdown-[0-9]*:../../textproc/py-markdown
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 --git a/security/volatility/Makefile b/security/volatility/Makefile
index 18279ad7d0d..a1ad19a2698 100644
--- a/security/volatility/Makefile
+++ b/security/volatility/Makefile
@@ -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
-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/egg.mk"
.include "../../lang/python/application.mk"
+.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"