[150671] trunk/dports/graphics/mupdf

[devans at macports.org]

Revision: 150671
          https://trac.macports.org/changeset/150671
Author:   devans at macports.org
Date:     2016-07-26 08:27:14 -0700 (Tue, 26 Jul 2016)
Log Message:
-----------
mupdf: maintainer update to version 1.9a (#51912).

Modified Paths:
--------------
    trunk/dports/graphics/mupdf/Portfile

Added Paths:
-----------
    trunk/dports/graphics/mupdf/files/
    trunk/dports/graphics/mupdf/files/patch-Makerules.diff

Modified: trunk/dports/graphics/mupdf/Portfile
===================================================================
--- trunk/dports/graphics/mupdf/Portfile	2016-07-26 13:18:42 UTC (rev 150670)
+++ trunk/dports/graphics/mupdf/Portfile	2016-07-26 15:27:14 UTC (rev 150671)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                mupdf
-version             1.8
+version             1.9a
 categories          graphics
 platforms           darwin
 maintainers         gmail.com:starkhalo openmaintainer
@@ -31,13 +31,13 @@
 master_sites        ${homepage}downloads/
 distname            ${name}-${version}-source
 
-checksums           rmd160  2708f5650f23101a66cef92b7903aafb716f9c02 \
-                    sha256  a2a3c64d8b24920f87cf4ea9339a25abf7388496440f13b37482d1403c33c206
+checksums           rmd160  0cb0d098c603b16be217e42299052a928d95c3fc \
+                    sha256  8015c55f4e6dd892d3c50db4f395c1e46660a10b460e2ecd180a497f55bbc4cc
 
 depends_build       port:pkgconfig
 
 depends_lib         port:freetype \
-                    port:glfw \
+                    port:harfbuzz \
                     port:jbig2dec \
                     port:jpeg \
                     port:mesa \
@@ -47,52 +47,40 @@
                     port:xorg-libXrandr \
                     port:zlib
 
+patchfiles          patch-Makerules.diff
+
 use_configure       no
 
 variant universal   {}
 
-# When not using the bundled copies, we have to tell mupdf's build system where
-# to find the headers
-configure.cflags-append \
-                    -I${prefix}/include/freetype2
-
 build.args          PREFIX=${prefix}
 build.args-append   CC=${configure.cc} \
                     CXX=${configure.cxx} \
-                    CPP=${configure.cpp}
-
-build.env           CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
-                    LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
+                    CPP=${configure.cpp} \
+                    XCFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+                    XLIBS="${configure.ldflags} [get_canonical_archflags ld]" \
                     build=release \
                     verbose=yes
 
-eval destroot.env   ${build.env}
-
 destroot.destdir    prefix=${destroot}${prefix}
 
+variant glfw description {OpenGL viewer} {
+    build.args-append   HAVE_GLFW=yes
+}
+
 post-extract {
+# delete thirdparty software other than mujs and openjpeg
     delete ${worksrcpath}/thirdparty/curl
     delete ${worksrcpath}/thirdparty/freetype
-    delete ${worksrcpath}/thirdparty/glfw
+    delete ${worksrcpath}/thirdparty/harfbuzz
     delete ${worksrcpath}/thirdparty/jbig2dec
     delete ${worksrcpath}/thirdparty/jpeg
-    # Got compile errors with openjpeg-2.1 and openjpeg-1.5
-    #delete ${worksrcpath}/thirdparty/openjpeg
     delete ${worksrcpath}/thirdparty/zlib
+    if {![variant_isset glfw]} {
+        delete ${worksrcpath}/thirdparty/glfw
+    }
 }
 
-post-destroot {
-# mupdf has its own javascript interpreter which is maintained in a separate
-# repository (git://git.ghostscript.com/mujs.git) but shipped with the source
-# code as a third-party library. Since there hasn't been a versioned release of
-# it yet and `mujs' is developed especially for mupdf it will be installed via
-# post-destroot.
-    set libdir ${destroot}${prefix}/lib
-    xinstall -m 644 -W ${worksrcpath} \
-        build/release/libmujs.a \
-        ${libdir}
-}
-
 # https://trac.macports.org/ticket/33240
 # Mac OS X Tiger has an old version of `make`, needs to use GNU make
 platform darwin 8 {

Added: trunk/dports/graphics/mupdf/files/patch-Makerules.diff
===================================================================
--- trunk/dports/graphics/mupdf/files/patch-Makerules.diff	                        (rev 0)
+++ trunk/dports/graphics/mupdf/files/patch-Makerules.diff	2016-07-26 15:27:14 UTC (rev 150671)
@@ -0,0 +1,33 @@
+--- Makerules.orig	2016-07-25 12:09:24.000000000 -0500
++++ Makerules	2016-07-25 11:58:29.000000000 -0500
+@@ -65,20 +65,22 @@
+ 
+ SYS_CURL_DEPS = -lpthread
+ 
+-SYS_X11_CFLAGS = -I/usr/X11R6/include
+-SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext
++SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
++SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
+ 
+-SYS_FREETYPE_CFLAGS = $(shell freetype-config --cflags)
+-SYS_FREETYPE_LIBS = $(shell freetype-config --libs)
++SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
++SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
+ SYS_OPENJPEG_LIBS = -lopenjpeg
++SYS_HARFBUZZ_CFLAGS = $(shell pkg-config --cflags harfbuzz)
++SYS_HARFBUZZ_LIBS = $(shell pkg-config --libs harfbuzz)
+ SYS_JBIG2DEC_LIBS = -ljbig2dec
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz
+ 
+-CC = xcrun cc
+-AR = xcrun ar
+-LD = xcrun ld
+-RANLIB_CMD = xcrun ranlib $@
++CC = cc
++AR = ar
++LD = ld
++RANLIB_CMD = ranlib $@
+ 
+ # Linux uses pkg-config for system libraries.
+ else ifeq "$(OS)" "Linux"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160726/158b65c9/attachment-0001.html>