Update diffoscope to version 63

This adds a dependency on devel/colordiff.

Changelog for this version:

  * Greatly improve speed for large archives by fixing O(n^2) complexity for
    archive member lookup.
    - There is still O(n^2) complexity for archive member extraction, but this
      is less noticeable for various reasons and would require more complexity
      to fix, so for now is left as a task for the future.
  * Text output: add coloured diff support via colordiff(1).
  * Html-dir output: add +/- buttons to fold sub-diffs (i.e. toggle their
    visibility) as well as the whole diff itself. As with similar features in
    other programs, the effect affects all descendants if you shift-click.

The complete list of changes between version 44 and 63 can be found at
https://anonscm.debian.org/git/reproducible/diffoscope.git/tree/debian/changelog

3 files changed, 126 insertions, 98 deletions

diff --git a/sysutils/py-diffoscope/Makefile b/sysutils/py-diffoscope/Makefile
index bed3185d810..215535b4991 100644
--- a/sysutils/py-diffoscope/Makefile
+++ b/sysutils/py-diffoscope/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2016/08/28 15:48:34 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/12/13 15:44:59 khorben Exp $
 
-DISTNAME=	diffoscope-44
+DISTNAME=	diffoscope-63
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_PYPI:=d/diffoscope/}
@@ -13,6 +13,7 @@ LICENSE=	gnu-gpl-v3
 DEPENDS+=	${PYPKGPREFIX}-libarchive-c-[0-9]*:../../archivers/py-libarchive-c
 DEPENDS+=	${PYPKGPREFIX}-magic-[0-9]*:../../sysutils/py-magic
 DEPENDS+=	${PYPKGPREFIX}-tlsh-[0-9]*:../../devel/py-tlsh
+DEPENDS+=	colordiff-[0-9]*:../../devel/colordiff
 # for xxd
 DEPENDS+=	vim-[0-9]*:../../editors/vim
 
diff --git a/sysutils/py-diffoscope/PLIST b/sysutils/py-diffoscope/PLIST
index c8ad15b26e4..ce15b62565f 100644
--- a/sysutils/py-diffoscope/PLIST
+++ b/sysutils/py-diffoscope/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/12/27 15:43:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/12/13 15:44:59 khorben Exp $
 bin/diffoscope-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -7,140 +7,167 @@ ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/diffoscope/__init__.py
-${PYSITELIB}/diffoscope/__init__.pyc
 ${PYSITELIB}/diffoscope/__init__.pyo
-${PYSITELIB}/diffoscope/__main__.py
-${PYSITELIB}/diffoscope/__main__.pyc
-${PYSITELIB}/diffoscope/__main__.pyo
-${PYSITELIB}/diffoscope/changes.py
-${PYSITELIB}/diffoscope/changes.pyc
+${PYSITELIB}/diffoscope/__init__.pyc
 ${PYSITELIB}/diffoscope/changes.pyo
+${PYSITELIB}/diffoscope/changes.pyc
+${PYSITELIB}/diffoscope/config.pyo
+${PYSITELIB}/diffoscope/config.pyc
+${PYSITELIB}/diffoscope/difference.pyo
+${PYSITELIB}/diffoscope/difference.pyc
+${PYSITELIB}/diffoscope/exc.pyo
+${PYSITELIB}/diffoscope/exc.pyc
+${PYSITELIB}/diffoscope/main.pyo
+${PYSITELIB}/diffoscope/main.pyc
+${PYSITELIB}/diffoscope/progress.pyo
+${PYSITELIB}/diffoscope/progress.pyc
+${PYSITELIB}/diffoscope/changes.py
 ${PYSITELIB}/diffoscope/comparators/__init__.py
-${PYSITELIB}/diffoscope/comparators/__init__.pyc
 ${PYSITELIB}/diffoscope/comparators/__init__.pyo
-${PYSITELIB}/diffoscope/comparators/binary.py
-${PYSITELIB}/diffoscope/comparators/binary.pyc
+${PYSITELIB}/diffoscope/comparators/__init__.pyc
+${PYSITELIB}/diffoscope/comparators/ar.pyo
+${PYSITELIB}/diffoscope/comparators/ar.pyc
 ${PYSITELIB}/diffoscope/comparators/binary.pyo
