update to 0.9

changes:
-xps support
-speedup, rendering improvements
-cleanup, bugfixes

6 files changed, 155 insertions, 211 deletions

diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile
index 7fef189cd85..6febea6cd3f 100644
--- a/print/mupdf/Makefile
+++ b/print/mupdf/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2011/11/01 06:02:26 sbd Exp $
+# $NetBSD: Makefile,v 1.11 2012/03/24 13:31:58 drochner Exp $
 #
 
-DISTNAME=	mupdf-0.8-source
-PKGNAME=	mupdf-0.8
-PKGREVISION=	1
+DISTNAME=	mupdf-0.9-source
+PKGNAME=	mupdf-0.9
 CATEGORIES=	print
 MASTER_SITES=	http://ccxvii.net/mupdf/download/ \
 		http://ccxvii.net/mupdf/download/archive/
@@ -13,7 +12,7 @@ HOMEPAGE=	http://mupdf.com/
 COMMENT=	Lightweight PDF viewer and toolkit
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=		${WRKDIR}/mupdf-0.8
+WRKSRC=		${WRKDIR}/mupdf-0.9
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	pkg-config gmake
@@ -25,6 +24,9 @@ INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
 LDFLAGS=	-Wl,-rpath,${X11BASE}/lib
 MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
 
+pre-build:
+	${MV} ${WRKSRC}/apps/pdfinfo.c ${WRKSRC}/apps/mupdf-pdfinfo.c
+
 post-build:
 	sed -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc
 
diff --git a/print/mupdf/PLIST b/print/mupdf/PLIST
index 2064f45e82c..d5ac3f9c114 100644
--- a/print/mupdf/PLIST
+++ b/print/mupdf/PLIST
@@ -1,11 +1,19 @@
-@comment $NetBSD: PLIST,v 1.2 2010/09/15 13:15:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/03/24 13:31:58 drochner Exp $
 bin/mupdf
+bin/mupdf-pdfinfo
 bin/pdfclean
 bin/pdfdraw
 bin/pdfextract
-bin/mupdf-pdfinfo
 bin/pdfshow
+bin/xpsdraw
 include/fitz.h
 include/mupdf.h
+include/muxps.h
+lib/libfitz.la
 lib/libmupdf.la
+lib/libmuxps.la
 lib/pkgconfig/mupdf.pc
+man/man1/mupdf.1
+man/man1/pdfclean.1
+man/man1/pdfdraw.1
+man/man1/pdfshow.1
diff --git a/print/mupdf/distinfo b/print/mupdf/distinfo
index 75fbeed413d..5803a0de0c1 100644
--- a/print/mupdf/distinfo
+++ b/print/mupdf/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2011/03/08 17:09:25 drochner Exp $
+$NetBSD: distinfo,v 1.6 2012/03/24 13:31:58 drochner Exp $
 
-SHA1 (mupdf-0.8-source.tar.gz) = bb3938226b422042f1880eba887501046653e618
-RMD160 (mupdf-0.8-source.tar.gz) = d4296e9d01a7719fa148181704aac9e1d90af4c3
-Size (mupdf-0.8-source.tar.gz) = 3837000 bytes
-SHA1 (patch-ab) = ab4f0f5518dcc8e76ef2578f8c539b94e95d4f0a
-SHA1 (patch-ac) = 2c409e63bc9bf99428dba95afe4363bfe2467a11
+SHA1 (mupdf-0.9-source.tar.gz) = 3a3ba42d19e3211199110e7c782263241cdea8a0
+RMD160 (mupdf-0.9-source.tar.gz) = 9ba1df205f9f95c7ff4b0a3be224786ad5a65d99
+Size (mupdf-0.9-source.tar.gz) = 3917075 bytes
+SHA1 (patch-ab) = 0c296311e6273ed9542e2758f4891a4a2d42a383
+SHA1 (patch-ac) = 4197e032f084acf09eed21a17e311712afa6cc68
 SHA1 (patch-ae) = d4e5dcee67de682e38bf537d5b93948135af5dd7
diff --git a/print/mupdf/files/mupdf.pc b/print/mupdf/files/mupdf.pc
index 573483243a2..dc52696739c 100644
--- a/print/mupdf/files/mupdf.pc
+++ b/print/mupdf/files/mupdf.pc
@@ -5,6 +5,6 @@ includedir=${prefix}/include
 
 Name: mupdf
 Description: library for PDF files
