py-diffoscope: update to 87

87:
Bug fixes.

3 files changed, 147 insertions, 22 deletions

diff --git a/sysutils/py-diffoscope/Makefile b/sysutils/py-diffoscope/Makefile
index 215535b4991..64a2e4f5a87 100644
--- a/sysutils/py-diffoscope/Makefile
+++ b/sysutils/py-diffoscope/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2016/12/13 15:44:59 khorben Exp $
+# $NetBSD: Makefile,v 1.4 2017/10/16 09:53:42 adam Exp $
 
-DISTNAME=	diffoscope-63
+DISTNAME=	diffoscope-87
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	sysutils
+CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=d/diffoscope/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -17,9 +17,8 @@ DEPENDS+=	colordiff-[0-9]*:../../devel/colordiff
 # for xxd
 DEPENDS+=	vim-[0-9]*:../../editors/vim
 
-USE_TOOLS+=	gtar:run xz:run bzip2:run
-
-USE_LANGUAGES=		# none
+USE_LANGUAGES=	# none
+USE_TOOLS+=	bzip2:run gtar:run xz:run
 
 SUBST_CLASSES+=		gtar
 SUBST_SED.gtar+=	-e "s,'tar,'gtar,"
@@ -31,7 +30,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
-		${MV} diffoscope diffoscope-${PYVERSSUFFIX}
+		${MV} diffoscope diffoscope-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/py-diffoscope/PLIST b/sysutils/py-diffoscope/PLIST
index 7f6be2f84f3..6217feeac64 100644
--- a/sysutils/py-diffoscope/PLIST
+++ b/sysutils/py-diffoscope/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/12/13 16:43:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/10/16 09:53:42 adam Exp $
 bin/diffoscope-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -15,12 +15,18 @@ ${PYSITELIB}/diffoscope/changes.pyo
 ${PYSITELIB}/diffoscope/comparators/__init__.py
 ${PYSITELIB}/diffoscope/comparators/__init__.pyc
 ${PYSITELIB}/diffoscope/comparators/__init__.pyo
+${PYSITELIB}/diffoscope/comparators/apk.py
+${PYSITELIB}/diffoscope/comparators/apk.pyc
+${PYSITELIB}/diffoscope/comparators/apk.pyo
 ${PYSITELIB}/diffoscope/comparators/ar.py
 ${PYSITELIB}/diffoscope/comparators/ar.pyc
 ${PYSITELIB}/diffoscope/comparators/ar.pyo
 ${PYSITELIB}/diffoscope/comparators/binary.py
 ${PYSITELIB}/diffoscope/comparators/binary.pyc
 ${PYSITELIB}/diffoscope/comparators/binary.pyo
+${PYSITELIB}/diffoscope/comparators/binwalk.py
+${PYSITELIB}/diffoscope/comparators/binwalk.pyc
+${PYSITELIB}/diffoscope/comparators/binwalk.pyo
 ${PYSITELIB}/diffoscope/comparators/bzip2.py
 ${PYSITELIB}/diffoscope/comparators/bzip2.pyc
 ${PYSITELIB}/diffoscope/comparators/bzip2.pyo
@@ -48,9 +54,18 @@ ${PYSITELIB}/diffoscope/comparators/dex.pyo
 ${PYSITELIB}/diffoscope/comparators/directory.py
 ${PYSITELIB}/diffoscope/comparators/directory.pyc
 ${PYSITELIB}/diffoscope/comparators/directory.pyo
+${PYSITELIB}/diffoscope/comparators/docx.py
+${PYSITELIB}/diffoscope/comparators/docx.pyc
+${PYSITELIB}/diffoscope/comparators/docx.pyo
+${PYSITELIB}/diffoscope/comparators/dtb.py
+${PYSITELIB}/diffoscope/comparators/dtb.pyc
+${PYSITELIB}/diffoscope/comparators/dtb.pyo
 ${PYSITELIB}/diffoscope/comparators/elf.py
 ${PYSITELIB}/diffoscope/comparators/elf.pyc
 ${PYSITELIB}/diffoscope/comparators/elf.pyo
