Index: branches/2020Q1/sysutils/py-diffoscope/Makefile
===================================================================
--- branches/2020Q1/sysutils/py-diffoscope/Makefile	(revision 528397)
+++ branches/2020Q1/sysutils/py-diffoscope/Makefile	(revision 528398)
@@ -1,33 +1,33 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	diffoscope
-PORTVERSION=	108
+PORTVERSION=	136
 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"
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts=
 
 .include <bsd.port.mk>
Index: branches/2020Q1/sysutils/py-diffoscope/distinfo
===================================================================
--- branches/2020Q1/sysutils/py-diffoscope/distinfo	(revision 528397)
+++ branches/2020Q1/sysutils/py-diffoscope/distinfo	(revision 528398)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548740897
-SHA256 (diffoscope-108.tar.gz) = 247408365671cd19c1d16ece214677b5a52c53e278f4cce1117b4a5567ab4b6d
-SIZE (diffoscope-108.tar.gz) = 9991633
+TIMESTAMP = 1581919566
+SHA256 (diffoscope-136.tar.gz) = 0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15
+SIZE (diffoscope-136.tar.gz) = 1557070
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 528397)
+++ branches/2020Q1	(revision 528398)

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