diff --git a/app-text/mupdf/mupdf-1.10~a.recipe b/app-text/mupdf/mupdf-1.10~a.recipe
deleted file mode 100644
index bcbbde070..000000000
--- a/app-text/mupdf/mupdf-1.10~a.recipe
+++ /dev/null
@@ -1,117 +0,0 @@
-SUMMARY="A lightweight XPS and PDF rendering library"
-DESCRIPTION="The renderer in MuPDF is tailored for high quality anti-aliased \
-graphics. It renders text with metrics and spacing accurate to within \
-fractions of a pixel for the highest fidelity in reproducing the look of a \
-printed page on screen.
-
-MuPDF is also small, fast, and yet complete. It supports PDF 1.7 with \
-transparency, encryption, hyperlinks, annotations, searching and more. It also \
-reads XPS/OpenXPS documents and CBZ (Comic Book archive) files."
-HOMEPAGE="https://www.mupdf.com/"
-COPYRIGHT="2006-2016 Artifex Software, Inc"
-LICENSE="AGPL-3.0"
-REVISION="2"
-SOURCE_URI="http://mupdf.com/downloads/archive/mupdf-${portVersion/\~/}-source.tar.gz"
-CHECKSUM_SHA256="aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836"
-SOURCE_DIR="mupdf-${portVersion/\~/}-source"
-PATCHES="
-	mupdf-$portVersion.patchset
-	mupdf-$portVersion-openjpeg21.patchset
-	mupdf-$portVersion-harfbuzz.patchset
-	"
-
-ARCHITECTURES="!all"
-SECONDARY_ARCHITECTURES="!x86"
-
-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-	commandSuffix=
-	commandBinDir=$prefix/bin
-fi
-
-PROVIDES="
-	mupdf$secondaryArchSuffix = $portVersion compat >= 1.1
-	lib:libmupdf$secondaryArchSuffix
-	cmd:mudraw$commandSuffix
-	cmd:mujstest$commandSuffix
-	cmd:muraster$commandSuffix
-	cmd:mutool$commandSuffix
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
-	lib:libglib_2.0$secondaryArchSuffix
-	lib:libharfbuzz$secondaryArchSuffix
-	lib:libjbig2dec$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libopenjp2$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	mupdf${secondaryArchSuffix}_devel = $portVersion
-	devel:libmupdf$secondaryArchSuffix
-	devel:libmupdfthird$secondaryArchSuffix
-	"
-REQUIRES_devel="
-	mupdf$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	devel:libfreetype$secondaryArchSuffix
-	devel:libglib_2.0$secondaryArchSuffix
-	devel:libharfbuzz$secondaryArchSuffix
-	devel:libjbig2dec$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:libopenjp2$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:find
-	cmd:freetype_config$secondaryArchSuffix
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	# don't use builtin libs
-	rm -rf thirdparty
-
-	# static lib
-	my_soname=libmupdf.so.$portVersion
-	my_soname_js_none=libmupdf-js-none.so.$portVersion
-	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
-		-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
-		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/install/s: COPYING : :" \
-		-i Makefile || die
-	make XCFLAGS=-fpic build=release $jobArgs
-}
-
-INSTALL()
-{
-	make build=release install \
-		prefix=$prefix \
-		bindir=$binDir \
-		docdir=$docDir \
-		libdir=$libDir \
-		incdir=$includeDir \
-		mandir=$manDir
-
-#	ln -s libmupdf.so.$portVersion $libDir/libmupdf.so
-
-	prepareInstalledDevelLibs \
-		libmupdf \
-		libmupdfthird
-	fixPkgconfig
-
-	# devel package
-	packageEntries devel \
-		$developDir
-}
diff --git a/app-text/mupdf/mupdf-1.6.recipe b/app-text/mupdf/mupdf-1.6.recipe
deleted file mode 100644
index 46f5a350a..000000000
--- a/app-text/mupdf/mupdf-1.6.recipe
+++ /dev/null
@@ -1,100 +0,0 @@
-SUMMARY="A lightweight XPS and PDF rendering library"
-DESCRIPTION="The renderer in MuPDF is tailored for high quality anti-aliased \
-graphics. It renders text with metrics and spacing accurate to within \
-fractions of a pixel for the highest fidelity in reproducing the look of a \
-printed page on screen.
-
-MuPDF is also small, fast, and yet complete. It supports PDF 1.7 with \
-transparency, encryption, hyperlinks, annotations, searching and more. It also \
-reads XPS/OpenXPS documents and CBZ (Comic Book archive) files."
-HOMEPAGE="https://www.mupdf.com/"
-COPYRIGHT="2006-2014 Artifex Software, Inc"
-LICENSE="AGPL-3.0"
-REVISION="6"
-SOURCE_URI="http://www.mupdf.com/downloads/archive/mupdf-$portVersion-source.tar.gz"
-CHECKSUM_SHA256="9813ee330950a641364181649ebd369c947adbcea9d41ed953ec5365640ea563"
-SOURCE_DIR="mupdf-$portVersion-source"
-PATCHES="
-	mupdf-1.6.patchset
-	mupdf-1.6-openjpeg21-1.patch
-	"
-
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	mupdf$secondaryArchSuffix = $portVersion compat >= 1.1
-	cmd:mudraw$secondaryArchSuffix
-	cmd:mujstest$secondaryArchSuffix
-	cmd:mutool$secondaryArchSuffix
-	lib:libmupdf$secondaryArchSuffix = $portVersion compat >= 1.1
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
-	lib:libjbig2dec$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libopenjp2$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	mupdf${secondaryArchSuffix}_devel = $portVersion
-	devel:libmupdf$secondaryArchSuffix = $portVersion compat >= 1
-	"
-REQUIRES_devel="
-	mupdf$secondaryArchSuffix == $portVersion
-	"
-
-BUILD_REQUIRES="
-	devel:libfreetype$secondaryArchSuffix
-	devel:libjbig2dec$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:libopenjp2$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:find
-	cmd:freetype_config$secondaryArchSuffix
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	# don't use builtin libs
-	rm -rf thirdparty
-
-	# static lib
-	my_soname=libmupdf.so.$portVersion
-	my_soname_js_none=libmupdf-js-none.so.$portVersion
-	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
-		-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
-		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/install/s: COPYING : :" \
-		-i Makefile || die
-	make XCFLAGS=-fpic build=release $jobArgs
-}
-
-INSTALL()
-{
-	make build=release install \
-		prefix=$prefix \
-		bindir=$binDir \
-		docdir=$docDir \
-		libdir=$libDir \
-		incdir=$includeDir \
-		mandir=$manDir
-
-	ln -s libmupdf.so.$portVersion $libDir/libmupdf.so
-
-	prepareInstalledDevelLibs libmupdf
-
-	# devel package
-	packageEntries devel \
-		$developDir
-}
diff --git a/app-text/mupdf/mupdf-1.8.recipe b/app-text/mupdf/mupdf-1.8.recipe
deleted file mode 100644
index d653e2ae9..000000000
--- a/app-text/mupdf/mupdf-1.8.recipe
+++ /dev/null
@@ -1,97 +0,0 @@
-SUMMARY="A lightweight XPS and PDF rendering library"
-DESCRIPTION="The renderer in MuPDF is tailored for high quality anti-aliased \
-graphics. It renders text with metrics and spacing accurate to within \
-fractions of a pixel for the highest fidelity in reproducing the look of a \
-printed page on screen.
-
-MuPDF is also small, fast, and yet complete. It supports PDF 1.7 with \
-transparency, encryption, hyperlinks, annotations, searching and more. It also \
-reads XPS/OpenXPS documents and CBZ (Comic Book archive) files."
-HOMEPAGE="https://www.mupdf.com/"
-COPYRIGHT="2006-2015 Artifex Software, Inc"
-LICENSE="AGPL-3.0"
-REVISION="5"
-SOURCE_URI="https://www.mupdf.com/downloads/archive/mupdf-$portVersion-source.tar.gz"
-CHECKSUM_SHA256="a2a3c64d8b24920f87cf4ea9339a25abf7388496440f13b37482d1403c33c206"
-SOURCE_DIR="mupdf-$portVersion-source"
-PATCHES="mupdf-1.8.patchset"
-
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	mupdf$secondaryArchSuffix = $portVersion compat >= 1.1
-	cmd:mudraw$secondaryArchSuffix
-	cmd:mujstest$secondaryArchSuffix
-	cmd:mutool$secondaryArchSuffix
-	lib:libmupdf$secondaryArchSuffix = $portVersion compat >= 1.1
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
-	lib:libjbig2dec$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libopenjp2$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	mupdf${secondaryArchSuffix}_devel = $portVersion
-	devel:libmupdf$secondaryArchSuffix = $portVersion compat >= 1
-	"
-REQUIRES_devel="
-	mupdf$secondaryArchSuffix == $portVersion
-	"
-
-BUILD_REQUIRES="
-	devel:libfreetype$secondaryArchSuffix
-	devel:libjbig2dec$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:libopenjp2$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:find
-	cmd:freetype_config$secondaryArchSuffix
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	# don't use builtin libs
-	rm -rf thirdparty
-
-	# static lib
-	my_soname=libmupdf.so.$portVersion
-	my_soname_js_none=libmupdf-js-none.so.$portVersion
-	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
-		-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
-		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/install/s: COPYING : :" \
-		-i Makefile || die
-	make XCFLAGS=-fpic build=release $jobArgs
-}
-
-INSTALL()
-{
-	make build=release install \
-		prefix=$prefix \
-		bindir=$binDir \
-		docdir=$docDir \
-		libdir=$libDir \
-		incdir=$includeDir \
-		mandir=$manDir
-
-	ln -s libmupdf.so.$portVersion $libDir/libmupdf.so
-
-	prepareInstalledDevelLibs libmupdf
-
-	# devel package
-	packageEntries devel \
-		$developDir
-}
diff --git a/app-text/mupdf/patches/mupdf-1.10~a-harfbuzz.patchset b/app-text/mupdf/patches/mupdf-1.10~a-harfbuzz.patchset
deleted file mode 100644
index 16a836c35..000000000
--- a/app-text/mupdf/patches/mupdf-1.10~a-harfbuzz.patchset
+++ /dev/null
@@ -1,52 +0,0 @@
-From 1523c988bf2755d2db8358b04010a3f62c684211 Mon Sep 17 00:00:00 2001
-From: fbrosson <fbrosson@localhost>
-Date: Mon, 28 Nov 2016 13:37:54 +0000
-Subject: Fix includes for hb.h and hb-ft.h.
-
-
-diff --git a/source/fitz/font.c b/source/fitz/font.c
-index 4e30579..f784739 100644
---- a/source/fitz/font.c
-+++ b/source/fitz/font.c
-@@ -3,8 +3,8 @@
- #include "font-imp.h"
- 
- #include <ft2build.h>
--#include "hb.h"
--#include "hb-ft.h"
-+#include <harfbuzz/hb.h>
-+#include <harfbuzz/hb-ft.h>
- 
- #include FT_FREETYPE_H
- #include FT_ADVANCES_H
-diff --git a/source/fitz/harfbuzz.c b/source/fitz/harfbuzz.c
-index e2b4e83..84bcf48 100644
---- a/source/fitz/harfbuzz.c
-+++ b/source/fitz/harfbuzz.c
-@@ -5,7 +5,7 @@
- 
- #include "mupdf/fitz.h"
- 
--#include "hb.h"
-+#include <harfbuzz/hb.h>
- 
- /* Harfbuzz has some major design flaws.
-  *
-diff --git a/source/html/html-layout.c b/source/html/html-layout.c
-index 95f2a76..31b1d1f 100644
---- a/source/html/html-layout.c
-+++ b/source/html/html-layout.c
-@@ -1,8 +1,8 @@
- #include "mupdf/html.h"
- #include "mupdf/svg.h"
- 
--#include "hb.h"
--#include "hb-ft.h"
-+#include <harfbuzz/hb.h>
-+#include <harfbuzz/hb-ft.h>
- #include <ft2build.h>
- 
- #undef DEBUG_HARFBUZZ
--- 
-2.11.0
-
diff --git a/app-text/mupdf/patches/mupdf-1.10~a-openjpeg21.patchset b/app-text/mupdf/patches/mupdf-1.10~a-openjpeg21.patchset
deleted file mode 100644
index b75bebaff..000000000
--- a/app-text/mupdf/patches/mupdf-1.10~a-openjpeg21.patchset
+++ /dev/null
@@ -1,28 +0,0 @@
-From 218fa2f41479cce876896632d9ce3a159b29eaf0 Mon Sep 17 00:00:00 2001
-From: fbrosson <fbrosson@localhost>
-Date: Mon, 28 Nov 2016 13:37:54 +0000
-Subject: Skip unneeded workaround in source/fitz/load-jpx.c
-
-
-diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
-index b1d77c7..d37f90d 100644
---- a/source/fitz/load-jpx.c
-+++ b/source/fitz/load-jpx.c
-@@ -481,14 +481,6 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
- 
- #else /* HAVE_LURATECH */
- 
--/* Without the definition of OPJ_STATIC, compilation fails on windows
-- * due to the use of __stdcall. We believe it is required on some
-- * linux toolchains too. */
--#define OPJ_STATIC
--#ifndef _MSC_VER
--#define OPJ_HAVE_STDINT_H
--#endif
--
- #include <openjpeg.h>
- 
- /* OpenJPEG does not provide a safe mechanism to intercept
--- 
-2.11.0
-
diff --git a/app-text/mupdf/patches/mupdf-1.10~a.patchset b/app-text/mupdf/patches/mupdf-1.10~a.patchset
deleted file mode 100644
index 013c400d3..000000000
--- a/app-text/mupdf/patches/mupdf-1.10~a.patchset
+++ /dev/null
@@ -1,157 +0,0 @@
-From 822c66106b347a8483d72db3ac8adffd1bf1aacc Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Tue, 21 Apr 2015 12:57:05 +0300
-Subject: gcc2 fixes
-
-
-diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h
-index 1723824..565024d 100644
---- a/include/mupdf/fitz/system.h
-+++ b/include/mupdf/fitz/system.h
-@@ -81,6 +81,12 @@
- #define fz_jmp_buf jmp_buf
- #endif
- 
-+#ifdef __HAIKU__
-+#if __GNUC__ < 3
-+#define va_copy __va_copy
-+#endif
-+#endif
-+
- #ifdef _MSC_VER /* Microsoft Visual C */
- 
- /* MSVC up to VS2012 */
-diff --git a/scripts/cmapdump.c b/scripts/cmapdump.c
-index 4da2e32..42d4152 100644
---- a/scripts/cmapdump.c
-+++ b/scripts/cmapdump.c
-@@ -28,6 +28,24 @@
- #include "../source/fitz/time.c"
- #endif
- 
-+#ifdef __HAIKU__
-+#if __GNUC__ < 3
-+#include "../source/fitz/output.c"
-+
-+unsigned int
-+fz_pixmap_size(fz_context *ctx, fz_pixmap * pix)
-+{
-+	if (pix == NULL)
-+		return 0;
-+	return sizeof(*pix) + pix->n * pix->w * pix->h;
-+}
-+int pdf_objcmp_resolve(fz_context *ctx, pdf_obj *a, pdf_obj *b)
-+{
-+	return 0;
-+}
-+#endif
-+#endif
-+
- #include "../source/pdf/pdf-lex.c"
- #include "../source/pdf/pdf-cmap.c"
- #include "../source/pdf/pdf-cmap-parse.c"
--- 
-2.7.0
-
-
-From 72fa503df92c304b9bfc3d181424cfe1083b4cfe Mon Sep 17 00:00:00 2001
-From: Chris Roberts <cpr420@gmail.com>
-Date: Mon, 18 Nov 2013 01:10:58 -0700
-Subject: Remove libm and add install-libs target
-
-
-diff --git a/Makefile b/Makefile
-index 886a017..62ee1c7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,7 +16,7 @@ include Makethird
- # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
- # set a variable that was set on the command line.
- CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN)
--LIBS += $(XLIBS) -lm
-+LIBS += $(XLIBS)
- 
- LIBS += $(FREETYPE_LIBS)
- LIBS += $(HARFBUZZ_LIBS)
-@@ -363,7 +363,17 @@ extra: $(CURL_LIB) $(GLFW_LIB)
- libs: $(INSTALL_LIBS)
- apps: $(INSTALL_APPS)
- 
--install: libs apps
-+install: install-libs apps
-+	install -d $(DESTDIR)$(bindir)
-+	install $(INSTALL_APPS) $(DESTDIR)$(bindir)
-+
-+	install -d $(DESTDIR)$(mandir)/man1
-+	install docs/man/*.1 $(DESTDIR)$(mandir)/man1
-+
-+	install -d $(DESTDIR)$(docdir)
-+	install README COPYING CHANGES docs/*.txt $(DESTDIR)$(docdir)
-+
-+install-libs: libs
- 	install -d $(DESTDIR)$(incdir)/mupdf
- 	install -d $(DESTDIR)$(incdir)/mupdf/fitz
- 	install -d $(DESTDIR)$(incdir)/mupdf/pdf
-@@ -374,14 +384,6 @@ install: libs apps
- 	install -d $(DESTDIR)$(libdir)
- 	install $(INSTALL_LIBS) $(DESTDIR)$(libdir)
- 
--	install -d $(DESTDIR)$(bindir)
--	install $(INSTALL_APPS) $(DESTDIR)$(bindir)
--
--	install -d $(DESTDIR)$(mandir)/man1
--	install docs/man/*.1 $(DESTDIR)$(mandir)/man1
--
--	install -d $(DESTDIR)$(docdir)
--	install README COPYING CHANGES docs/*.txt $(DESTDIR)$(docdir)
- 
- tarball:
- 	bash scripts/archive.sh
--- 
-2.7.0
-
-
-From 3d729e50178ddaa7a0671bb8deecd6e34f33508a Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Tue, 31 Jan 2017 18:59:49 +0100
-Subject: fixes to link against several libs
-
-
-diff --git a/Makerules b/Makerules
-index 8a17d77..ad2e262 100644
---- a/Makerules
-+++ b/Makerules
-@@ -102,6 +102,30 @@ AR = xcrun ar
- LD = xcrun ld
- RANLIB_CMD = xcrun ranlib $@
- 
-+else ifeq "$(OS)" "Haiku"
-+
-+ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
-+HAVE_LIBCRYPTO = yes
-+SYS_LIBCRYPTO_CFLAGS = -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
-+SYS_LIBCRYPTO_LIBS = $(shell pkg-config --libs libcrypto)
-+endif
-+
-+ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
-+HAVE_CURL = yes
-+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
-+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
-+endif
-+
-+SYS_HARFBUZZ_CFLAGS = $(shell pkg-config --cflags harfbuzz)
-+SYS_HARFBUZZ_LIBS = $(shell pkg-config --libs harfbuzz)
-+SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
-+SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
-+SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
-+SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
-+SYS_JBIG2DEC_LIBS = -ljbig2dec
-+SYS_JPEG_LIBS = -ljpeg
-+SYS_ZLIB_LIBS = -lz
-+
- # Linux uses pkg-config for system libraries.
- else ifeq "$(OS)" "Linux"
- 
--- 
-2.10.2
-
diff --git a/app-text/mupdf/patches/mupdf-1.6-openjpeg21-1.patch b/app-text/mupdf/patches/mupdf-1.6-openjpeg21-1.patch
deleted file mode 100644
index fb362326f..000000000
--- a/app-text/mupdf/patches/mupdf-1.6-openjpeg21-1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur mupdf-1.6-source.orig/source/fitz/load-jpx.c mupdf-1.6-source/source/fitz/load-jpx.c
---- mupdf-1.6-source.orig/source/fitz/load-jpx.c	2014-09-30 13:25:12.000000000 +0200
-+++ mupdf-1.6-source/source/fitz/load-jpx.c	2014-11-17 18:45:27.202705119 +0100
-@@ -1,13 +1,5 @@
- #include "mupdf/fitz.h"
- 
--/* Without the definition of OPJ_STATIC, compilation fails on windows
-- * due to the use of __stdcall. We believe it is required on some
-- * linux toolchains too. */
--#define OPJ_STATIC
--#ifndef _MSC_VER
--#define OPJ_HAVE_STDINT_H
--#endif
--
- #include <openjpeg.h>
- 
- static void fz_opj_error_callback(const char *msg, void *client_data)
-@@ -117,7 +109,7 @@
- 	opj_stream_set_read_function(stream, fz_opj_stream_read);
- 	opj_stream_set_skip_function(stream, fz_opj_stream_skip);
- 	opj_stream_set_seek_function(stream, fz_opj_stream_seek);
--	opj_stream_set_user_data(stream, &sb);
-+	opj_stream_set_user_data(stream, &sb, NULL);
- 	/* Set the length to avoid an assert */
- 	opj_stream_set_user_data_length(stream, size);
- 
diff --git a/app-text/mupdf/patches/mupdf-1.6.patchset b/app-text/mupdf/patches/mupdf-1.6.patchset
deleted file mode 100644
index 2fb595915..000000000
--- a/app-text/mupdf/patches/mupdf-1.6.patchset
+++ /dev/null
@@ -1,154 +0,0 @@
-From 775b47fa707d6f6aea18e6337afc572ee5c18ed6 Mon Sep 17 00:00:00 2001
-From: Chris Roberts <cpr420@gmail.com>
-Date: Mon, 18 Nov 2013 01:10:58 -0700
-Subject: Remove libm and add install-libs target
-
-
-diff --git a/Makefile b/Makefile
-index 3777a1c..d53b02e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,7 +13,7 @@ default: all
- # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
- # set a variable that was set on the command line.
- CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN)
--LIBS += $(XLIBS) -lm
-+LIBS += $(XLIBS)
- 
- include Makerules
- include Makethird
-@@ -307,7 +307,17 @@ third: $(THIRD_LIBS) $(CURL_LIB)
- libs: $(INSTALL_LIBS)
- apps: $(INSTALL_APPS)
- 
--install: libs apps
-+install: install-libs apps
-+	install -d $(DESTDIR)$(bindir)
-+	install $(INSTALL_APPS) $(DESTDIR)$(bindir)
-+
-+	install -d $(DESTDIR)$(mandir)/man1
-+	install docs/man/*.1 $(DESTDIR)$(mandir)/man1
-+
-+	install -d $(DESTDIR)$(docdir)
-+	install README COPYING CHANGES docs/*.txt $(DESTDIR)$(docdir)
-+
-+install-libs: libs
- 	install -d $(DESTDIR)$(incdir)/mupdf
- 	install -d $(DESTDIR)$(incdir)/mupdf/fitz
- 	install -d $(DESTDIR)$(incdir)/mupdf/pdf
-@@ -318,14 +328,6 @@ install: libs apps
- 	install -d $(DESTDIR)$(libdir)
- 	install $(INSTALL_LIBS) $(DESTDIR)$(libdir)
- 
--	install -d $(DESTDIR)$(bindir)
--	install $(INSTALL_APPS) $(DESTDIR)$(bindir)
--
--	install -d $(DESTDIR)$(mandir)/man1
--	install docs/man/*.1 $(DESTDIR)$(mandir)/man1
--
--	install -d $(DESTDIR)$(docdir)
--	install README COPYING CHANGES docs/*.txt $(DESTDIR)$(docdir)
- 
- tarball:
- 	bash scripts/archive.sh
--- 
-2.2.2
-
-
-From 26b16cd599ff64153508e30925ef55368dcf0ec3 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Wed, 24 Sep 2014 13:25:59 +0200
-Subject: Add Haiku support
-
-
-diff --git a/Makerules b/Makerules
-index 75573da..c6588be 100644
---- a/Makerules
-+++ b/Makerules
-@@ -53,6 +53,27 @@ AR = xcrun ar
- LD = xcrun ld
- RANLIB_CMD = xcrun ranlib $@
- 
-+else ifeq "$(OS)" "Haiku"
-+
-+ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
-+SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto)
-+SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto)
-+endif
-+
-+ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
-+HAVE_CURL = yes
-+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
-+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
-+endif
-+
-+SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
-+SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
-+SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
-+SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
-+SYS_JBIG2DEC_LIBS = -ljbig2dec
-+SYS_JPEG_LIBS = -ljpeg
-+SYS_ZLIB_LIBS = -lz
-+
- # Linux uses pkg-config for system libraries.
- else ifeq "$(OS)" "Linux"
- 
--- 
-2.2.2
-
-
-From 9a1e2d416be441c199f83239ec3fa0e336c4e0b6 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3deyes@gmail.com>
-Date: Tue, 31 Mar 2015 16:21:27 +0300
-Subject: gcc2 fixes
-
----
- include/mupdf/fitz/system.h |  6 ++++++
- scripts/cmapdump.c          | 14 ++++++++++++++
- 2 files changed, 20 insertions(+)
-
-diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h
-index 5df0c50..9e56bdb 100644
---- a/include/mupdf/fitz/system.h
-+++ b/include/mupdf/fitz/system.h
-@@ -61,6 +61,12 @@
- #define fz_jmp_buf jmp_buf
- #endif
- 
-+#ifdef __HAIKU__
-+#if __GNUC__ < 3
-+#define va_copy __va_copy
-+#endif
-+#endif
-+
- #ifdef _MSC_VER /* Microsoft Visual C */
- 
- /* MSVC up to VS2012 */
-diff --git a/scripts/cmapdump.c b/scripts/cmapdump.c
-index 3251c70..50b8893 100644
---- a/scripts/cmapdump.c
-+++ b/scripts/cmapdump.c
-@@ -19,6 +19,20 @@
- #include "../source/fitz/ftoa.c"
- #include "../source/fitz/printf.c"
- 
-+#ifdef __HAIKU__
-+#if __GNUC__ < 3
-+#include "../source/fitz/output.c"
-+
-+unsigned int
-+fz_pixmap_size(fz_context *ctx, fz_pixmap * pix)
-+{
-+    if (pix == NULL)
-+        return 0;
-+    return sizeof(*pix) + pix->n * pix->w * pix->h;
-+}
-+#endif
-+#endif
-+
- #include "../source/pdf/pdf-lex.c"
- #include "../source/pdf/pdf-cmap.c"
- #include "../source/pdf/pdf-cmap-parse.c"
--- 
-2.2.2
-
diff --git a/app-text/mupdf/patches/mupdf-1.8.patchset b/app-text/mupdf/patches/mupdf-1.8.patchset
deleted file mode 100644
index e2d4ed19b..000000000
--- a/app-text/mupdf/patches/mupdf-1.8.patchset
+++ /dev/null
@@ -1,203 +0,0 @@
-From c4398d806ff00d119fdc91faa7601dc9904145a5 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sun, 9 Apr 2017 23:23:17 +0000
-Subject: applying patch mupdf-1.8.patch
-
-
-diff --git a/Makefile b/Makefile
-index f6558cb..307b3b0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,7 +16,7 @@ include Makethird
- # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
- # set a variable that was set on the command line.
- CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN)
--LIBS += $(XLIBS) -lm
-+LIBS += $(XLIBS)
- 
- THIRD_LIBS += $(FREETYPE_LIB)
- THIRD_LIBS += $(JBIG2DEC_LIB)
-@@ -342,7 +342,17 @@ extra: $(CURL_LIB) $(GLFW_LIB)
- libs: $(INSTALL_LIBS)
- apps: $(INSTALL_APPS)
- 
--install: libs apps
-+install: install-libs apps
-+	install -d $(DESTDIR)$(bindir)
-+	install $(INSTALL_APPS) $(DESTDIR)$(bindir)
-+
-+	install -d $(DESTDIR)$(mandir)/man1
-+	install docs/man/*.1 $(DESTDIR)$(mandir)/man1
-+
-+	install -d $(DESTDIR)$(docdir)
-+	install README COPYING CHANGES docs/*.txt $(DESTDIR)$(docdir)
-+
-+install-libs: libs
- 	install -d $(DESTDIR)$(incdir)/mupdf
- 	install -d $(DESTDIR)$(incdir)/mupdf/fitz
- 	install -d $(DESTDIR)$(incdir)/mupdf/pdf
-@@ -353,14 +363,6 @@ install: libs apps
- 	install -d $(DESTDIR)$(libdir)
- 	install $(INSTALL_LIBS) $(DESTDIR)$(libdir)
- 
--	install -d $(DESTDIR)$(bindir)
--	install $(INSTALL_APPS) $(DESTDIR)$(bindir)
--
--	install -d $(DESTDIR)$(mandir)/man1
--	install docs/man/*.1 $(DESTDIR)$(mandir)/man1
--
--	install -d $(DESTDIR)$(docdir)
--	install README COPYING CHANGES docs/*.txt $(DESTDIR)$(docdir)
- 
- tarball:
- 	bash scripts/archive.sh
-diff --git a/Makerules b/Makerules
-index bb066dc..9082949 100644
---- a/Makerules
-+++ b/Makerules
-@@ -66,6 +66,27 @@ AR = xcrun ar
- LD = xcrun ld
- RANLIB_CMD = xcrun ranlib $@
- 
-+else ifeq "$(OS)" "Haiku"
-+
-+ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
-+SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto)
-+SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto)
-+endif
-+
-+ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
-+HAVE_CURL = yes
-+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
-+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
-+endif
-+
-+SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
-+SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
-+SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
-+SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
-+SYS_JBIG2DEC_LIBS = -ljbig2dec
-+SYS_JPEG_LIBS = -ljpeg
-+SYS_ZLIB_LIBS = -lz
-+
- # Linux uses pkg-config for system libraries.
- else ifeq "$(OS)" "Linux"
- 
-diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h
-index ca7c8dc..477d915 100644
---- a/include/mupdf/fitz/system.h
-+++ b/include/mupdf/fitz/system.h
-@@ -70,6 +70,12 @@
- #define fz_jmp_buf jmp_buf
- #endif
- 
-+#ifdef __HAIKU__
-+#if __GNUC__ < 3
-+#define va_copy __va_copy
-+#endif
-+#endif
-+
- #ifdef _MSC_VER /* Microsoft Visual C */
- 
- /* MSVC up to VS2012 */
-diff --git a/scripts/cmapdump.c b/scripts/cmapdump.c
-index ed4a411..317762c 100644
---- a/scripts/cmapdump.c
-+++ b/scripts/cmapdump.c
-@@ -22,6 +22,24 @@
- #include "../source/fitz/ftoa.c"
- #include "../source/fitz/printf.c"
- 
-+#ifdef __HAIKU__
-+#if __GNUC__ < 3
-+#include "../source/fitz/output.c"
-+
-+unsigned int
-+fz_pixmap_size(fz_context *ctx, fz_pixmap * pix)
-+{
-+    if (pix == NULL)
-+        return 0;
-+    return sizeof(*pix) + pix->n * pix->w * pix->h;
-+}
-+int pdf_objcmp_resolve(fz_context *ctx, pdf_obj *a, pdf_obj *b)
-+{
-+       return 0;
-+}
-+#endif
-+#endif
-+
- #include "../source/pdf/pdf-lex.c"
- #include "../source/pdf/pdf-cmap.c"
- #include "../source/pdf/pdf-cmap-parse.c"
--- 
-2.7.0
-
-
-From 110fc6940815dcef2a77376d1960a2be4ecf65f2 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sun, 9 Apr 2017 23:23:17 +0000
-Subject: applying patch mupdf-1.6-openjpeg21-1.patch
-
-
-diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
-index 6b92e5c..72dea50 100644
---- a/source/fitz/load-jpx.c
-+++ b/source/fitz/load-jpx.c
-@@ -1,13 +1,5 @@
- #include "mupdf/fitz.h"
- 
--/* Without the definition of OPJ_STATIC, compilation fails on windows
-- * due to the use of __stdcall. We believe it is required on some
-- * linux toolchains too. */
--#define OPJ_STATIC
--#ifndef _MSC_VER
--#define OPJ_HAVE_STDINT_H
--#endif
--
- #include <openjpeg.h>
- 
- static void fz_opj_error_callback(const char *msg, void *client_data)
-@@ -117,7 +109,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs
- 	opj_stream_set_read_function(stream, fz_opj_stream_read);
- 	opj_stream_set_skip_function(stream, fz_opj_stream_skip);
- 	opj_stream_set_seek_function(stream, fz_opj_stream_seek);
--	opj_stream_set_user_data(stream, &sb);
-+	opj_stream_set_user_data(stream, &sb, NULL);
- 	/* Set the length to avoid an assert */
- 	opj_stream_set_user_data_length(stream, size);
- 
--- 
-2.7.0
-
-
-From e7f428a65f21943a497a74fcba01d45bcf26fb23 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Mon, 10 Apr 2017 03:07:51 +0000
-Subject: Fix gcc2 detection
-
-
-diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h
-index 477d915..05781a4 100644
---- a/include/mupdf/fitz/system.h
-+++ b/include/mupdf/fitz/system.h
-@@ -207,7 +207,7 @@ typedef int fz_off_t;
- #endif
- 
- /* Flag unused parameters, for use with 'static inline' functions in headers. */
--#if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-+#if __GNUC__ > 2
- #define FZ_UNUSED __attribute__((__unused__))
- #else
- #define FZ_UNUSED
-@@ -215,7 +215,7 @@ typedef int fz_off_t;
- 
- /* GCC can do type checking of printf strings */
- #ifndef __printflike
--#if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-+#if __GNUC__ > 2
- #define __printflike(fmtarg, firstvararg) \
- 	__attribute__((__format__ (__printf__, fmtarg, firstvararg)))
- #else
--- 
-2.7.0
-