+${PYSITELIB}/diffoscope/comparators/fontconfig.py
+${PYSITELIB}/diffoscope/comparators/fontconfig.pyc
+${PYSITELIB}/diffoscope/comparators/fontconfig.pyo
 ${PYSITELIB}/diffoscope/comparators/fonts.py
 ${PYSITELIB}/diffoscope/comparators/fonts.pyc
 ${PYSITELIB}/diffoscope/comparators/fonts.pyo
@@ -60,6 +75,9 @@ ${PYSITELIB}/diffoscope/comparators/fsimage.pyo
 ${PYSITELIB}/diffoscope/comparators/gettext.py
 ${PYSITELIB}/diffoscope/comparators/gettext.pyc
 ${PYSITELIB}/diffoscope/comparators/gettext.pyo
+${PYSITELIB}/diffoscope/comparators/gif.py
+${PYSITELIB}/diffoscope/comparators/gif.pyc
+${PYSITELIB}/diffoscope/comparators/gif.pyo
 ${PYSITELIB}/diffoscope/comparators/git.py
 ${PYSITELIB}/diffoscope/comparators/git.pyc
 ${PYSITELIB}/diffoscope/comparators/git.pyo
@@ -84,24 +102,42 @@ ${PYSITELIB}/diffoscope/comparators/iso9660.pyo
 ${PYSITELIB}/diffoscope/comparators/java.py
 ${PYSITELIB}/diffoscope/comparators/java.pyc
 ${PYSITELIB}/diffoscope/comparators/java.pyo
+${PYSITELIB}/diffoscope/comparators/javascript.py
+${PYSITELIB}/diffoscope/comparators/javascript.pyc
+${PYSITELIB}/diffoscope/comparators/javascript.pyo
 ${PYSITELIB}/diffoscope/comparators/json.py
 ${PYSITELIB}/diffoscope/comparators/json.pyc
 ${PYSITELIB}/diffoscope/comparators/json.pyo
-${PYSITELIB}/diffoscope/comparators/libarchive.py
-${PYSITELIB}/diffoscope/comparators/libarchive.pyc
-${PYSITELIB}/diffoscope/comparators/libarchive.pyo
 ${PYSITELIB}/diffoscope/comparators/llvm.py
 ${PYSITELIB}/diffoscope/comparators/llvm.pyc
 ${PYSITELIB}/diffoscope/comparators/llvm.pyo
 ${PYSITELIB}/diffoscope/comparators/macho.py
 ${PYSITELIB}/diffoscope/comparators/macho.pyc
 ${PYSITELIB}/diffoscope/comparators/macho.pyo
+${PYSITELIB}/diffoscope/comparators/missing_file.py
+${PYSITELIB}/diffoscope/comparators/missing_file.pyc
+${PYSITELIB}/diffoscope/comparators/missing_file.pyo
 ${PYSITELIB}/diffoscope/comparators/mono.py
 ${PYSITELIB}/diffoscope/comparators/mono.pyc
 ${PYSITELIB}/diffoscope/comparators/mono.pyo
+${PYSITELIB}/diffoscope/comparators/odt.py
+${PYSITELIB}/diffoscope/comparators/odt.pyc
+${PYSITELIB}/diffoscope/comparators/odt.pyo
+${PYSITELIB}/diffoscope/comparators/ogg.py
+${PYSITELIB}/diffoscope/comparators/ogg.pyc
+${PYSITELIB}/diffoscope/comparators/ogg.pyo
+${PYSITELIB}/diffoscope/comparators/openssh.py
+${PYSITELIB}/diffoscope/comparators/openssh.pyc
+${PYSITELIB}/diffoscope/comparators/openssh.pyo
+${PYSITELIB}/diffoscope/comparators/pcap.py
+${PYSITELIB}/diffoscope/comparators/pcap.pyc
+${PYSITELIB}/diffoscope/comparators/pcap.pyo
 ${PYSITELIB}/diffoscope/comparators/pdf.py
 ${PYSITELIB}/diffoscope/comparators/pdf.pyc
 ${PYSITELIB}/diffoscope/comparators/pdf.pyo
