Index: branches/2020Q1/sysutils/py-diffoscope/Makefile
===================================================================
--- branches/2020Q1/sysutils/py-diffoscope/Makefile	(revision 528328)
+++ branches/2020Q1/sysutils/py-diffoscope/Makefile	(revision 528329)
@@ -1,32 +1,33 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	diffoscope
 PORTVERSION=	108
+PORTREVISION=	1
 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+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test --pytest-args="-rsx -l -vv"
 
 .include <bsd.port.mk>
Index: branches/2020Q1/sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py
===================================================================
--- branches/2020Q1/sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py	(nonexistent)
+++ branches/2020Q1/sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py	(revision 528329)
@@ -0,0 +1,28 @@
+# 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: branches/2020Q1/sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 528328)
+++ branches/2020Q1	(revision 528329)

Property changes on: branches/2020Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r528327