libmspack: update to 0.9.1alpha.

* libmspack is now distributed with its test-suite, which now run
as part of "make check"

* libmspack's programs in src/ have been moved to examples/ and do
not auto-install

5 files changed, 9 insertions, 39 deletions

diff --git a/archivers/libmspack/Makefile b/archivers/libmspack/Makefile
index de019524924..0d7310b22d9 100644
--- a/archivers/libmspack/Makefile
+++ b/archivers/libmspack/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2018/10/12 13:21:24 sborrill Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/01 06:01:12 wiz Exp $
 
-DISTNAME=	libmspack-0.7.1alpha
+DISTNAME=	libmspack-0.9.1alpha
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cabextract.org.uk/libmspack/
 
@@ -9,11 +9,10 @@ HOMEPAGE=	https://www.cabextract.org.uk/libmspack/
 COMMENT=	Archiver for Microsoft format CAB, CHM, WIM, LIT, HLP, KWAJ and SZDD
 LICENSE=	gnu-lgpl-v2.1
 
-MAKE_JOBS_SAFE=	no
-
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
+TEST_TARGET=	check
 
 PKGCONFIG_OVERRIDE+=	libmspack.pc.in
 
diff --git a/archivers/libmspack/PLIST b/archivers/libmspack/PLIST
index 1e1ce32bb7c..519c6dd46a8 100644
--- a/archivers/libmspack/PLIST
+++ b/archivers/libmspack/PLIST
@@ -1,8 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/07/26 08:37:40 wiz Exp $
-bin/cabrip
-bin/chmextract
-bin/msexpand
-bin/oabextract
+@comment $NetBSD: PLIST,v 1.3 2018/12/01 06:01:12 wiz Exp $
 include/mspack.h
 lib/libmspack.la
 lib/pkgconfig/libmspack.pc
diff --git a/archivers/libmspack/distinfo b/archivers/libmspack/distinfo
index eff99058208..68653b01b21 100644
--- a/archivers/libmspack/distinfo
+++ b/archivers/libmspack/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2018/10/12 13:21:24 sborrill Exp $
+$NetBSD: distinfo,v 1.6 2018/12/01 06:01:12 wiz Exp $
 
-SHA1 (libmspack-0.7.1alpha.tar.gz) = 073348180586d7b0f61fd7f971162ffb5c1f6621
-RMD160 (libmspack-0.7.1alpha.tar.gz) = 4facf2e853fa1942df3d71b342aaf83c06209b40
-SHA512 (libmspack-0.7.1alpha.tar.gz) = e903629a34c29099a261a108e4eb9cda485ab999bbc3383e3cd6a39715077d00b26a1c641b0f3df0eef60d2e15a7ef623379df0cfe25b99d4eda080529ffec7b
-Size (libmspack-0.7.1alpha.tar.gz) = 486840 bytes
-SHA1 (patch-Makefile.am) = dff0e712bb577baa8587ee562e5d27c3831965cd
-SHA1 (patch-Makefile.in) = 761be4fd75d8e4496f1fe5d30e87d10f1a4e2913
+SHA1 (libmspack-0.9.1alpha.tar.gz) = 15f8eac22372d487857220b0d0e8035f2efe2657
+RMD160 (libmspack-0.9.1alpha.tar.gz) = 955c54ddce2440b24919895a77c937934c540cc6
+SHA512 (libmspack-0.9.1alpha.tar.gz) = 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a
+Size (libmspack-0.9.1alpha.tar.gz) = 494651 bytes
diff --git a/archivers/libmspack/patches/patch-Makefile.am b/archivers/libmspack/patches/patch-Makefile.am
deleted file mode 100644
index 0fc95744bba..00000000000
--- a/archivers/libmspack/patches/patch-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-Makefile.am,v 1.1 2018/10/12 13:21:24 sborrill Exp $
-
---- Makefile.am.orig	2018-10-12 10:09:21.237413686 +0000
-+++ Makefile.am
-@@ -96,4 +96,4 @@ test_kwajd_test_SOURCES =	test/kwajd_tes
- test_kwajd_test_LDADD = 	libmspack.la
- 
- test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm: test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm.LZXC-is-lzxc
--	sed s/lzxc/LZXC/ $< >$@
-+	sed s/lzxc/LZXC/ < test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm.LZXC-is-lzxc >$@
diff --git a/archivers/libmspack/patches/patch-Makefile.in b/archivers/libmspack/patches/patch-Makefile.in
deleted file mode 100644
index 54991ee185e..00000000000
--- a/archivers/libmspack/patches/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2018/10/12 13:21:24 sborrill Exp $
-
---- Makefile.in.orig	2018-10-12 10:09:23.559446305 +0000
-+++ Makefile.in
-@@ -1355,7 +1355,7 @@ dist-hook:
- 	-rm -f $(distdir)/*.la
- 
- test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm: test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm.LZXC-is-lzxc
--	sed s/lzxc/LZXC/ $< >$@
-+	sed s/lzxc/LZXC/ < test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm.LZXC-is-lzxc >$@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.