-${PYSITELIB}/diffoscope/comparators/bzip2.py
-${PYSITELIB}/diffoscope/comparators/bzip2.pyc
+${PYSITELIB}/diffoscope/comparators/binary.pyc
 ${PYSITELIB}/diffoscope/comparators/bzip2.pyo
-${PYSITELIB}/diffoscope/comparators/cbfs.py
-${PYSITELIB}/diffoscope/comparators/cbfs.pyc
+${PYSITELIB}/diffoscope/comparators/bzip2.pyc
 ${PYSITELIB}/diffoscope/comparators/cbfs.pyo
-${PYSITELIB}/diffoscope/comparators/cpio.py
-${PYSITELIB}/diffoscope/comparators/cpio.pyc
+${PYSITELIB}/diffoscope/comparators/cbfs.pyc
 ${PYSITELIB}/diffoscope/comparators/cpio.pyo
-${PYSITELIB}/diffoscope/comparators/deb.py
-${PYSITELIB}/diffoscope/comparators/deb.pyc
+${PYSITELIB}/diffoscope/comparators/cpio.pyc
 ${PYSITELIB}/diffoscope/comparators/deb.pyo
-${PYSITELIB}/diffoscope/comparators/debian.py
-${PYSITELIB}/diffoscope/comparators/debian.pyc
+${PYSITELIB}/diffoscope/comparators/deb.pyc
 ${PYSITELIB}/diffoscope/comparators/debian.pyo
-${PYSITELIB}/diffoscope/comparators/debian_fallback.py
-${PYSITELIB}/diffoscope/comparators/debian_fallback.pyc
+${PYSITELIB}/diffoscope/comparators/debian.pyc
 ${PYSITELIB}/diffoscope/comparators/debian_fallback.pyo
-${PYSITELIB}/diffoscope/comparators/device.py
-${PYSITELIB}/diffoscope/comparators/device.pyc
+${PYSITELIB}/diffoscope/comparators/debian_fallback.pyc
 ${PYSITELIB}/diffoscope/comparators/device.pyo
-${PYSITELIB}/diffoscope/comparators/dex.py
-${PYSITELIB}/diffoscope/comparators/dex.pyc
+${PYSITELIB}/diffoscope/comparators/device.pyc
 ${PYSITELIB}/diffoscope/comparators/dex.pyo
-${PYSITELIB}/diffoscope/comparators/directory.py
-${PYSITELIB}/diffoscope/comparators/directory.pyc
+${PYSITELIB}/diffoscope/comparators/dex.pyc
 ${PYSITELIB}/diffoscope/comparators/directory.pyo
-${PYSITELIB}/diffoscope/comparators/elf.py
-${PYSITELIB}/diffoscope/comparators/elf.pyc
+${PYSITELIB}/diffoscope/comparators/directory.pyc
 ${PYSITELIB}/diffoscope/comparators/elf.pyo
-${PYSITELIB}/diffoscope/comparators/fonts.py
-${PYSITELIB}/diffoscope/comparators/fonts.pyc
+${PYSITELIB}/diffoscope/comparators/elf.pyc
 ${PYSITELIB}/diffoscope/comparators/fonts.pyo
-${PYSITELIB}/diffoscope/comparators/fsimage.py
-${PYSITELIB}/diffoscope/comparators/fsimage.pyc
+${PYSITELIB}/diffoscope/comparators/fonts.pyc
 ${PYSITELIB}/diffoscope/comparators/fsimage.pyo
-${PYSITELIB}/diffoscope/comparators/gettext.py
-${PYSITELIB}/diffoscope/comparators/gettext.pyc
+${PYSITELIB}/diffoscope/comparators/fsimage.pyc
 ${PYSITELIB}/diffoscope/comparators/gettext.pyo
-${PYSITELIB}/diffoscope/comparators/gzip.py
-${PYSITELIB}/diffoscope/comparators/gzip.pyc
+${PYSITELIB}/diffoscope/comparators/gettext.pyc
+${PYSITELIB}/diffoscope/comparators/git.pyo
+${PYSITELIB}/diffoscope/comparators/git.pyc
 ${PYSITELIB}/diffoscope/comparators/gzip.pyo
