mupdf 1.3

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 2 insertions, 76 deletions

diff --git a/Library/Formula/mupdf.rb b/Library/Formula/mupdf.rb
index 02bfe8e61..e85f8bcd7 100644
--- a/Library/Formula/mupdf.rb
+++ b/Library/Formula/mupdf.rb
@@ -2,8 +2,8 @@ require 'formula'
 
 class Mupdf < Formula
   homepage 'http://mupdf.com'
-  url 'https://mupdf.googlecode.com/files/mupdf-1.2-source.zip'
-  sha1 'd521382b80b3d1f7b8ad6e00ceb91721aa5e1917'
+  url 'http://mupdf.googlecode.com/files/mupdf-1.3-source.tar.gz'
+  sha1 '082325aceb5565b07b82c2b6cc52a97533e03cf9'
 
   depends_on :macos => :snow_leopard
 
@@ -12,12 +12,6 @@ class Mupdf < Formula
   depends_on 'jbig2dec'
   depends_on :x11 # libpng, freetype and the X11 libs
 
-  # Fix up the Makefile so it doesn't mess with our CFLAGS.
-  # Install mutool (fixed in HEAD)
-  def patches
-    DATA
-  end
-
   def install
     openjpeg = Formula.factory 'openjpeg'
     ENV.append 'CPPFLAGS', "-I#{Dir[openjpeg.include/'openjpeg-*'].first}"
@@ -27,71 +21,3 @@ class Mupdf < Formula
     system "make", "install", "prefix=#{prefix}"
   end
 end
-
-__END__
-
-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/Makefile b/Makefile
-index 0371def..02dfdfe 100644
---- a/Makefile
-+++ b/Makefile
-@@ -212,7 +212,7 @@ install: $(FITZ_LIB) $(MUVIEW) $(MUDRAW) $(MUTOOL)
- 	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir) $(DESTDIR)$(mandir)/man1
- 	install $(FITZ_LIB) $(DESTDIR)$(libdir)
- 	install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(DESTDIR)$(incdir)
--	install $(MUVIEW) $(MUDRAW) $(MUBUSY) $(DESTDIR)$(bindir)
-+	install $(MUVIEW) $(MUDRAW) $(MUBUSY)  $(MUTOOL) $(DESTDIR)$(bindir)
- 	install $(wildcard apps/man/*.1) $(DESTDIR)$(mandir)/man1
- 
- # --- Clean and Default ---
-diff --git a/Makerules b/Makerules
-index 3e036f6..c9ddc69 100644
---- a/Makerules
-+++ b/Makerules
-@@ -5,24 +5,6 @@ OS := $(OS:MINGW%=MINGW)
- 
- CFLAGS += -Wall
- 
--ifeq "$(build)" "debug"
--CFLAGS += -pipe -g -DDEBUG
--else ifeq "$(build)" "profile"
--CFLAGS += -pipe -O2 -DNDEBUG -pg
--LDFLAGS += -pg
--else ifeq "$(build)" "release"
--CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
--else ifeq "$(build)" "coverage"
--CFLAGS += -pipe -g -DDEBUG -pg -fprofile-arcs -ftest-coverage
--LIBS += -lgcov
--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
--
- ifeq "$(OS)" "Linux"
- SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
- X11_LIBS := -lX11 -lXext
-@@ -36,18 +18,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
--LDFLAGS += -m64
--else
--CFLAGS += -m32
--LDFLAGS += -m32
--endif
- endif
- 
- # The following section is an example of how to simply do cross-compilation