Index: head/sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py
===================================================================
--- head/sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py	(revision 535709)
+++ head/sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py	(nonexistent)
@@ -1,28 +0,0 @@
-# Non-portable regression caused by 25fee28c/#879011
-# https://lists.reproducible-builds.org/pipermail/diffoscope/2020-March/002632.html
-# TODO: Upstream
-
---- diffoscope/comparators/zip.py.orig	2020-03-12 13:23:59 UTC
-+++ diffoscope/comparators/zip.py
-@@ -38,10 +38,7 @@ from .utils.command import Command
- class Zipinfo(Command):
-     @tool_required('zipinfo')
-     def cmdline(self):
--        # zipinfo (without -v) puts warning messages (some of which contain
--        # $path) into stdin when stderr is not a tty, see #879011 for details.
--        # to work around it, we run it on /dev/stdin instead, seems to work ok.
--        return ['zipinfo', '/dev/stdin']
-+        return ['zipinfo', self.path]
- 
-     @property
-     def returncode(self):
-@@ -54,9 +51,6 @@ class Zipinfo(Command):
-             returncode = 0
- 
-         return returncode
--
--    def stdin(self):
--        return open(self.path, 'rb')
- 
-     def filter(self, line):
-         # we don't care about the archive file path

Property changes on: head/sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/py-diffoscope/Makefile
===================================================================
--- head/sysutils/py-diffoscope/Makefile	(revision 535709)
+++ head/sysutils/py-diffoscope/Makefile	(revision 535710)
@@ -1,33 +1,32 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	diffoscope
-PORTVERSION=	136
-PORTREVISION=	1
+PORTVERSION=	144
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	In-depth comparison of files, archives, and directories
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:archivers/py-libarchive-c@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py-python-magic@${PY_FLAVOR} \
 		gdiff:textproc/diffutils
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		zipinfo:archivers/unzip \
 		isoinfo:sysutils/cdrkit \
 		rpm2cpio:archivers/rpm2cpio
 
-USES=		python:3.5+
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts=
 
 .include <bsd.port.mk>
Index: head/sysutils/py-diffoscope/distinfo
===================================================================
--- head/sysutils/py-diffoscope/distinfo	(revision 535709)
+++ head/sysutils/py-diffoscope/distinfo	(revision 535710)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581919566
-SHA256 (diffoscope-136.tar.gz) = 0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15
-SIZE (diffoscope-136.tar.gz) = 1557070
+TIMESTAMP = 1589766564
+SHA256 (diffoscope-144.tar.gz) = 9a45464b7b7184fa1ad2af9c52ebac8f00b3dd5dcf9e15dfc00c653c26fcc345
+SIZE (diffoscope-144.tar.gz) = 1569864