-${PYSITELIB}/diffoscope/comparators/haskell.py
-${PYSITELIB}/diffoscope/comparators/haskell.pyc
+${PYSITELIB}/diffoscope/comparators/gzip.pyc
 ${PYSITELIB}/diffoscope/comparators/haskell.pyo
-${PYSITELIB}/diffoscope/comparators/image.py
-${PYSITELIB}/diffoscope/comparators/image.pyc
+${PYSITELIB}/diffoscope/comparators/haskell.pyc
+${PYSITELIB}/diffoscope/comparators/icc.pyo
+${PYSITELIB}/diffoscope/comparators/icc.pyc
 ${PYSITELIB}/diffoscope/comparators/image.pyo
-${PYSITELIB}/diffoscope/comparators/ipk.py
-${PYSITELIB}/diffoscope/comparators/ipk.pyc
+${PYSITELIB}/diffoscope/comparators/image.pyc
 ${PYSITELIB}/diffoscope/comparators/ipk.pyo
-${PYSITELIB}/diffoscope/comparators/iso9660.py
-${PYSITELIB}/diffoscope/comparators/iso9660.pyc
+${PYSITELIB}/diffoscope/comparators/ipk.pyc
 ${PYSITELIB}/diffoscope/comparators/iso9660.pyo
-${PYSITELIB}/diffoscope/comparators/java.py
-${PYSITELIB}/diffoscope/comparators/java.pyc
+${PYSITELIB}/diffoscope/comparators/iso9660.pyc
 ${PYSITELIB}/diffoscope/comparators/java.pyo
-${PYSITELIB}/diffoscope/comparators/libarchive.py
-${PYSITELIB}/diffoscope/comparators/libarchive.pyc
+${PYSITELIB}/diffoscope/comparators/java.pyc
+${PYSITELIB}/diffoscope/comparators/json.pyo
+${PYSITELIB}/diffoscope/comparators/json.pyc
 ${PYSITELIB}/diffoscope/comparators/libarchive.pyo
-${PYSITELIB}/diffoscope/comparators/macho.py
-${PYSITELIB}/diffoscope/comparators/macho.pyc
+${PYSITELIB}/diffoscope/comparators/libarchive.pyc
+${PYSITELIB}/diffoscope/comparators/llvm.pyo
+${PYSITELIB}/diffoscope/comparators/llvm.pyc
 ${PYSITELIB}/diffoscope/comparators/macho.pyo
-${PYSITELIB}/diffoscope/comparators/mono.py
-${PYSITELIB}/diffoscope/comparators/mono.pyc
+${PYSITELIB}/diffoscope/comparators/macho.pyc
 ${PYSITELIB}/diffoscope/comparators/mono.pyo
-${PYSITELIB}/diffoscope/comparators/pdf.py
-${PYSITELIB}/diffoscope/comparators/pdf.pyc
+${PYSITELIB}/diffoscope/comparators/mono.pyc
 ${PYSITELIB}/diffoscope/comparators/pdf.pyo
-${PYSITELIB}/diffoscope/comparators/png.py
-${PYSITELIB}/diffoscope/comparators/png.pyc
+${PYSITELIB}/diffoscope/comparators/pdf.pyc
 ${PYSITELIB}/diffoscope/comparators/png.pyo
-${PYSITELIB}/diffoscope/comparators/ppu.py
-${PYSITELIB}/diffoscope/comparators/ppu.pyc
+${PYSITELIB}/diffoscope/comparators/png.pyc
 ${PYSITELIB}/diffoscope/comparators/ppu.pyo
-${PYSITELIB}/diffoscope/comparators/rpm.py
-${PYSITELIB}/diffoscope/comparators/rpm.pyc
+${PYSITELIB}/diffoscope/comparators/ppu.pyc
+${PYSITELIB}/diffoscope/comparators/ps.pyo
+${PYSITELIB}/diffoscope/comparators/ps.pyc
 ${PYSITELIB}/diffoscope/comparators/rpm.pyo