-Version: 0.7
+Version: 0.9
 Libs: -Wl,-R${libdir} -L${libdir} -lmupdf
 Cflags: -I${includedir}
diff --git a/print/mupdf/patches/patch-ab b/print/mupdf/patches/patch-ab
index e2a2c775be5..a8f5105921a 100644
--- a/print/mupdf/patches/patch-ab
+++ b/print/mupdf/patches/patch-ab
@@ -1,22 +1,20 @@
-$NetBSD: patch-ab,v 1.1 2010/09/15 13:15:29 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2012/03/24 13:31:58 drochner Exp $
 
---- Makerules.orig	2010-08-25 14:12:08.000000000 +0000
+--- Makerules.orig	2011-09-05 11:55:39.000000000 +0000
 +++ Makerules
-@@ -19,39 +19,6 @@ ifeq "$(build)" "native"
- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -march=native -mfpmath=sse
+@@ -18,31 +18,8 @@ else
+ $(error unknown build setting: '$(build)')
  endif
  
 -ifeq "$(OS)" "Linux"
  SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
- X11LIBS := -lX11 -lXext
- PDFVIEW_EXE = $(X11VIEW_EXE)
+ X11_LIBS := -lX11 -lXext
 -endif
 -
 -ifeq "$(OS)" "FreeBSD"
 -SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
 -LDFLAGS += -L/usr/local/lib
--X11LIBS := -lX11 -lXext
--PDFVIEW_EXE = $(X11VIEW_EXE)
+-X11_LIBS := -lX11 -lXext
 -endif
 -
 -# Mac OS X build depends on some thirdparty libs
@@ -24,8 +22,7 @@ $NetBSD: patch-ab,v 1.1 2010/09/15 13:15:29 joerg Exp $
 -SYS_FREETYPE_INC := -I/usr/X11R6/include/freetype2
 -CFLAGS += -I/usr/X11R6/include
 -LDFLAGS += -L/usr/X11R6/lib
--X11LIBS := -lX11 -lXext
--PDFVIEW_EXE = $(X11VIEW_EXE)
+-X11_LIBS := -lX11 -lXext
 -ifeq "$(arch)" "amd64"
 -CFLAGS += -m64
 -LDFLAGS += -m64
@@ -34,11 +31,6 @@ $NetBSD: patch-ab,v 1.1 2010/09/15 13:15:29 joerg Exp $
 -LDFLAGS += -m32
 -endif
 -endif
--
--# MinGW build depends on thirdparty libs
--ifeq "$(OS)" "MINGW"
--WINDRES ?= windres
--W32LIBS := -lgdi32 -lcomdlg32 -luser32 -ladvapi32 -lshell32 -mwindows
--PDFVIEW_EXE = $(WINVIEW_EXE)
--endif
--
+ 
+ # The following section is an example of how to simply do cross-compilation
+ # using these Makefiles. It builds for a beagleboard running ARM linux,
diff --git a/print/mupdf/patches/patch-ac b/print/mupdf/patches/patch-ac
index 200414ba85a..3978bc59013 100644
--- a/print/mupdf/patches/patch-ac
+++ b/print/mupdf/patches/patch-ac
@@ -1,196 +1,138 @@
-$NetBSD: patch-ac,v 1.2 2011/03/08 17:09:25 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2012/03/24 13:31:58 drochner Exp $
 
---- Makefile.orig	2011-03-03 15:10:58.000000000 +0000
+--- Makefile.orig	2011-09-05 11:55:39.000000000 +0000
 +++ Makefile
