--- /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/Makefile	(revision 431432)
+++ /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/Makefile	(working copy)
@@ -2,8 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	zathura-pdf-mupdf
-PORTVERSION=	0.3.0
-PORTREVISION=	3
+PORTVERSION=	0.3.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://pwmt.org/projects/zathura-pdf-mupdf/download/
 
@@ -17,6 +16,8 @@ 
 		mupdf>=1.8,1:graphics/mupdf
 RUN_DEPENDS=	zathura:graphics/zathura
 LIB_DEPENDS=	libjbig2dec.so:graphics/jbig2dec \
+		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
 		libopenjp2.so:graphics/openjpeg \
 		libgirara-gtk3.so:x11-toolkits/girara
 
--- /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/distinfo	(revision 431432)
+++ /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/distinfo	(working copy)
@@ -1,2 +1,3 @@ 
-SHA256 (zathura-pdf-mupdf-0.3.0.tar.gz) = 478cb9d1562d08e096ebec4a6db9116d616a3536260197c2a28a2772171f72c8
-SIZE (zathura-pdf-mupdf-0.3.0.tar.gz) = 9914
+TIMESTAMP = 1484394361
+SHA256 (zathura-pdf-mupdf-0.3.1.tar.gz) = d9b9edc0297b9eddb53020976f287b4e8db33edef8cfa047d70e02653eb2f81b
+SIZE (zathura-pdf-mupdf-0.3.1.tar.gz) = 9755
--- /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/files/patch-document.c	(revision 431432)
+++ /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/files/patch-document.c	(nonexistent)
@@ -1,13 +0,0 @@ 
---- document.c.orig	2016-02-14 22:49:46 UTC
-+++ document.c
-@@ -113,8 +113,8 @@ pdf_document_save_as(zathura_document_t*
-      * pdf_write_document does not check if the third arguments is NULL for some
-      * options. */
- 
--    fz_write_options opts = { 0 }; /* just use the default options */
--    fz_write_document(mupdf_document->ctx, mupdf_document->document, (char*) path, &opts);
-+    pdf_write_options opts = { 0 }; /* just use the default options */
-+    pdf_save_document(mupdf_document->ctx, mupdf_document->document, (char*) path, &opts);
-   } fz_catch (mupdf_document->ctx) {
-     return ZATHURA_ERROR_UNKNOWN;
-   }
--- /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/files/patch-image.c	(revision 431432)
+++ /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/files/patch-image.c	(nonexistent)
@@ -1,11 +0,0 @@ 
---- image.c.orig	2016-06-25 17:52:28 UTC
-+++ image.c
-@@ -93,7 +93,7 @@ pdf_page_image_get_cairo(zathura_page_t*
-   fz_pixmap* pixmap = NULL;
-   cairo_surface_t* surface = NULL;
- 
--  pixmap = fz_new_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0);
-+  pixmap = fz_get_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0);
-   if (pixmap == NULL) {
-     goto error_free;
-   }
--- /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/files/patch-page.c	(revision 431432)
+++ /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/files/patch-page.c	(nonexistent)
@@ -1,31 +0,0 @@ 
---- page.c.orig	2016-06-25 17:39:19 UTC
-+++ page.c
-@@ -43,12 +43,12 @@ pdf_page_init(zathura_page_t* page)
-   /* setup text */
-   mupdf_page->extracted_text = false;
- 
--  mupdf_page->text = fz_new_text_page(mupdf_page->ctx);
-+  mupdf_page->text = fz_new_stext_page(mupdf_page->ctx);
-   if (mupdf_page->text == NULL) {
-     goto error_free;
-   }
- 
--  mupdf_page->sheet = fz_new_text_sheet(mupdf_page->ctx);
-+  mupdf_page->sheet = fz_new_stext_sheet(mupdf_page->ctx);
-   if (mupdf_page->sheet == NULL) {
-     goto error_free;
-   }
-@@ -74,11 +74,11 @@ pdf_page_clear(zathura_page_t* page, mup
- 
-   if (mupdf_page != NULL) {
-     if (mupdf_page->text != NULL) {
--      fz_drop_text_page(mupdf_page->ctx, mupdf_page->text);
-+      fz_drop_stext_page(mupdf_page->ctx, mupdf_page->text);
-     }
- 
-     if (mupdf_page->sheet != NULL) {
--      fz_drop_text_sheet(mupdf_page->ctx, mupdf_page->sheet);
-+      fz_drop_stext_sheet(mupdf_page->ctx, mupdf_page->sheet);
-     }
- 
-     if (mupdf_page->page != NULL) {
--- /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/files/patch-plugin.h	(revision 431432)
+++ /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/files/patch-plugin.h	(nonexistent)
@@ -1,13 +0,0 @@ 
---- plugin.h.orig	2016-02-14 22:49:46 UTC
-+++ plugin.h
-@@ -21,8 +21,8 @@ typedef struct mupdf_page_s
- {
-   fz_page* page; /**< Reference to the mupdf page */
-   fz_context* ctx; /**< Context */
--  fz_text_sheet* sheet; /**< Text sheet */
--  fz_text_page* text; /**< Page text */
-+  fz_stext_sheet* sheet; /**< Text sheet */
-+  fz_stext_page* text; /**< Page text */
-   fz_rect bbox; /**< Bbox */
-   bool extracted_text; /**< If text has already been extracted */
- } mupdf_page_t;
--- /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/files/patch-search.c	(revision 431432)
+++ /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/files/patch-search.c	(nonexistent)
@@ -1,11 +0,0 @@ 
---- search.c.orig	2016-06-25 17:42:12 UTC
-+++ search.c
-@@ -40,7 +40,7 @@ pdf_page_search_text(zathura_page_t* pag
-   }
- 
-   fz_rect* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, sizeof(fz_rect));
--  int num_results = fz_search_text_page(mupdf_page->ctx, mupdf_page->text,
-+  int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
-       (char*) text, hit_bbox, N_SEARCH_RESULTS);
- 
-   for (int i = 0; i < num_results; i++) {
--- /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/files/patch-utils.c	(revision 431432)
+++ /usr/local/poudriere/ports/default/graphics/zathura-pdf-mupdf/files/patch-utils.c	(nonexistent)
@@ -1,11 +0,0 @@ 
---- utils.c.orig	2016-06-25 17:44:43 UTC
-+++ utils.c
-@@ -14,7 +14,7 @@ mupdf_page_extract_text(mupdf_document_t
-   fz_device* text_device = NULL;
- 
-   fz_try (mupdf_page->ctx) {
--    text_device = fz_new_text_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text);
-+    text_device = fz_new_stext_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text);
- 
-     /* Disable FZ_IGNORE_IMAGE to collect image blocks */
-     fz_disable_device_hints(mupdf_page->ctx, text_device, FZ_IGNORE_IMAGE);