+${PYSITELIB}/diffoscope/comparators/pgp.py
+${PYSITELIB}/diffoscope/comparators/pgp.pyc
+${PYSITELIB}/diffoscope/comparators/pgp.pyo
 ${PYSITELIB}/diffoscope/comparators/png.py
 ${PYSITELIB}/diffoscope/comparators/png.pyc
 ${PYSITELIB}/diffoscope/comparators/png.pyo
@@ -111,6 +147,9 @@ ${PYSITELIB}/diffoscope/comparators/ppu.pyo
 ${PYSITELIB}/diffoscope/comparators/ps.py
 ${PYSITELIB}/diffoscope/comparators/ps.pyc
 ${PYSITELIB}/diffoscope/comparators/ps.pyo
+${PYSITELIB}/diffoscope/comparators/rdata.py
+${PYSITELIB}/diffoscope/comparators/rdata.pyc
+${PYSITELIB}/diffoscope/comparators/rdata.pyo
 ${PYSITELIB}/diffoscope/comparators/rpm.py
 ${PYSITELIB}/diffoscope/comparators/rpm.pyc
 ${PYSITELIB}/diffoscope/comparators/rpm.pyo
@@ -135,9 +174,36 @@ ${PYSITELIB}/diffoscope/comparators/tar.pyo
 ${PYSITELIB}/diffoscope/comparators/text.py
 ${PYSITELIB}/diffoscope/comparators/text.pyc
 ${PYSITELIB}/diffoscope/comparators/text.pyo
-${PYSITELIB}/diffoscope/comparators/utils.py
-${PYSITELIB}/diffoscope/comparators/utils.pyc
-${PYSITELIB}/diffoscope/comparators/utils.pyo
+${PYSITELIB}/diffoscope/comparators/utils/__init__.py
+${PYSITELIB}/diffoscope/comparators/utils/__init__.pyc
+${PYSITELIB}/diffoscope/comparators/utils/__init__.pyo
+${PYSITELIB}/diffoscope/comparators/utils/archive.py
+${PYSITELIB}/diffoscope/comparators/utils/archive.pyc
+${PYSITELIB}/diffoscope/comparators/utils/archive.pyo
+${PYSITELIB}/diffoscope/comparators/utils/command.py
+${PYSITELIB}/diffoscope/comparators/utils/command.pyc
+${PYSITELIB}/diffoscope/comparators/utils/command.pyo
+${PYSITELIB}/diffoscope/comparators/utils/compare.py
+${PYSITELIB}/diffoscope/comparators/utils/compare.pyc
+${PYSITELIB}/diffoscope/comparators/utils/compare.pyo
+${PYSITELIB}/diffoscope/comparators/utils/container.py
+${PYSITELIB}/diffoscope/comparators/utils/container.pyc
+${PYSITELIB}/diffoscope/comparators/utils/container.pyo
+${PYSITELIB}/diffoscope/comparators/utils/file.py
+${PYSITELIB}/diffoscope/comparators/utils/file.pyc
+${PYSITELIB}/diffoscope/comparators/utils/file.pyo
+${PYSITELIB}/diffoscope/comparators/utils/fuzzy.py
+${PYSITELIB}/diffoscope/comparators/utils/fuzzy.pyc
+${PYSITELIB}/diffoscope/comparators/utils/fuzzy.pyo
+${PYSITELIB}/diffoscope/comparators/utils/libarchive.py
+${PYSITELIB}/diffoscope/comparators/utils/libarchive.pyc
+${PYSITELIB}/diffoscope/comparators/utils/libarchive.pyo
+${PYSITELIB}/diffoscope/comparators/utils/specialize.py
+${PYSITELIB}/diffoscope/comparators/utils/specialize.pyc
+${PYSITELIB}/diffoscope/comparators/utils/specialize.pyo
+${PYSITELIB}/diffoscope/comparators/xml.py
+${PYSITELIB}/diffoscope/comparators/xml.pyc
+${PYSITELIB}/diffoscope/comparators/xml.pyo
 ${PYSITELIB}/diffoscope/comparators/xz.py
 ${PYSITELIB}/diffoscope/comparators/xz.pyc
 ${PYSITELIB}/diffoscope/comparators/xz.pyo
