CVS commit: pkgsrc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Mar 10 18:51:52 UTC 2021

Modified Files:
        pkgsrc/graphics/py-mcomix: Makefile
        pkgsrc/misc/calibre: Makefile
        pkgsrc/security/volatility: Makefile

Log Message:
Use py-Pillow6


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/py-mcomix/Makefile
cvs rdiff -u -r1.246 -r1.247 pkgsrc/misc/calibre/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/volatility/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/py-mcomix/Makefile
diff -u pkgsrc/graphics/py-mcomix/Makefile:1.20 pkgsrc/graphics/py-mcomix/Makefile:1.21
--- pkgsrc/graphics/py-mcomix/Makefile:1.20     Fri Mar 20 11:57:52 2020
+++ pkgsrc/graphics/py-mcomix/Makefile  Wed Mar 10 18:51:51 2021
@@ -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

Index: pkgsrc/misc/calibre/Makefile
diff -u pkgsrc/misc/calibre/Makefile:1.246 pkgsrc/misc/calibre/Makefile:1.247
--- pkgsrc/misc/calibre/Makefile:1.246  Fri Dec  4 20:45:29 2020
+++ pkgsrc/misc/calibre/Makefile        Wed Mar 10 18:51:51 2021
@@ -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]*
 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

Index: pkgsrc/security/volatility/Makefile
diff -u pkgsrc/security/volatility/Makefile:1.12 pkgsrc/security/volatility/Makefile:1.13
--- pkgsrc/security/volatility/Makefile:1.12    Mon Nov  4 21:13:03 2019
+++ pkgsrc/security/volatility/Makefile Wed Mar 10 18:51:52 2021
@@ -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/egg.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"