-${PYSITELIB}/diffoscope/comparators/rpm_fallback.py
-${PYSITELIB}/diffoscope/comparators/rpm_fallback.pyc
+${PYSITELIB}/diffoscope/comparators/rpm.pyc
 ${PYSITELIB}/diffoscope/comparators/rpm_fallback.pyo
-${PYSITELIB}/diffoscope/comparators/sqlite.py
-${PYSITELIB}/diffoscope/comparators/sqlite.pyc
+${PYSITELIB}/diffoscope/comparators/rpm_fallback.pyc
+${PYSITELIB}/diffoscope/comparators/rust.pyo
+${PYSITELIB}/diffoscope/comparators/rust.pyc
 ${PYSITELIB}/diffoscope/comparators/sqlite.pyo
-${PYSITELIB}/diffoscope/comparators/squashfs.py
-${PYSITELIB}/diffoscope/comparators/squashfs.pyc
+${PYSITELIB}/diffoscope/comparators/sqlite.pyc
 ${PYSITELIB}/diffoscope/comparators/squashfs.pyo
-${PYSITELIB}/diffoscope/comparators/symlink.py
-${PYSITELIB}/diffoscope/comparators/symlink.pyc
+${PYSITELIB}/diffoscope/comparators/squashfs.pyc
 ${PYSITELIB}/diffoscope/comparators/symlink.pyo
-${PYSITELIB}/diffoscope/comparators/tar.py
-${PYSITELIB}/diffoscope/comparators/tar.pyc
+${PYSITELIB}/diffoscope/comparators/symlink.pyc
 ${PYSITELIB}/diffoscope/comparators/tar.pyo
-${PYSITELIB}/diffoscope/comparators/text.py
-${PYSITELIB}/diffoscope/comparators/text.pyc
+${PYSITELIB}/diffoscope/comparators/tar.pyc
 ${PYSITELIB}/diffoscope/comparators/text.pyo
-${PYSITELIB}/diffoscope/comparators/utils.py
-${PYSITELIB}/diffoscope/comparators/utils.pyc
+${PYSITELIB}/diffoscope/comparators/text.pyc
 ${PYSITELIB}/diffoscope/comparators/utils.pyo
-${PYSITELIB}/diffoscope/comparators/xz.py
-${PYSITELIB}/diffoscope/comparators/xz.pyc
+${PYSITELIB}/diffoscope/comparators/utils.pyc
 ${PYSITELIB}/diffoscope/comparators/xz.pyo
-${PYSITELIB}/diffoscope/comparators/zip.py
-${PYSITELIB}/diffoscope/comparators/zip.pyc
+${PYSITELIB}/diffoscope/comparators/xz.pyc
 ${PYSITELIB}/diffoscope/comparators/zip.pyo
