[120197] trunk/dports/graphics/mupdf

[ryandesign at macports.org]

Revision: 120197
          https://trac.macports.org/changeset/120197
Author:   ryandesign at macports.org
Date:     2014-05-18 21:32:45 -0700 (Sun, 18 May 2014)
Log Message:
-----------
mupdf: fix build on Tiger again (#43614); re-enable verbose building

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

Modified: trunk/dports/graphics/mupdf/Portfile
===================================================================
--- trunk/dports/graphics/mupdf/Portfile	2014-05-19 03:27:20 UTC (rev 120196)
+++ trunk/dports/graphics/mupdf/Portfile	2014-05-19 04:32:45 UTC (rev 120197)
@@ -34,8 +34,6 @@
 checksums           rmd160 368140a0f825483268faaf778328bc6c3f4d461f \
                     sha256 018bab9520b5e93bb33ab07b0472fdf9f768c5801769f95b9a696941b633ec22
 
-use_configure       no
-
 depends_build       port:pkgconfig
 
 depends_lib         port:freetype \
@@ -45,16 +43,33 @@
                     port:xorg-libXext \
                     port:zlib
 
+patchfiles          patch-Makerules.diff
+
+use_configure       no
+
+variant universal   {}
+
 build.args          PREFIX=${prefix}
 build.args-append   CC=${configure.cc} \
                     CXX=${configure.cxx} \
                     CPP=${configure.cpp}
-build.env           build=release \
-                    HAVE_CURL=no \
-                    verbose=1
 
+build.env           CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+                    LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
+                    build=release \
+                    verbose=yes
+
+eval destroot.env   ${build.env}
+
 destroot.destdir    prefix=${destroot}${prefix}
 
+# https://trac.macports.org/ticket/33240
+# Mac OS X Tiger has an old version of `make`, needs to use GNU make
+platform darwin 8 {
+    depends_build-append port:gmake
+    build.cmd ${prefix}/bin/gmake
+} 
+
 livecheck.type      regex
 livecheck.url       ${master_sites}
 livecheck.regex     ${name}-(\\d\\.\\d)-source

Modified: trunk/dports/graphics/mupdf/files/patch-Makerules.diff
===================================================================
--- trunk/dports/graphics/mupdf/files/patch-Makerules.diff	2014-05-19 03:27:20 UTC (rev 120196)
+++ trunk/dports/graphics/mupdf/files/patch-Makerules.diff	2014-05-19 04:32:45 UTC (rev 120197)
@@ -1,28 +1,25 @@
---- Makerules	2014-05-07 14:06:40.000000000 -0500
-+++ /Users/harciga/dev/ports/graphics/mupdf/work/mupdf-1.4-source/Makerules	2014-04-11 10:10:41.000000000 -0500
-@@ -14,7 +14,6 @@
+--- /opt/local/var/macports/build/_Users_harciga_dev_ports_graphics_mupdf/mupdf/work/mupdf-1.4-source/Makerules	2014-04-11 10:10:41.000000000 -0500
++++ Makerules	2014-05-12 13:10:56.000000000 -0500
+@@ -14,6 +14,7 @@
  LDFLAGS += -pg
  else ifeq "$(build)" "release"
  CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
--LDFLAGS += -fPIC
++LDFLAGS += -fPIC -fno-common
  else ifeq "$(build)" "coverage"
  CFLAGS += -pipe -g -DDEBUG -pg -fprofile-arcs -ftest-coverage
  LIBS += -lgcov
-@@ -30,7 +29,7 @@
- ifeq "$(OS)" "MINGW"
+@@ -48,10 +49,10 @@
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz
  
- # Mac OS X doesn't have pkg-config so we hard code paths.
--else ifeq "$(OS)" "SKIP"
-+else ifeq "$(OS)" "MACOS"
+-CC = xcrun cc
+-AR = xcrun ar
+-LD = xcrun ld
+-RANLIB_CMD = xcrun ranlib $@
++CC = cc
++AR = ar
++LD = ld
++RANLIB_CMD = ranlib $@
  
- HAVE_X11 ?= yes
- 
-@@ -55,7 +54,7 @@
- RANLIB_CMD = xcrun ranlib $@
- 
  # Linux uses pkg-config for system libraries.
--else ifeq (,$(filter $(OS), "Linux MACOS"))
-+else ifeq "$(OS)" "Linux"
- 
- HAVE_X11 ?= yes
- 
+ else ifeq "$(OS)" "Linux"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140518/519eef8a/attachment.html>