Tue Mar 8 17:09:25 2011 UTC ()
update to 0.8
no changelog available, at least some security fixes were done:
-fix possible memory corruption due to malformed JPEG images
 (was patched in pkgsrc)
-fix (at least) 2 cases of integer overflow in array allocation (SA42320)


(drochner)
diff -r1.7 -r1.8 pkgsrc/print/mupdf/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/print/mupdf/buildlink3.mk
diff -r1.4 -r1.5 pkgsrc/print/mupdf/distinfo
diff -r1.1 -r1.2 pkgsrc/print/mupdf/patches/patch-ac
diff -r1.1 -r0 pkgsrc/print/mupdf/patches/patch-ad
diff -r0 -r1.1 pkgsrc/print/mupdf/patches/patch-ae
cvs diff -r1.7 -r1.8 pkgsrc/print/mupdf/Makefile (expand / switch to unified diff)

--- pkgsrc/print/mupdf/Makefile 2011/01/31 17:44:30 1.7
+++ pkgsrc/print/mupdf/Makefile 2011/03/08 17:09:25 1.8
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: Makefile,v 1.7 2011/01/31 17:44:30 drochner Exp $ 1# $NetBSD: Makefile,v 1.8 2011/03/08 17:09:25 drochner Exp $
2# 2#
3 3
4DISTNAME= mupdf-0.7 4DISTNAME= mupdf-0.8-source
5PKGREVISION= 1 5PKGNAME= mupdf-0.8
6CATEGORIES= print 6CATEGORIES= print
7MASTER_SITES= http://ccxvii.net/mupdf/download/ \ 7MASTER_SITES= http://ccxvii.net/mupdf/download/ \
8 http://ccxvii.net/mupdf/download/archive/ 8 http://ccxvii.net/mupdf/download/archive/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://ccxvii.net/mupdf/ 11HOMEPAGE= http://ccxvii.net/mupdf/
12COMMENT= Lightweight PDF viewer and toolkit 12COMMENT= Lightweight PDF viewer and toolkit
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
 15WRKSRC= ${WRKDIR}/mupdf-0.8
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17USE_TOOLS+= pkg-config gmake 18USE_TOOLS+= pkg-config gmake
18 19
19USE_LIBTOOL= yes 20USE_LIBTOOL= yes
20 21
21INSTALLATION_DIRS+= bin include lib/pkgconfig 22INSTALLATION_DIRS+= bin include lib/pkgconfig
22INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} 23INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
23LDFLAGS= -Wl,-rpath,${X11BASE}/lib 24LDFLAGS= -Wl,-rpath,${X11BASE}/lib
24MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} 25MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
25 26
26post-build: 27post-build:
27 sed -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc 28 sed -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc
cvs diff -r1.1.1.1 -r1.2 pkgsrc/print/mupdf/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/print/mupdf/buildlink3.mk 2010/02/18 10:07:32 1.1.1.1
+++ pkgsrc/print/mupdf/buildlink3.mk 2011/03/08 17:09:25 1.2
@@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/02/18 10:07:32 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2011/03/08 17:09:25 drochner Exp $
2 2
3BUILDLINK_TREE+= mupdf 3BUILDLINK_TREE+= mupdf
4 4
5.if !defined(MUPDF_BUILDLINK3_MK) 5.if !defined(MUPDF_BUILDLINK3_MK)
6MUPDF_BUILDLINK3_MK:= 6MUPDF_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.mupdf+= mupdf>=0.0.937 8BUILDLINK_API_DEPENDS.mupdf+= mupdf>=0.0.937
9BUILDLINK_PKGSRCDIR.mupdf?= ../../nih/mupdf 9BUILDLINK_PKGSRCDIR.mupdf?= ../../print/mupdf
10 10
11BUILDLINK_DEPMETHOD.mupdf?= build 
12.endif # MUPDF_BUILDLINK3_MK 11.endif # MUPDF_BUILDLINK3_MK
13 12
14BUILDLINK_TREE+= -mupdf 13BUILDLINK_TREE+= -mupdf
cvs diff -r1.4 -r1.5 pkgsrc/print/mupdf/distinfo (expand / switch to unified diff)

