MuPDF: Update to 1.0

Make requirement on Snow Leopard or newer fatal.

Remove code that prefixes command line tools with `mu` as this has been done
upstream.

1 files changed, 13 insertions, 19 deletions

diff --git a/Library/Formula/mupdf.rb b/Library/Formula/mupdf.rb
index 71e0c46ce..881cc0948 100644
--- a/Library/Formula/mupdf.rb
+++ b/Library/Formula/mupdf.rb
@@ -5,6 +5,10 @@ class NeedsSnowLeopard < Requirement
     MACOS_VERSION >= 10.6
   end
 
+  def fatal?
+    true
+  end
+
   def message; <<-EOS.undent
     The version of Freetype that comes with Leopard is too old to build MuPDF
     against. It is possible to get MuPDF working on Leopard using the Freetype
@@ -17,8 +21,8 @@ end
 
 class Mupdf < Formula
   homepage 'http://mupdf.com'
-  url 'http://mupdf.googlecode.com/files/mupdf-0.9-source.tar.gz'
-  md5 '76640ee16a797a27fe49cc0eaa87ce3a'
+  url 'http://mupdf.googlecode.com/files/mupdf-1.0-source.tar.gz'
+  md5 'd986ab98e2b035b7abd61afc474562b3'
 
   depends_on NeedsSnowLeopard.new
 
@@ -34,19 +38,6 @@ class Mupdf < Formula
   def install
     ENV.x11 # For LibPNG and Freetype
     system "make", "install", "prefix=#{prefix}"
-
-    # MuPDF comes with some handy command-line tools. However, their names can
-    # clash with other tools installed by formulae such as Poppler. So, we
-    # add a `mu` prefix to every binary that starts with `pdf`.
-    bin.entries.select{ |b| b.basename.to_s.match /^pdf/ }.each do |p|
-      mv bin + p, bin + ('mu' + p.basename.to_s)
-    end
-  end
-
-  def caveats; <<-EOS.undent
-    All MuPDF command line tools have been prefixed with `mu` to prevent name
-    clashes with other PDF packages.
-    EOS
   end
 end
 
@@ -56,15 +47,15 @@ Remove some Makefile rules that Homebrew takes care of through CFLAGS and
 LDFLAGS. MuPDF doesn't look at CPPFLAGS, so we piggyback it onto CFLAGS.
 
 diff --git a/Makerules b/Makerules
-index 63a75d6..077fcf5 100644
+index 26eab3c..46e8dc9 100644
 --- a/Makerules
 +++ b/Makerules
-@@ -5,19 +5,6 @@ OS := $(OS:MINGW%=MINGW)
+@@ -5,21 +5,6 @@ OS := $(OS:MINGW%=MINGW)
  
  CFLAGS += -Wall
  
 -ifeq "$(build)" "debug"
--CFLAGS += -pipe -g
+-CFLAGS += -pipe -g -DDEBUG
 -else ifeq "$(build)" "profile"
 -CFLAGS += -pipe -O2 -DNDEBUG -pg
 -LDFLAGS += -pg
@@ -72,6 +63,8 @@ index 63a75d6..077fcf5 100644
 -CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
 -else ifeq "$(build)" "native"
 -CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -march=native -mfpmath=sse
+-else ifeq "$(build)" "memento"
+-CFLAGS += -pipe -g -DMEMENTO -DDEBUG
 -else
 -$(error unknown build setting: '$(build)')
 -endif
@@ -79,13 +72,14 @@ index 63a75d6..077fcf5 100644
  ifeq "$(OS)" "Linux"
  SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
  X11_LIBS := -lX11 -lXext
-@@ -32,16 +19,8 @@ endif
+@@ -34,17 +19,9 @@ endif
  # Mac OS X build depends on some thirdparty libs
  ifeq "$(OS)" "Darwin"
  SYS_FREETYPE_INC := -I/usr/X11R6/include/freetype2
 -CFLAGS += -I/usr/X11R6/include
 -LDFLAGS += -L/usr/X11R6/lib
 +CFLAGS += $(CPPFLAGS)
+ RANLIB_CMD = ranlib $@
  X11_LIBS := -lX11 -lXext
 -ifeq "$(arch)" "amd64"
 -CFLAGS += -m64