-@@ -41,32 +41,21 @@ CFLAGS += $(THIRD_INCS) $(SYS_FREETYPE_I
- # Build commands
- #
- 
--ifneq "$(verbose)" ""
--
- GENFILE_CMD = $(firstword $^) $@ $(wordlist 2, 999, $^)
- CC_CMD = $(CC) -o $@ -c $< $(CFLAGS)
--LD_CMD = $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
--AR_CMD = rm -f $@ && $(AR) cru $@ $^
--
--else
--
--GENFILE_CMD = @ echo GENFILE $@ && $(firstword $^) $@ $(wordlist 2, 999, $^)
--CC_CMD = @ echo CC $@ && $(CC) -o $@ -c $< $(CFLAGS)
--LD_CMD = @ echo LD $@ && $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
--AR_CMD = @ echo AR $@ && rm -f $@ && $(AR) cru $@ $^
--
+@@ -21,17 +21,9 @@ THIRD_LIBS += $(JPEG_LIB)
+ THIRD_LIBS += $(OPENJPEG_LIB)
+ THIRD_LIBS += $(ZLIB_LIB)
+ 
+-ifeq "$(verbose)" ""
+-QUIET_AR = @ echo ' ' ' ' AR $@ ;
+-QUIET_CC = @ echo ' ' ' ' CC $@ ;
+-QUIET_GEN = @ echo ' ' ' ' GEN $@ ;
+-QUIET_LINK = @ echo ' ' ' ' LINK $@ ;
+-QUIET_MKDIR = @ echo ' ' ' ' MKDIR $@ ;
 -endif
-+LD_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
+-
+ CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $<
+-AR_CMD = $(QUIET_AR) $(AR) cru $@ $^
+-LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 +AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^
++LINK_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
+ MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
  
- #
- # Code generation tools
- #
- 
- FONTDUMP_EXE := $(OBJDIR)/fontdump
--$(FONTDUMP_EXE): $(OBJDIR)/fontdump.o
-+$(FONTDUMP_EXE): $(OBJDIR)/fontdump.lo
- 	$(LD_CMD)
- 
- CMAPDUMP_EXE := $(OBJDIR)/cmapdump
--$(CMAPDUMP_EXE): $(OBJDIR)/cmapdump.o
-+$(CMAPDUMP_EXE): $(OBJDIR)/cmapdump.lo
- 	$(LD_CMD)
- 
- #
-@@ -113,7 +102,7 @@ FITZ_SRC := \
- 	fitz/stm_buffer.c \
- 	fitz/stm_open.c \
- 	fitz/stm_read.c
--FITZ_OBJ := $(FITZ_SRC:fitz/%.c=$(OBJDIR)/%.o)
-+FITZ_OBJ := $(FITZ_SRC:fitz/%.c=$(OBJDIR)/%.lo)
- $(FITZ_OBJ): $(FITZ_HDR)
- 
- DRAW_SRC := $(DRAW_ARCH_SRC) \
-@@ -129,8 +118,8 @@ DRAW_SRC := $(DRAW_ARCH_SRC) \
- 	draw/pathscan.c \
- 	draw/pathstroke.c \
- 	draw/porterduff.c
--DRAW_OBJ := $(DRAW_SRC:draw/%.c=$(OBJDIR)/%.o)
--DRAW_OBJ := $(DRAW_OBJ:draw/%.s=$(OBJDIR)/%.o)
-+DRAW_OBJ := $(DRAW_SRC:draw/%.c=$(OBJDIR)/%.lo)
-+DRAW_OBJ := $(DRAW_OBJ:draw/%.s=$(OBJDIR)/%.lo)
- $(DRAW_OBJ): $(FITZ_HDR)
- 
- MUPDF_HDR := $(FITZ_HDR) mupdf/mupdf.h
-@@ -167,19 +156,19 @@ MUPDF_SRC := \
- 	mupdf/pdf_unicode.c \
- 	mupdf/pdf_xobject.c \
- 	mupdf/pdf_xref.c
--MUPDF_OBJ := $(MUPDF_SRC:mupdf/%.c=$(OBJDIR)/%.o)
-+MUPDF_OBJ := $(MUPDF_SRC:mupdf/%.c=$(OBJDIR)/%.lo)
- $(MUPDF_OBJ): $(MUPDF_HDR)
- 
--$(OBJDIR)/%.o: fitz/%.c
+ # --- Rules ---
+@@ -39,40 +31,40 @@ MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
+ $(OUT) $(GEN) :
+ 	$(MKDIR_CMD)
+ 
+-$(OUT)/%.a :
++$(OUT)/%.la :
+ 	$(AR_CMD)
+ 
+-$(OUT)/% : $(OUT)/%.o
++$(OUT)/% : $(OUT)/%.lo
+ 	$(LINK_CMD)
+ 
+-$(OUT)/%.o : fitz/%.c fitz/fitz.h | $(OUT)
 -	$(CC_CMD)
--$(OBJDIR)/%.o: draw/%.c
+-$(OUT)/%.o : draw/%.c fitz/fitz.h | $(OUT)
 -	$(CC_CMD)
--$(OBJDIR)/%.o: draw/%.s
+-$(OUT)/%.o : pdf/%.c fitz/fitz.h pdf/mupdf.h | $(OUT)
 -	$(CC_CMD)
--$(OBJDIR)/%.o: mupdf/%.c
+-$(OUT)/%.o : xps/%.c fitz/fitz.h xps/muxps.h | $(OUT)
 -	$(CC_CMD)
--$(OBJDIR)/%.o: $(GENDIR)/%.c
+-$(OUT)/%.o : apps/%.c fitz/fitz.h pdf/mupdf.h xps/muxps.h | $(OUT)
 -	$(CC_CMD)
-+$(OBJDIR)/%.lo: fitz/%.c
+-$(OUT)/%.o : scripts/%.c | $(OUT)
+-	$(CC_CMD)
++$(OUT)/%.lo : fitz/%.c fitz/fitz.h | $(OUT)
 +	libtool --mode=compile $(CC_CMD)
-+$(OBJDIR)/%.lo: draw/%.c
++$(OUT)/%.lo : draw/%.c fitz/fitz.h | $(OUT)
 +	libtool --mode=compile $(CC_CMD)
-+$(OBJDIR)/%.lo: draw/%.s
++$(OUT)/%.lo : pdf/%.c fitz/fitz.h pdf/mupdf.h | $(OUT)
 +	libtool --mode=compile $(CC_CMD)
-+$(OBJDIR)/%.lo: mupdf/%.c
++$(OUT)/%.lo : xps/%.c fitz/fitz.h xps/muxps.h | $(OUT)
 +	libtool --mode=compile $(CC_CMD)
-+$(OBJDIR)/%.lo: $(GENDIR)/%.c
++$(OUT)/%.lo : apps/%.c fitz/fitz.h pdf/mupdf.h xps/muxps.h | $(OUT)
 +	libtool --mode=compile $(CC_CMD)
- 
- #
- # Generated font file dumps
-@@ -218,7 +207,7 @@ FONT_SRC := \
- 	$(GENDIR)/font_base14.c \
- 	$(GENDIR)/font_cjk.c
- 
--FONT_OBJ := $(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o)
-+FONT_OBJ := $(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.lo)
- 
- 
- #
-@@ -288,13 +277,13 @@ CMAP_SRC := \
- 	$(GENDIR)/cmap_japan.c \
- 	$(GENDIR)/cmap_korea.c
- 
--CMAP_OBJ := $(CMAP_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o)
-+CMAP_OBJ := $(CMAP_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.lo)
- 
- #
- # Library
- #
- 
--MUPDF_LIB = $(OBJDIR)/libmupdf.a
-+MUPDF_LIB = $(OBJDIR)/libmupdf.la
- $(MUPDF_LIB): $(FITZ_OBJ) $(DRAW_OBJ) $(MUPDF_OBJ) $(CMAP_OBJ) $(FONT_OBJ)
- 	 $(AR_CMD)
- 
-@@ -304,40 +293,40 @@ $(MUPDF_LIB): $(FITZ_OBJ) $(DRAW_OBJ) $(
- 
- APPS = $(PDFSHOW_EXE) $(PDFCLEAN_EXE) $(PDFDRAW_EXE) $(PDFEXTRACT_EXE) $(PDFINFO_EXE) $(PDFVIEW_EXE)
- 
--$(OBJDIR)/%.o: apps/%.c
--	$(CC_CMD)
-+$(OBJDIR)/%.lo: apps/%.c
++$(OUT)/%.lo : scripts/%.c | $(OUT)
 +	libtool --mode=compile $(CC_CMD)
  
- PDFSHOW_SRC=apps/pdfshow.c
--PDFSHOW_OBJ=$(PDFSHOW_SRC:apps/%.c=$(OBJDIR)/%.o)
-+PDFSHOW_OBJ=$(PDFSHOW_SRC:apps/%.c=$(OBJDIR)/%.lo)
- PDFSHOW_EXE=$(OBJDIR)/pdfshow
- $(PDFSHOW_OBJ): $(MUPDF_HDR)
- $(PDFSHOW_EXE): $(PDFSHOW_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
- 	$(LD_CMD)
- 
- PDFCLEAN_SRC=apps/pdfclean.c
--PDFCLEAN_OBJ=$(PDFCLEAN_SRC:apps/%.c=$(OBJDIR)/%.o)
-+PDFCLEAN_OBJ=$(PDFCLEAN_SRC:apps/%.c=$(OBJDIR)/%.lo)
- PDFCLEAN_EXE=$(OBJDIR)/pdfclean
- $(PDFCLEAN_OBJ): $(MUPDF_HDR)
- $(PDFCLEAN_EXE): $(PDFCLEAN_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
- 	$(LD_CMD)
- 
- PDFDRAW_SRC=apps/pdfdraw.c
--PDFDRAW_OBJ=$(PDFDRAW_SRC:apps/%.c=$(OBJDIR)/%.o)
-+PDFDRAW_OBJ=$(PDFDRAW_SRC:apps/%.c=$(OBJDIR)/%.lo)
- PDFDRAW_EXE=$(OBJDIR)/pdfdraw
- $(PDFDRAW_OBJ): $(MUPDF_HDR)
- $(PDFDRAW_EXE): $(PDFDRAW_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
- 	$(LD_CMD)
- 
- PDFEXTRACT_SRC=apps/pdfextract.c
--PDFEXTRACT_OBJ=$(PDFEXTRACT_SRC:apps/%.c=$(OBJDIR)/%.o)
-+PDFEXTRACT_OBJ=$(PDFEXTRACT_SRC:apps/%.c=$(OBJDIR)/%.lo)
- PDFEXTRACT_EXE=$(OBJDIR)/pdfextract
- $(PDFEXTRACT_OBJ): $(MUPDF_HDR)
- $(PDFEXTRACT_EXE): $(PDFEXTRACT_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
- 	$(LD_CMD)
- 
- PDFINFO_SRC=apps/pdfinfo.c
--PDFINFO_OBJ=$(PDFINFO_SRC:apps/%.c=$(OBJDIR)/%.o)
--PDFINFO_EXE=$(OBJDIR)/pdfinfo
-+PDFINFO_OBJ=$(PDFINFO_SRC:apps/%.c=$(OBJDIR)/%.lo)
-+PDFINFO_EXE=$(OBJDIR)/mupdf-pdfinfo
- $(PDFINFO_OBJ): $(MUPDF_HDR)
- $(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
- 	$(LD_CMD)
-@@ -345,7 +334,7 @@ $(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_L
- PDFAPP_HDR = apps/pdfapp.h
- 
- X11VIEW_SRC=apps/x11_main.c apps/x11_image.c apps/pdfapp.c
--X11VIEW_OBJ=$(X11VIEW_SRC:apps/%.c=$(OBJDIR)/%.o)
-+X11VIEW_OBJ=$(X11VIEW_SRC:apps/%.c=$(OBJDIR)/%.lo)
- X11VIEW_EXE=$(OBJDIR)/mupdf
- 
- $(X11VIEW_OBJ): $(MUPDF_HDR) $(PDFAPP_HDR)
-@@ -354,7 +343,7 @@ $(X11VIEW_EXE): $(X11VIEW_OBJ) $(MUPDF_L
- 
- WINVIEW_SRC=apps/win_main.c apps/pdfapp.c
- WINVIEW_RES=apps/win_res.rc
--WINVIEW_OBJ=$(WINVIEW_SRC:apps/%.c=$(OBJDIR)/%.o) $(WINVIEW_RES:apps/%.rc=$(OBJDIR)/%.o)
-+WINVIEW_OBJ=$(WINVIEW_SRC:apps/%.c=$(OBJDIR)/%.lo) $(WINVIEW_RES:apps/%.rc=$(OBJDIR)/%.lo)
- WINVIEW_EXE=$(OBJDIR)/mupdf.exe
- 
- $(OBJDIR)/%.o: apps/%.rc
-@@ -383,7 +372,7 @@ LIBDIR ?= $(prefix)/lib
- INCDIR ?= $(prefix)/include
- 
- install: $(OBJDIR) $(GENDIR) $(MUPDF_LIB) $(APPS)
--	install -d $(BINDIR) $(LIBDIR) $(INCDIR)
--	install $(APPS) $(BINDIR)
--	install $(MUPDF_LIB) $(LIBDIR)
--	install $(MUPDF_HDR) $(INCDIR)
-+	mkdir -p $(BINDIR) $(LIBDIR) $(INCDIR)
-+	libtool --mode=install ${BSD_INSTALL_PROGRAM} $(APPS) $(BINDIR)
-+	libtool --mode=install ${BSD_INSTALL_LIB} $(MUPDF_LIB) $(LIBDIR)
-+	${BSD_INSTALL_DATA} $(MUPDF_HDR) $(INCDIR)
+-.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
++.PRECIOUS : $(OUT)/%.lo # Keep intermediates from chained rules
+ 
+ # --- Fitz, MuPDF and MuXPS libraries ---
+ 
+-FITZ_LIB := $(OUT)/libfitz.a
+-MUPDF_LIB := $(OUT)/libmupdf.a
+-MUXPS_LIB := $(OUT)/libmuxps.a
++FITZ_LIB := $(OUT)/libfitz.la
++MUPDF_LIB := $(OUT)/libmupdf.la
++MUXPS_LIB := $(OUT)/libmuxps.la
+ 
+ FITZ_SRC := $(notdir $(wildcard fitz/*.c draw/*.c))
+ MUPDF_SRC := $(notdir $(wildcard pdf/*.c))
+ MUXPS_SRC := $(notdir $(wildcard xps/*.c))
+ 
+-$(FITZ_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.o))
+-$(MUPDF_LIB) : $(addprefix $(OUT)/, $(MUPDF_SRC:%.c=%.o))
+-$(MUXPS_LIB) : $(addprefix $(OUT)/, $(MUXPS_SRC:%.c=%.o))
++$(FITZ_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.lo))
++$(MUPDF_LIB) : $(addprefix $(OUT)/, $(MUPDF_SRC:%.c=%.lo))
++$(MUXPS_LIB) : $(addprefix $(OUT)/, $(MUXPS_SRC:%.c=%.lo))
+ 
+ libs: $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
+ 	@ echo MuPDF/XPS and underlying libraries built
+@@ -116,13 +108,13 @@ endif
+ 
+ generate: $(CMAP_HDR) $(FONT_HDR)
+ 
+-$(OUT)/pdf_cmap_table.o : $(CMAP_HDR)
+-$(OUT)/pdf_fontfile.o : $(FONT_HDR)
+-$(OUT)/cmapdump.o : pdf/pdf_cmap.c pdf/pdf_cmap_parse.c
++$(OUT)/pdf_cmap_table.lo : $(CMAP_HDR)
++$(OUT)/pdf_fontfile.lo : $(FONT_HDR)
++$(OUT)/cmapdump.lo : pdf/pdf_cmap.c pdf/pdf_cmap_parse.c
+ 
+ # --- Tools and Apps ---
+ 
+-PDF_APPS := $(addprefix $(OUT)/, pdfdraw pdfclean pdfextract pdfinfo pdfshow)
++PDF_APPS := $(addprefix $(OUT)/, pdfdraw pdfclean pdfextract mupdf-pdfinfo pdfshow)
+ XPS_APPS := $(addprefix $(OUT)/, xpsdraw)
+ 
+ $(PDF_APPS) : $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
+@@ -131,7 +123,7 @@ $(XPS_APPS) : $(MUXPS_LIB) $(FITZ_LIB) $
+ MUPDF := $(OUT)/mupdf
+ $(MUPDF) : $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
+ ifeq "$(NOX11)" ""
+-$(MUPDF) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
++$(MUPDF) : $(addprefix $(OUT)/, x11_main.lo x11_image.lo pdfapp.lo)
+ 	$(LINK_CMD) $(X11_LIBS)
+ endif
+ 
+@@ -141,14 +133,18 @@ prefix ?= /usr/local
+ bindir ?= $(prefix)/bin
+ libdir ?= $(prefix)/lib
+ incdir ?= $(prefix)/include
+-mandir ?= $(prefix)/share/man
++mandir ?= $(prefix)/man
+ 
+ install: $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(PDF_APPS) $(XPS_APPS) $(MUPDF)
+-	install -d $(bindir) $(libdir) $(incdir) $(mandir)/man1
+-	install $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(libdir)
+-	install fitz/fitz.h pdf/mupdf.h xps/muxps.h $(incdir)
+-	install $(PDF_APPS) $(XPS_APPS) $(MUPDF) $(bindir)
+-	install $(wildcard apps/man/*.1) $(mandir)/man1
++	${BSD_INSTALL_DATA_DIR} $(bindir) $(libdir) $(incdir) $(mandir)/man1
++	for f in $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB); do \
++	 libtool --mode=install ${BSD_INSTALL_LIB} $$f $(libdir); \
++	done
++	${BSD_INSTALL_DATA} fitz/fitz.h pdf/mupdf.h xps/muxps.h $(incdir)
++	for f in $(PDF_APPS) $(XPS_APPS) $(MUPDF); do \
++	 libtool --mode=install ${BSD_INSTALL_PROGRAM} $$f $(bindir); \
++	done
++	${BSD_INSTALL_DATA} $(wildcard apps/man/*.1) $(mandir)/man1
+ 
+ # --- Clean and Default ---
+