+${PYSITELIB}/diffoscope/comparators/zip.pyc
+${PYSITELIB}/diffoscope/comparators/ar.py
+${PYSITELIB}/diffoscope/comparators/binary.py
+${PYSITELIB}/diffoscope/comparators/bzip2.py
+${PYSITELIB}/diffoscope/comparators/cbfs.py
+${PYSITELIB}/diffoscope/comparators/cpio.py
+${PYSITELIB}/diffoscope/comparators/deb.py
+${PYSITELIB}/diffoscope/comparators/debian.py
+${PYSITELIB}/diffoscope/comparators/debian_fallback.py
+${PYSITELIB}/diffoscope/comparators/device.py
+${PYSITELIB}/diffoscope/comparators/dex.py
+${PYSITELIB}/diffoscope/comparators/directory.py
+${PYSITELIB}/diffoscope/comparators/elf.py
+${PYSITELIB}/diffoscope/comparators/fonts.py
+${PYSITELIB}/diffoscope/comparators/fsimage.py
+${PYSITELIB}/diffoscope/comparators/gettext.py
+${PYSITELIB}/diffoscope/comparators/git.py
+${PYSITELIB}/diffoscope/comparators/gzip.py
+${PYSITELIB}/diffoscope/comparators/haskell.py
+${PYSITELIB}/diffoscope/comparators/icc.py
+${PYSITELIB}/diffoscope/comparators/image.py
+${PYSITELIB}/diffoscope/comparators/ipk.py
+${PYSITELIB}/diffoscope/comparators/iso9660.py
+${PYSITELIB}/diffoscope/comparators/java.py
+${PYSITELIB}/diffoscope/comparators/json.py
+${PYSITELIB}/diffoscope/comparators/libarchive.py
+${PYSITELIB}/diffoscope/comparators/llvm.py
+${PYSITELIB}/diffoscope/comparators/macho.py
+${PYSITELIB}/diffoscope/comparators/mono.py
+${PYSITELIB}/diffoscope/comparators/pdf.py
+${PYSITELIB}/diffoscope/comparators/png.py
+${PYSITELIB}/diffoscope/comparators/ppu.py
+${PYSITELIB}/diffoscope/comparators/ps.py
+${PYSITELIB}/diffoscope/comparators/rpm.py
+${PYSITELIB}/diffoscope/comparators/rpm_fallback.py
+${PYSITELIB}/diffoscope/comparators/rust.py
+${PYSITELIB}/diffoscope/comparators/sqlite.py
+${PYSITELIB}/diffoscope/comparators/squashfs.py
+${PYSITELIB}/diffoscope/comparators/symlink.py
+${PYSITELIB}/diffoscope/comparators/tar.py
+${PYSITELIB}/diffoscope/comparators/text.py
+${PYSITELIB}/diffoscope/comparators/utils.py
+${PYSITELIB}/diffoscope/comparators/xz.py
+${PYSITELIB}/diffoscope/comparators/zip.py
 ${PYSITELIB}/diffoscope/config.py
-${PYSITELIB}/diffoscope/config.pyc
-${PYSITELIB}/diffoscope/config.pyo
 ${PYSITELIB}/diffoscope/difference.py
-${PYSITELIB}/diffoscope/difference.pyc
-${PYSITELIB}/diffoscope/difference.pyo
+${PYSITELIB}/diffoscope/exc.py
+${PYSITELIB}/diffoscope/main.py
 ${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/__init__.pyc
 ${PYSITELIB}/diffoscope/presenters/html.pyo
-${PYSITELIB}/diffoscope/presenters/icon.py
-${PYSITELIB}/diffoscope/presenters/icon.pyc
+${PYSITELIB}/diffoscope/presenters/html.pyc
 ${PYSITELIB}/diffoscope/presenters/icon.pyo
-${PYSITELIB}/diffoscope/presenters/text.py
-${PYSITELIB}/diffoscope/presenters/text.pyc
+${PYSITELIB}/diffoscope/presenters/icon.pyc
 ${PYSITELIB}/diffoscope/presenters/text.pyo
+${PYSITELIB}/diffoscope/presenters/text.pyc
+${PYSITELIB}/diffoscope/presenters/html.py
+${PYSITELIB}/diffoscope/presenters/icon.py
+${PYSITELIB}/diffoscope/presenters/text.py
+${PYSITELIB}/diffoscope/progress.py
diff --git a/sysutils/py-diffoscope/distinfo b/sysutils/py-diffoscope/distinfo
index 89ace3b1d8c..77a1fbedd8c 100644
--- a/sysutils/py-diffoscope/distinfo
+++ b/sysutils/py-diffoscope/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2015/12/27 15:43:59 wiz Exp $
+$NetBSD: distinfo,v 1.2 2016/12/13 15:44:59 khorben Exp $
 
-SHA1 (diffoscope-44.tar.gz) = a8e991292fe101caab0350ffa43f3341f513b9f3
-RMD160 (diffoscope-44.tar.gz) = 3b49f689fde98434c193acba588555af9669ea22
-SHA512 (diffoscope-44.tar.gz) = 0f344c6b5781d312b0dda9711cde5117983d358c629f6137aa745d367ed4cc5c3d46c8d62704a4f8f1df60034c24117c04a44ec09221fb481f0431df13bd2c8e
-Size (diffoscope-44.tar.gz) = 334834 bytes
+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