Update to unpaper-7.0.0.

print/unpaper/Makefile

@@ -1,32 +1,28 @@
 COMMENT=		post-processing tool for scanned paper sheets
 
-DISTNAME=		unpaper-6.1
+DISTNAME=		unpaper-7.0.0
 
 CATEGORIES=		print graphics
 
-HOMEPAGE=		https://www.flameeyes.eu/projects/unpaper
+HOMEPAGE=		https://www.flameeyes.com/projects/unpaper
 
 MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 
 # GPLv2
-PERMIT_PACKAGE=	Yes
+PERMIT_PACKAGE=		Yes
 
 WANTLIB += avcodec avformat avutil c m
 
 MASTER_SITES=		https://www.flameeyes.eu/files/
 EXTRACT_SUFX=		.tar.xz
 
-BUILD_DEPENDS=		textproc/libxslt # xsltproc
+MODULES=		devel/meson \
+			lang/python
+
+MODPY_RUNDEP=		No
+
+BUILD_DEPENDS=		textproc/py-sphinx${MODPY_FLAVOR}
+
 LIB_DEPENDS=		graphics/ffmpeg
-TEST_DEPENDS=		sysutils/coreutils
-
-CONFIGURE_STYLE=	gnu
-
-post-install:
-# useless
-	rm -rf ${PREFIX}/share/doc/unpaper
-
-pre-test:
-	ln -fs ${LOCALBASE}/bin/gmd5sum ${WRKDIR}/bin/md5sum
 
 .include <bsd.port.mk>

print/unpaper/distinfo

@@ -1,2 +1,2 @@
-SHA256 (unpaper-6.1.tar.xz) = I3yE9dpUSz93CYJ/nxLDfDRs3wKbESj7RjP5uvpcuTA=
-SIZE (unpaper-6.1.tar.xz) = 2655724
+SHA256 (unpaper-7.0.0.tar.xz) = JXX7vybCJxnRy4grWWAsmQDH90cRisEwiD9jQZvkaoA=
+SIZE (unpaper-7.0.0.tar.xz) = 4430572

print/unpaper/patches/patch-file_c

@@ -1,26 +0,0 @@
-https://github.com/Flameeyes/unpaper/pull/42
-
---- file.c.orig	Sun Oct 26 23:35:38 2014
-+++ file.c	Wed Nov  9 16:53:16 2016
-@@ -93,10 +93,21 @@ void loadImage(const char *filename, AVFrame **image) 
-     if (pkt.stream_index != 0)
-         errOutput("unable to open file %s: invalid stream.", filename);
- 
-+    while (!got_frame && pkt.data) {
-+
-+        if (pkt.size <= 0) {
-+            pkt.data = NULL;
-+            pkt.size = 0;
-+        }
-+
-     ret = avcodec_decode_video2(avctx, frame, &got_frame, &pkt);
-     if (ret < 0) {
-         av_strerror(ret, errbuff, sizeof(errbuff));
-         errOutput("unable to open file %s: %s", filename, errbuff);
-+    }
-+
-+        pkt.data += ret;
-+        pkt.size -= ret;
-     }
- 
-     switch(frame->format) {

print/unpaper/patches/patch-tests_runtestG3_sh

@@ -1,11 +0,0 @@
---- tests/runtestG3.sh.orig	Wed Nov  9 17:01:15 2016
-+++ tests/runtestG3.sh	Wed Nov  9 17:01:38 2016
-@@ -8,7 +8,7 @@ set -x
- rm -f tests/resultsG3.pbm
- touch tests/resultsG3.pbm
- 
--./unpaper -v --no-processing 1 ${srcdir:-.}/tests/imgsrc001.png tests/resultsG3.pbm
-+./unpaper --overwrite -v --no-processing 1 ${srcdir:-.}/tests/imgsrc001.png tests/resultsG3.pbm
- 
- [ -s tests/resultsG3.pbm ]
-