@@ -147,27 +213,87 @@ ${PYSITELIB}/diffoscope/comparators/zip.pyo
 ${PYSITELIB}/diffoscope/config.py
 ${PYSITELIB}/diffoscope/config.pyc
 ${PYSITELIB}/diffoscope/config.pyo
+${PYSITELIB}/diffoscope/diff.py
+${PYSITELIB}/diffoscope/diff.pyc
+${PYSITELIB}/diffoscope/diff.pyo
 ${PYSITELIB}/diffoscope/difference.py
 ${PYSITELIB}/diffoscope/difference.pyc
 ${PYSITELIB}/diffoscope/difference.pyo
 ${PYSITELIB}/diffoscope/exc.py
 ${PYSITELIB}/diffoscope/exc.pyc
 ${PYSITELIB}/diffoscope/exc.pyo
+${PYSITELIB}/diffoscope/excludes.py
+${PYSITELIB}/diffoscope/excludes.pyc
+${PYSITELIB}/diffoscope/excludes.pyo
+${PYSITELIB}/diffoscope/external_tools.py
+${PYSITELIB}/diffoscope/external_tools.pyc
+${PYSITELIB}/diffoscope/external_tools.pyo
+${PYSITELIB}/diffoscope/feeders.py
+${PYSITELIB}/diffoscope/feeders.pyc
+${PYSITELIB}/diffoscope/feeders.pyo
+${PYSITELIB}/diffoscope/locale.py
+${PYSITELIB}/diffoscope/locale.pyc
+${PYSITELIB}/diffoscope/locale.pyo
+${PYSITELIB}/diffoscope/logging.py
+${PYSITELIB}/diffoscope/logging.pyc
+${PYSITELIB}/diffoscope/logging.pyo
 ${PYSITELIB}/diffoscope/main.py
 ${PYSITELIB}/diffoscope/main.pyc
 ${PYSITELIB}/diffoscope/main.pyo
+${PYSITELIB}/diffoscope/path.py
+${PYSITELIB}/diffoscope/path.pyc
+${PYSITELIB}/diffoscope/path.pyo
 ${PYSITELIB}/diffoscope/presenters/__init__.py
 ${PYSITELIB}/diffoscope/presenters/__init__.pyc
 ${PYSITELIB}/diffoscope/presenters/__init__.pyo
-${PYSITELIB}/diffoscope/presenters/html.py
-${PYSITELIB}/diffoscope/presenters/html.pyc
-${PYSITELIB}/diffoscope/presenters/html.pyo
+${PYSITELIB}/diffoscope/presenters/formats.py
+${PYSITELIB}/diffoscope/presenters/formats.pyc
+${PYSITELIB}/diffoscope/presenters/formats.pyo
+${PYSITELIB}/diffoscope/presenters/html/__init__.py
+${PYSITELIB}/diffoscope/presenters/html/__init__.pyc
+${PYSITELIB}/diffoscope/presenters/html/__init__.pyo
+${PYSITELIB}/diffoscope/presenters/html/html.py
+${PYSITELIB}/diffoscope/presenters/html/html.pyc
+${PYSITELIB}/diffoscope/presenters/html/html.pyo
+${PYSITELIB}/diffoscope/presenters/html/templates.py
+${PYSITELIB}/diffoscope/presenters/html/templates.pyc
+${PYSITELIB}/diffoscope/presenters/html/templates.pyo
 ${PYSITELIB}/diffoscope/presenters/icon.py
 ${PYSITELIB}/diffoscope/presenters/icon.pyc
 ${PYSITELIB}/diffoscope/presenters/icon.pyo
