<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3fe01521ffb469cc80cf99189a15c4eb5b567053">https://github.com/macports/macports-ports/commit/3fe01521ffb469cc80cf99189a15c4eb5b567053</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3fe0152 mupdf: update to 1.11
</span>3fe0152 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3fe01521ffb469cc80cf99189a15c4eb5b567053
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Fri Aug 25 00:03:18 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> mupdf: update to 1.11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add patch to install mupdf-x11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/54113
</span>---
graphics/mupdf/Portfile | 10 +++++---
graphics/mupdf/files/patch-Makefile.diff | 20 +++++++++++++++
graphics/mupdf/files/patch-Makerules.diff | 41 ++++++++++++++++---------------
3 files changed, 47 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mupdf/Portfile b/graphics/mupdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 64bf520..8ae290e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mupdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mupdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name mupdf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.9a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.11
</span> categories graphics
platforms darwin
maintainers gmail.com:starkhalo openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,8 +30,8 @@ homepage http://www.mupdf.com/
</span> master_sites ${homepage}downloads/
distname ${name}-${version}-source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0cb0d098c603b16be217e42299052a928d95c3fc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8015c55f4e6dd892d3c50db4f395c1e46660a10b460e2ecd180a497f55bbc4cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 573307473a1ac81aca4519b0e57a7111aae7803f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,8 @@ depends_lib port:freetype \
</span> port:xorg-libXrandr \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makerules.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makerules.diff
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +59,7 @@ build.args-append CC=${configure.cc} \
</span> CPP=${configure.cpp} \
XCFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
XLIBS="${configure.ldflags} [get_canonical_archflags ld]" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_X11="yes" \
</span> build=release \
verbose=yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mupdf/files/patch-Makefile.diff b/graphics/mupdf/files/patch-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0c4ff9c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mupdf/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# There is something wrong in the Makefile such that mupdf-x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# does not get installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile 2017-04-05 07:02:21.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2017-08-24 23:53:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -342,7 +342,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MUJSTEST_EXE) : $(MUJSTEST_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LINK_CMD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq "$(HAVE_X11)" "yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MUVIEW_X11_EXE := $(OUT)/mupdf-x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -356,7 +355,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MUVIEW_X11_CURL_EXE) : $(MUVIEW_X11_CURL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq "$(HAVE_GLFW)" "yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MUVIEW_GLFW_EXE := $(OUT)/mupdf-gl
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mupdf/files/patch-Makerules.diff b/graphics/mupdf/files/patch-Makerules.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2215f9f..d88675a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mupdf/files/patch-Makerules.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mupdf/files/patch-Makerules.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +1,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makerules.orig 2016-07-25 12:09:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makerules 2016-07-25 11:58:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,20 +65,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makerules 2017-04-05 07:02:21.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makerules 2017-08-24 22:46:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,20 +94,22 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SYS_CURL_DEPS = -lpthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYS_CURL_DEPS := -lpthread
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--SYS_X11_CFLAGS = -I/usr/X11R6/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SYS_X11_CFLAGS := -I/usr/X11R6/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SYS_X11_LIBS := -L/usr/X11R6/lib -lX11 -lXext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SYS_X11_LIBS := $(shell pkg-config --libs x11 xext)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--SYS_FREETYPE_CFLAGS = $(shell freetype-config --cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SYS_FREETYPE_LIBS = $(shell freetype-config --libs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SYS_OPENJPEG_LIBS = -lopenjpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SYS_FREETYPE_CFLAGS := $(shell freetype-config --cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SYS_FREETYPE_LIBS := $(shell freetype-config --libs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SYS_OPENJPEG_LIBS := -lopenjpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SYS_OPENJPEG_LIBS = -lopenjpeg
</span> +SYS_HARFBUZZ_CFLAGS = $(shell pkg-config --cflags harfbuzz)
+SYS_HARFBUZZ_LIBS = $(shell pkg-config --libs harfbuzz)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SYS_JBIG2DEC_LIBS = -ljbig2dec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SYS_JPEG_LIBS = -ljpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SYS_ZLIB_LIBS = -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYS_JBIG2DEC_LIBS := -ljbig2dec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYS_LIBJPEG_LIBS := -ljpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYS_ZLIB_LIBS := -lz
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--CC = xcrun cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AR = xcrun ar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LD = xcrun ld
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--RANLIB_CMD = xcrun ranlib $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC := xcrun cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AR := xcrun ar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LD := xcrun ld
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-RANLIB_CMD := xcrun ranlib $@
</span> +CC = cc
+AR = ar
+LD = ld
</pre><pre style='margin:0'>
</pre>