[Lunar-commits] <moonbase> mupdf: fix file conflict with poppler

[Duncan Gibson]

commit 108848b7f7e68fe06df2ab7e5080cdd48db8430d
Author: Paul Bredbury <brebs at sent.com>
Date:   Sun Nov 28 14:56:50 2010 +0100

    mupdf: fix file conflict with poppler
---
 zbeta/mupdf/BUILD   |    5 +++++
 zbeta/mupdf/DETAILS |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/zbeta/mupdf/BUILD b/zbeta/mupdf/BUILD
index df701ae..1a49b58 100644
--- a/zbeta/mupdf/BUILD
+++ b/zbeta/mupdf/BUILD
@@ -3,6 +3,11 @@
   opts="prefix=/usr build=release"  &&
 
   make $opts  &&
+
+  # /usr/bin/pdfinfo is provided by poppler
+  sedit "s:PDFINFO_EXE=\$(OBJDIR)/pdfinfo:PDFINFO_EXE=\$(OBJDIR)/pdfinfo-mupdf:" Makefile  &&
+  mv build/release/pdfinfo{,-mupdf}  &&
+
   prepare_install  &&
   make $opts install
 
diff --git a/zbeta/mupdf/DETAILS b/zbeta/mupdf/DETAILS
index c59aee1..bde6637 100644
--- a/zbeta/mupdf/DETAILS
+++ b/zbeta/mupdf/DETAILS
@@ -5,7 +5,7 @@
       SOURCE_VFY=sha1:3e97cefa9a65b770cc1be7584d6a5da9dc064d84
         WEB_SITE=http://mupdf.com/
          ENTERED=20101023
-         UPDATED=20101023
+         UPDATED=20101029
            SHORT="A lightweight PDF viewer and toolkit"
 
 cat << EOF