+${PYSITELIB}/diffoscope/presenters/json.py
+${PYSITELIB}/diffoscope/presenters/json.pyc
+${PYSITELIB}/diffoscope/presenters/json.pyo
+${PYSITELIB}/diffoscope/presenters/markdown.py
+${PYSITELIB}/diffoscope/presenters/markdown.pyc
+${PYSITELIB}/diffoscope/presenters/markdown.pyo
+${PYSITELIB}/diffoscope/presenters/restructuredtext.py
+${PYSITELIB}/diffoscope/presenters/restructuredtext.pyc
+${PYSITELIB}/diffoscope/presenters/restructuredtext.pyo
 ${PYSITELIB}/diffoscope/presenters/text.py
 ${PYSITELIB}/diffoscope/presenters/text.pyc
 ${PYSITELIB}/diffoscope/presenters/text.pyo
+${PYSITELIB}/diffoscope/presenters/utils.py
+${PYSITELIB}/diffoscope/presenters/utils.pyc
+${PYSITELIB}/diffoscope/presenters/utils.pyo
+${PYSITELIB}/diffoscope/profiling.py
+${PYSITELIB}/diffoscope/profiling.pyc
+${PYSITELIB}/diffoscope/profiling.pyo
 ${PYSITELIB}/diffoscope/progress.py
 ${PYSITELIB}/diffoscope/progress.pyc
 ${PYSITELIB}/diffoscope/progress.pyo
+${PYSITELIB}/diffoscope/readers/__init__.py
+${PYSITELIB}/diffoscope/readers/__init__.pyc
+${PYSITELIB}/diffoscope/readers/__init__.pyo
+${PYSITELIB}/diffoscope/readers/json.py
+${PYSITELIB}/diffoscope/readers/json.pyc
+${PYSITELIB}/diffoscope/readers/json.pyo
+${PYSITELIB}/diffoscope/readers/utils.py
+${PYSITELIB}/diffoscope/readers/utils.pyc
+${PYSITELIB}/diffoscope/readers/utils.pyo
+${PYSITELIB}/diffoscope/tempfiles.py
+${PYSITELIB}/diffoscope/tempfiles.pyc
+${PYSITELIB}/diffoscope/tempfiles.pyo
+${PYSITELIB}/diffoscope/tools.py
+${PYSITELIB}/diffoscope/tools.pyc
+${PYSITELIB}/diffoscope/tools.pyo
diff --git a/sysutils/py-diffoscope/distinfo b/sysutils/py-diffoscope/distinfo
index 77a1fbedd8c..c428fad680a 100644
--- a/sysutils/py-diffoscope/distinfo
+++ b/sysutils/py-diffoscope/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2016/12/13 15:44:59 khorben Exp $
+$NetBSD: distinfo,v 1.3 2017/10/16 09:53:42 adam Exp $
 
-SHA1 (diffoscope-63.tar.gz) = 76e67625ceee3366937db67e4f9f45ad71e7e286
-RMD160 (diffoscope-63.tar.gz) = b9a5e2c1eb4545a521635730a8e70020dbe4919b
-SHA512 (diffoscope-63.tar.gz) = e1d88f5425703699e0300fe998dccfb3fe410532e93260d91dade88d4964b3ee25a6b8095bec27ac58e2c4a490e177b4d777a734b0687a5c030d5af986b6299d
-Size (diffoscope-63.tar.gz) = 477754 bytes
+SHA1 (diffoscope-87.tar.gz) = a9703c35f8af9c88431829235cf86508294ceda1
+RMD160 (diffoscope-87.tar.gz) = d6091887de92ff98605619bbfabb8b62b96ab25a
+SHA512 (diffoscope-87.tar.gz) = 9f46ca0ba52ee991547c1b2b2477bab1e0c065cebf96649cecafc0e78983f42fe18b012a1f17de6184decb6cbb49aede91445c75777cfb292c6abe8bdf2dd6b6
+Size (diffoscope-87.tar.gz) = 1026242 bytes