--- pkgsrc/print/mupdf/distinfo 2011/01/31 17:44:30 1.4
+++ pkgsrc/print/mupdf/distinfo 2011/03/08 17:09:25 1.5
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.4 2011/01/31 17:44:30 drochner Exp $ 1$NetBSD: distinfo,v 1.5 2011/03/08 17:09:25 drochner Exp $
2 2
3SHA1 (mupdf-0.7.tar.gz) = 3e97cefa9a65b770cc1be7584d6a5da9dc064d84 3SHA1 (mupdf-0.8-source.tar.gz) = bb3938226b422042f1880eba887501046653e618
4RMD160 (mupdf-0.7.tar.gz) = 82723652fb967be7665cfc55f4b2bb7c3ff55b69 4RMD160 (mupdf-0.8-source.tar.gz) = d4296e9d01a7719fa148181704aac9e1d90af4c3
5Size (mupdf-0.7.tar.gz) = 3557621 bytes 5Size (mupdf-0.8-source.tar.gz) = 3837000 bytes
6SHA1 (patch-ab) = ab4f0f5518dcc8e76ef2578f8c539b94e95d4f0a 6SHA1 (patch-ab) = ab4f0f5518dcc8e76ef2578f8c539b94e95d4f0a
7SHA1 (patch-ac) = 2c2b4a64b486e0b628e1a097c71f8e011daf85f5 7SHA1 (patch-ac) = 2c409e63bc9bf99428dba95afe4363bfe2467a11
8SHA1 (patch-ad) = 58aa0c2006e1222c4575a33ee276995cf02e6c5b 8SHA1 (patch-ae) = d4e5dcee67de682e38bf537d5b93948135af5dd7
cvs diff -r1.1 -r1.2 pkgsrc/print/mupdf/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-ac 2010/09/15 13:15:29 1.1
+++ pkgsrc/print/mupdf/patches/patch-ac 2011/03/08 17:09:25 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ac,v 1.1 2010/09/15 13:15:29 joerg Exp $ 1$NetBSD: patch-ac,v 1.2 2011/03/08 17:09:25 drochner Exp $
2 2
3--- Makefile.orig 2010-08-25 14:12:08.000000000 +0000 3--- Makefile.orig 2011-03-03 15:10:58.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -41,32 +41,21 @@ CFLAGS += $(THIRD_INCS) $(SYS_FREETYPE_I 5@@ -41,32 +41,21 @@ CFLAGS += $(THIRD_INCS) $(SYS_FREETYPE_I
6 # Build commands 6 # Build commands
7 # 7 #
8  8
9-ifneq "$(verbose)" "" 9-ifneq "$(verbose)" ""
10- 10-
11 GENFILE_CMD = $(firstword $^) $@ $(wordlist 2, 999, $^) 11 GENFILE_CMD = $(firstword $^) $@ $(wordlist 2, 999, $^)
12 CC_CMD = $(CC) -o $@ -c $< $(CFLAGS) 12 CC_CMD = $(CC) -o $@ -c $< $(CFLAGS)
13-LD_CMD = $(CC) -o $@ $^ $(LDFLAGS) $(LIBS) 13-LD_CMD = $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
14-AR_CMD = rm -f $@ && $(AR) cru $@ $^ 14-AR_CMD = rm -f $@ && $(AR) cru $@ $^
15- 15-
16-else 16-else
@@ -29,47 +29,47 @@ $NetBSD: patch-ac,v 1.1 2010/09/15 13:15 @@ -29,47 +29,47 @@ $NetBSD: patch-ac,v 1.1 2010/09/15 13:15
29 # 29 #
30  30
31 FONTDUMP_EXE := $(OBJDIR)/fontdump 31 FONTDUMP_EXE := $(OBJDIR)/fontdump
32-$(FONTDUMP_EXE): $(OBJDIR)/fontdump.o 32-$(FONTDUMP_EXE): $(OBJDIR)/fontdump.o
33+$(FONTDUMP_EXE): $(OBJDIR)/fontdump.lo 33+$(FONTDUMP_EXE): $(OBJDIR)/fontdump.lo
34 $(LD_CMD) 34 $(LD_CMD)
35  35
36 CMAPDUMP_EXE := $(OBJDIR)/cmapdump 36 CMAPDUMP_EXE := $(OBJDIR)/cmapdump
37-$(CMAPDUMP_EXE): $(OBJDIR)/cmapdump.o 37-$(CMAPDUMP_EXE): $(OBJDIR)/cmapdump.o
38+$(CMAPDUMP_EXE): $(OBJDIR)/cmapdump.lo 38+$(CMAPDUMP_EXE): $(OBJDIR)/cmapdump.lo
39 $(LD_CMD) 39 $(LD_CMD)
40  40
41 # 41 #
42@@ -112,7 +101,7 @@ FITZ_SRC := \ 42@@ -113,7 +102,7 @@ FITZ_SRC := \
43 fitz/stm_buffer.c \ 43 fitz/stm_buffer.c \
44 fitz/stm_open.c \ 44 fitz/stm_open.c \
45 fitz/stm_read.c 45 fitz/stm_read.c
46-FITZ_OBJ := $(FITZ_SRC:fitz/%.c=$(OBJDIR)/%.o) 46-FITZ_OBJ := $(FITZ_SRC:fitz/%.c=$(OBJDIR)/%.o)
47+FITZ_OBJ := $(FITZ_SRC:fitz/%.c=$(OBJDIR)/%.lo) 47+FITZ_OBJ := $(FITZ_SRC:fitz/%.c=$(OBJDIR)/%.lo)
48 $(FITZ_OBJ): $(FITZ_HDR) 48 $(FITZ_OBJ): $(FITZ_HDR)
49  49
50 DRAW_SRC := $(DRAW_ARCH_SRC) \ 50 DRAW_SRC := $(DRAW_ARCH_SRC) \
51@@ -128,8 +117,8 @@ DRAW_SRC := $(DRAW_ARCH_SRC) \ 51@@ -129,8 +118,8 @@ DRAW_SRC := $(DRAW_ARCH_SRC) \
52 draw/pathscan.c \ 52 draw/pathscan.c \
53 draw/pathstroke.c \ 53 draw/pathstroke.c \
54 draw/porterduff.c 54 draw/porterduff.c
55-DRAW_OBJ := $(DRAW_SRC:draw/%.c=$(OBJDIR)/%.o) 55-DRAW_OBJ := $(DRAW_SRC:draw/%.c=$(OBJDIR)/%.o)
56-DRAW_OBJ := $(DRAW_OBJ:draw/%.s=$(OBJDIR)/%.o) 56-DRAW_OBJ := $(DRAW_OBJ:draw/%.s=$(OBJDIR)/%.o)
57+DRAW_OBJ := $(DRAW_SRC:draw/%.c=$(OBJDIR)/%.lo) 57+DRAW_OBJ := $(DRAW_SRC:draw/%.c=$(OBJDIR)/%.lo)
58+DRAW_OBJ := $(DRAW_OBJ:draw/%.s=$(OBJDIR)/%.lo) 58+DRAW_OBJ := $(DRAW_OBJ:draw/%.s=$(OBJDIR)/%.lo)
59 $(DRAW_OBJ): $(FITZ_HDR) 59 $(DRAW_OBJ): $(FITZ_HDR)
60  60
61 MUPDF_HDR := $(FITZ_HDR) mupdf/mupdf.h 61 MUPDF_HDR := $(FITZ_HDR) mupdf/mupdf.h
62@@ -166,19 +155,19 @@ MUPDF_SRC := \ 62@@ -167,19 +156,19 @@ MUPDF_SRC := \
63 mupdf/pdf_unicode.c \ 63 mupdf/pdf_unicode.c \
64 mupdf/pdf_xobject.c \ 64 mupdf/pdf_xobject.c \
65 mupdf/pdf_xref.c 65 mupdf/pdf_xref.c
66-MUPDF_OBJ := $(MUPDF_SRC:mupdf/%.c=$(OBJDIR)/%.o) 66-MUPDF_OBJ := $(MUPDF_SRC:mupdf/%.c=$(OBJDIR)/%.o)
67+MUPDF_OBJ := $(MUPDF_SRC:mupdf/%.c=$(OBJDIR)/%.lo) 67+MUPDF_OBJ := $(MUPDF_SRC:mupdf/%.c=$(OBJDIR)/%.lo)
68 $(MUPDF_OBJ): $(MUPDF_HDR) 68 $(MUPDF_OBJ): $(MUPDF_HDR)
69  69
70-$(OBJDIR)/%.o: fitz/%.c 70-$(OBJDIR)/%.o: fitz/%.c
71- $(CC_CMD) 71- $(CC_CMD)
72-$(OBJDIR)/%.o: draw/%.c 72-$(OBJDIR)/%.o: draw/%.c
73- $(CC_CMD) 73- $(CC_CMD)
74-$(OBJDIR)/%.o: draw/%.s 74-$(OBJDIR)/%.o: draw/%.s
75- $(CC_CMD) 75- $(CC_CMD)
@@ -80,52 +80,52 @@ $NetBSD: patch-ac,v 1.1 2010/09/15 13:15 @@ -80,52 +80,52 @@ $NetBSD: patch-ac,v 1.1 2010/09/15 13:15
80+$(OBJDIR)/%.lo: fitz/%.c 80+$(OBJDIR)/%.lo: fitz/%.c
81+ libtool --mode=compile $(CC_CMD) 81+ libtool --mode=compile $(CC_CMD)
82+$(OBJDIR)/%.lo: draw/%.c 82+$(OBJDIR)/%.lo: draw/%.c
83+ libtool --mode=compile $(CC_CMD) 83+ libtool --mode=compile $(CC_CMD)
84+$(OBJDIR)/%.lo: draw/%.s 84+$(OBJDIR)/%.lo: draw/%.s
85+ libtool --mode=compile $(CC_CMD) 85+ libtool --mode=compile $(CC_CMD)
86+$(OBJDIR)/%.lo: mupdf/%.c 86+$(OBJDIR)/%.lo: mupdf/%.c
87+ libtool --mode=compile $(CC_CMD) 87+ libtool --mode=compile $(CC_CMD)
88+$(OBJDIR)/%.lo: $(GENDIR)/%.c 88+$(OBJDIR)/%.lo: $(GENDIR)/%.c
89+ libtool --mode=compile $(CC_CMD) 89+ libtool --mode=compile $(CC_CMD)
90  90
91 # 91 #
92 # Generated font file dumps 92 # Generated font file dumps
93@@ -217,7 +206,7 @@ FONT_SRC := \ 93@@ -218,7 +207,7 @@ FONT_SRC := \
94 $(GENDIR)/font_base14.c \ 94 $(GENDIR)/font_base14.c \
95 $(GENDIR)/font_cjk.c 95 $(GENDIR)/font_cjk.c
96  96
97-FONT_OBJ := $(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o) 97-FONT_OBJ := $(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o)
98+FONT_OBJ := $(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.lo) 98+FONT_OBJ := $(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.lo)
99  99
100  100
101 # 101 #
102@@ -287,13 +276,13 @@ CMAP_SRC := \ 102@@ -288,13 +277,13 @@ CMAP_SRC := \
103 $(GENDIR)/cmap_japan.c \ 103 $(GENDIR)/cmap_japan.c \
104 $(GENDIR)/cmap_korea.c 104 $(GENDIR)/cmap_korea.c
105  105
106-CMAP_OBJ := $(CMAP_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o) 106-CMAP_OBJ := $(CMAP_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o)
107+CMAP_OBJ := $(CMAP_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.lo) 107+CMAP_OBJ := $(CMAP_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.lo)
108  108
109 # 109 #
110 # Library 110 # Library
111 # 111 #
112  112
113-MUPDF_LIB = $(OBJDIR)/libmupdf.a 113-MUPDF_LIB = $(OBJDIR)/libmupdf.a
114+MUPDF_LIB = $(OBJDIR)/libmupdf.la 114+MUPDF_LIB = $(OBJDIR)/libmupdf.la
115 $(MUPDF_LIB): $(FITZ_OBJ) $(DRAW_OBJ) $(MUPDF_OBJ) $(CMAP_OBJ) $(FONT_OBJ) 115 $(MUPDF_LIB): $(FITZ_OBJ) $(DRAW_OBJ) $(MUPDF_OBJ) $(CMAP_OBJ) $(FONT_OBJ)
116 $(AR_CMD) 116 $(AR_CMD)
117  117
118@@ -303,40 +292,40 @@ $(MUPDF_LIB): $(FITZ_OBJ) $(DRAW_OBJ) $( 118@@ -304,40 +293,40 @@ $(MUPDF_LIB): $(FITZ_OBJ) $(DRAW_OBJ) $(
119  119
120 APPS = $(PDFSHOW_EXE) $(PDFCLEAN_EXE) $(PDFDRAW_EXE) $(PDFEXTRACT_EXE) $(PDFINFO_EXE) $(PDFVIEW_EXE) 120 APPS = $(PDFSHOW_EXE) $(PDFCLEAN_EXE) $(PDFDRAW_EXE) $(PDFEXTRACT_EXE) $(PDFINFO_EXE) $(PDFVIEW_EXE)
121  121
122-$(OBJDIR)/%.o: apps/%.c 122-$(OBJDIR)/%.o: apps/%.c
123- $(CC_CMD) 123- $(CC_CMD)
124+$(OBJDIR)/%.lo: apps/%.c 124+$(OBJDIR)/%.lo: apps/%.c
125+ libtool --mode=compile $(CC_CMD) 125+ libtool --mode=compile $(CC_CMD)
126  126
127 PDFSHOW_SRC=apps/pdfshow.c 127 PDFSHOW_SRC=apps/pdfshow.c
128-PDFSHOW_OBJ=$(PDFSHOW_SRC:apps/%.c=$(OBJDIR)/%.o) 128-PDFSHOW_OBJ=$(PDFSHOW_SRC:apps/%.c=$(OBJDIR)/%.o)
129+PDFSHOW_OBJ=$(PDFSHOW_SRC:apps/%.c=$(OBJDIR)/%.lo) 129+PDFSHOW_OBJ=$(PDFSHOW_SRC:apps/%.c=$(OBJDIR)/%.lo)
130 PDFSHOW_EXE=$(OBJDIR)/pdfshow 130 PDFSHOW_EXE=$(OBJDIR)/pdfshow
131 $(PDFSHOW_OBJ): $(MUPDF_HDR) 131 $(PDFSHOW_OBJ): $(MUPDF_HDR)
@@ -154,43 +154,43 @@ $NetBSD: patch-ac,v 1.1 2010/09/15 13:15 @@ -154,43 +154,43 @@ $NetBSD: patch-ac,v 1.1 2010/09/15 13:15
154 PDFEXTRACT_EXE=$(OBJDIR)/pdfextract 154 PDFEXTRACT_EXE=$(OBJDIR)/pdfextract
155 $(PDFEXTRACT_OBJ): $(MUPDF_HDR) 155 $(PDFEXTRACT_OBJ): $(MUPDF_HDR)
156 $(PDFEXTRACT_EXE): $(PDFEXTRACT_OBJ) $(MUPDF_LIB) $(THIRD_LIBS) 156 $(PDFEXTRACT_EXE): $(PDFEXTRACT_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
157 $(LD_CMD) 157 $(LD_CMD)
158  158
159 PDFINFO_SRC=apps/pdfinfo.c 159 PDFINFO_SRC=apps/pdfinfo.c
160-PDFINFO_OBJ=$(PDFINFO_SRC:apps/%.c=$(OBJDIR)/%.o) 160-PDFINFO_OBJ=$(PDFINFO_SRC:apps/%.c=$(OBJDIR)/%.o)
161-PDFINFO_EXE=$(OBJDIR)/pdfinfo 161-PDFINFO_EXE=$(OBJDIR)/pdfinfo
162+PDFINFO_OBJ=$(PDFINFO_SRC:apps/%.c=$(OBJDIR)/%.lo) 162+PDFINFO_OBJ=$(PDFINFO_SRC:apps/%.c=$(OBJDIR)/%.lo)
163+PDFINFO_EXE=$(OBJDIR)/mupdf-pdfinfo 163+PDFINFO_EXE=$(OBJDIR)/mupdf-pdfinfo
164 $(PDFINFO_OBJ): $(MUPDF_HDR) 164 $(PDFINFO_OBJ): $(MUPDF_HDR)
165 $(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_LIB) $(THIRD_LIBS) 165 $(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
166 $(LD_CMD) 166 $(LD_CMD)
167@@ -344,7 +333,7 @@ $(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_L 167@@ -345,7 +334,7 @@ $(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_L
168 PDFAPP_HDR = apps/pdfapp.h 168 PDFAPP_HDR = apps/pdfapp.h
169  169
170 X11VIEW_SRC=apps/x11_main.c apps/x11_image.c apps/pdfapp.c 170 X11VIEW_SRC=apps/x11_main.c apps/x11_image.c apps/pdfapp.c
171-X11VIEW_OBJ=$(X11VIEW_SRC:apps/%.c=$(OBJDIR)/%.o) 171-X11VIEW_OBJ=$(X11VIEW_SRC:apps/%.c=$(OBJDIR)/%.o)
172+X11VIEW_OBJ=$(X11VIEW_SRC:apps/%.c=$(OBJDIR)/%.lo) 172+X11VIEW_OBJ=$(X11VIEW_SRC:apps/%.c=$(OBJDIR)/%.lo)
173 X11VIEW_EXE=$(OBJDIR)/mupdf 173 X11VIEW_EXE=$(OBJDIR)/mupdf
174  174
175 $(X11VIEW_OBJ): $(MUPDF_HDR) $(PDFAPP_HDR) 175 $(X11VIEW_OBJ): $(MUPDF_HDR) $(PDFAPP_HDR)
176@@ -353,7 +342,7 @@ $(X11VIEW_EXE): $(X11VIEW_OBJ) $(MUPDF_L 176@@ -354,7 +343,7 @@ $(X11VIEW_EXE): $(X11VIEW_OBJ) $(MUPDF_L
177  177
178 WINVIEW_SRC=apps/win_main.c apps/pdfapp.c 178 WINVIEW_SRC=apps/win_main.c apps/pdfapp.c
179 WINVIEW_RES=apps/win_res.rc 179 WINVIEW_RES=apps/win_res.rc
180-WINVIEW_OBJ=$(WINVIEW_SRC:apps/%.c=$(OBJDIR)/%.o) $(WINVIEW_RES:apps/%.rc=$(OBJDIR)/%.o) 180-WINVIEW_OBJ=$(WINVIEW_SRC:apps/%.c=$(OBJDIR)/%.o) $(WINVIEW_RES:apps/%.rc=$(OBJDIR)/%.o)
181+WINVIEW_OBJ=$(WINVIEW_SRC:apps/%.c=$(OBJDIR)/%.lo) $(WINVIEW_RES:apps/%.rc=$(OBJDIR)/%.lo) 181+WINVIEW_OBJ=$(WINVIEW_SRC:apps/%.c=$(OBJDIR)/%.lo) $(WINVIEW_RES:apps/%.rc=$(OBJDIR)/%.lo)
182 WINVIEW_EXE=$(OBJDIR)/mupdf.exe 182 WINVIEW_EXE=$(OBJDIR)/mupdf.exe
183  183
184 $(OBJDIR)/%.o: apps/%.rc 184 $(OBJDIR)/%.o: apps/%.rc
185@@ -378,7 +367,7 @@ nuke: 185@@ -383,7 +372,7 @@ LIBDIR ?= $(prefix)/lib
186 rm -rf build 186 INCDIR ?= $(prefix)/include
187  187
188 install: $(OBJDIR) $(GENDIR) $(MUPDF_LIB) $(APPS) 188 install: $(OBJDIR) $(GENDIR) $(MUPDF_LIB) $(APPS)
189- install -d $(prefix)/bin $(prefix)/lib $(prefix)/include 189- install -d $(BINDIR) $(LIBDIR) $(INCDIR)
190- install $(APPS) $(prefix)/bin 190- install $(APPS) $(BINDIR)
191- install $(MUPDF_LIB) $(prefix)/lib 191- install $(MUPDF_LIB) $(LIBDIR)
192- install $(MUPDF_HDR) $(prefix)/include 192- install $(MUPDF_HDR) $(INCDIR)
193+ mkdir -p $(prefix)/bin $(prefix)/lib $(prefix)/include 193+ mkdir -p $(BINDIR) $(LIBDIR) $(INCDIR)
194+ libtool --mode=install ${BSD_INSTALL_PROGRAM} $(APPS) $(prefix)/bin 194+ libtool --mode=install ${BSD_INSTALL_PROGRAM} $(APPS) $(BINDIR)
195+ libtool --mode=install ${BSD_INSTALL_LIB} $(MUPDF_LIB) $(prefix)/lib 195+ libtool --mode=install ${BSD_INSTALL_LIB} $(MUPDF_LIB) $(LIBDIR)
196+ ${BSD_INSTALL_DATA} $(MUPDF_HDR) $(prefix)/include 196+ ${BSD_INSTALL_DATA} $(MUPDF_HDR) $(INCDIR)
File Deleted: pkgsrc/print/mupdf/patches/Attic/patch-ad
File Added: pkgsrc/print/mupdf/patches/patch-ae
$NetBSD: patch-ae,v 1.1 2011/03/08 17:09:25 drochner Exp $

avoid namespace conflict on NetBSD

--- fitz/crypt_sha2.c.orig	2011-03-08 16:13:19.000000000 +0000
+++ fitz/crypt_sha2.c
@@ -15,7 +15,7 @@ static inline int isbigendian(void)
 	return *(char*)&one == 0;
 }
 
-static inline unsigned int bswap32(unsigned int num)
+static inline unsigned int mup_bswap32(unsigned int num)
 {
 	if (!isbigendian())
 	{
@@ -86,7 +86,7 @@ transform(unsigned int state[8], const u
 
 	/* ensure big-endian integers */
 	for (j = 0; j < 16; j++)
-		data[j] = bswap32(data_xe[j]);
+		data[j] = mup_bswap32(data_xe[j]);
 
 	/* Copy state[] to working vars. */
 	memcpy(T, state, sizeof(T));
@@ -172,11 +172,11 @@ void fz_sha256final(fz_sha256 *context, 
 	context->count[1] = (context->count[1] << 3) + (context->count[0] >> 29);
 	context->count[0] = context->count[0] << 3;
 
-	context->buffer.u32[14] = bswap32(context->count[1]);
-	context->buffer.u32[15] = bswap32(context->count[0]);
+	context->buffer.u32[14] = mup_bswap32(context->count[1]);
+	context->buffer.u32[15] = mup_bswap32(context->count[0]);
 	transform(context->state, context->buffer.u32);
 
 	for (j = 0; j < 8; j++)
-		((unsigned int *)digest)[j] = bswap32(context->state[j]);
+		((unsigned int *)digest)[j] = mup_bswap32(context->state[j]);
 	memset(context, 0, sizeof(fz_sha256));
 }