Wed Apr 27 12:34:58 2016 UTC ()
Update print/mupdf to 1.9a.

pkgsrc changes:
 o Update MASTER_SITES (archive/ subdirectory contains all the distfiles,
   latest stable version and also older ones)
 o Bump BUILDLINK_A[BP]I_DEPENDS.mupdf to 1.9a due to several API and ABI
   changes

Changes:
MuPDF 1.9a (2016-04-26)
-----------------------
Version 1.9a is a bug fix release. If you run into issues with selecting or
searching for text with ligatures, you should upgrade from 1.9.

MuPDF 1.9 (2016-04-18)
-----------------------
The 1.9 release is here!

Headline changes:

  * New command line tools: create and run.
  * New low-level Java interface for desktop and android.
  * Bidirectional layout for Arabic and Hebrew scripts.
  * Shaping complex scripts for EPUB text layout.
  * Noto fallback fonts for EPUB layout.

mutool create:

  * Create new PDF files from scratch.
  * Read an annotated content stream in a text file and write a PDF file,
    automatically embedding font and image resources.

mutool run:

  * Run javascript scripts with MuPDF bindings.
  * The interface is similar to the new Java interface.

mutool draw:

  * Optional multi-threaded operation (Windows and pthreads).
  * Optional low memory mode (primarily for testing).


(leot)
diff -r1.35 -r1.36 pkgsrc/print/mupdf/Makefile
diff -r1.11 -r1.12 pkgsrc/print/mupdf/PLIST
diff -r1.10 -r1.11 pkgsrc/print/mupdf/buildlink3.mk
diff -r1.23 -r1.24 pkgsrc/print/mupdf/distinfo
diff -r1.8 -r1.9 pkgsrc/print/mupdf/files/mupdf.pc
diff -r1.5 -r1.6 pkgsrc/print/mupdf/patches/patch-Makethird
diff -r1.11 -r1.12 pkgsrc/print/mupdf/patches/patch-ab
diff -r1.13 -r1.14 pkgsrc/print/mupdf/patches/patch-ac
diff -r0 -r1.1 pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile
cvs diff -r1.35 -r1.36 pkgsrc/print/mupdf/Makefile (expand / switch to unified diff)

--- pkgsrc/print/mupdf/Makefile 2016/03/05 11:27:54 1.35
+++ pkgsrc/print/mupdf/Makefile 2016/04/27 12:34:58 1.36
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.35 2016/03/05 11:27:54 jperkin Exp $ 1# $NetBSD: Makefile,v 1.36 2016/04/27 12:34:58 leot Exp $
2 2
3DISTNAME= mupdf-1.8-source 3DISTNAME= mupdf-1.9a-source
4PKGNAME= ${DISTNAME:S/-source//} 4PKGNAME= ${DISTNAME:S/-source//}
5PKGREVISION= 3 
6CATEGORIES= print 5CATEGORIES= print
7MASTER_SITES= http://mupdf.com/downloads/ 6MASTER_SITES= http://mupdf.com/downloads/archive/
8 7
9MAINTAINER= leot@NetBSD.org 8MAINTAINER= leot@NetBSD.org
10HOMEPAGE= http://mupdf.com/ 9HOMEPAGE= http://mupdf.com/
11COMMENT= Lightweight PDF viewer and toolkit 10COMMENT= Lightweight PDF viewer and toolkit
12LICENSE= gnu-agpl-v3 11LICENSE= gnu-agpl-v3
13 12
14USE_LANGUAGES= c99 13USE_LANGUAGES= c99
15USE_LIBTOOL= yes 14USE_LIBTOOL= yes
16USE_TOOLS+= pkg-config gmake 15USE_TOOLS+= pkg-config gmake
17 16
18INSTALLATION_DIRS+= bin include lib/pkgconfig 17INSTALLATION_DIRS+= bin include lib/pkgconfig
19INSTALL_MAKE_FLAGS+= prefix=${PREFIX} 18INSTALL_MAKE_FLAGS+= prefix=${PREFIX}
20INSTALL_MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} 19INSTALL_MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}
@@ -26,32 +25,34 @@ MAKE_FLAGS+= build=release @@ -26,32 +25,34 @@ MAKE_FLAGS+= build=release
26CFLAGS+= -DJBIG_NO_MEMENTO 25CFLAGS+= -DJBIG_NO_MEMENTO
27CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 26CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
28 27
29.include "options.mk" 28.include "options.mk"
30 29
31# Remove thirdparty directory in order to use the libraries provided by pkgsrc 30# Remove thirdparty directory in order to use the libraries provided by pkgsrc
32# mujs directory is an exception and should not be removed (MuJS is the 31# mujs directory is an exception and should not be removed (MuJS is the
33# default Javascript interpreter for mupdf). 32# default Javascript interpreter for mupdf).
34post-extract: 33post-extract:
35 ${RM} -fr \ 34 ${RM} -fr \
36 ${WRKSRC}/thirdparty/curl \ 35 ${WRKSRC}/thirdparty/curl \
37 ${WRKSRC}/thirdparty/freetype \ 36 ${WRKSRC}/thirdparty/freetype \
38 ${WRKSRC}/thirdparty/glfw \ 37 ${WRKSRC}/thirdparty/glfw \
 38 ${WRKSRC}/thirdparty/harfbuzz \
39 ${WRKSRC}/thirdparty/jbig2dec \ 39 ${WRKSRC}/thirdparty/jbig2dec \
40 ${WRKSRC}/thirdparty/jpeg \ 40 ${WRKSRC}/thirdparty/jpeg \
41 ${WRKSRC}/thirdparty/openjpeg \ 41 ${WRKSRC}/thirdparty/openjpeg \
42 ${WRKSRC}/thirdparty/zlib 42 ${WRKSRC}/thirdparty/zlib
43 43
44post-build: 44post-build:
45 sed -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc 45 sed -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc
46 46
47post-install: 47post-install:
48 ${INSTALL_DATA} ${WRKSRC}/mupdf.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 48 ${INSTALL_DATA} ${WRKSRC}/mupdf.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
49 49
50.include "../../devel/zlib/buildlink3.mk" 50.include "../../devel/zlib/buildlink3.mk"
 51.include "../../fonts/harfbuzz/buildlink3.mk"
51.include "../../graphics/freetype2/buildlink3.mk" 52.include "../../graphics/freetype2/buildlink3.mk"
52.include "../../graphics/jbig2dec/buildlink3.mk" 53.include "../../graphics/jbig2dec/buildlink3.mk"
53.include "../../mk/jpeg.buildlink3.mk" 54.include "../../mk/jpeg.buildlink3.mk"
54.include "../../graphics/openjpeg/buildlink3.mk" 55.include "../../graphics/openjpeg/buildlink3.mk"
55.include "../../graphics/png/buildlink3.mk" 56.include "../../graphics/png/buildlink3.mk"
56.include "../../x11/libXext/buildlink3.mk" 57.include "../../x11/libXext/buildlink3.mk"
57.include "../../mk/bsd.pkg.mk" 58.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/print/mupdf/PLIST (expand / switch to unified diff)

--- pkgsrc/print/mupdf/PLIST 2016/02/04 11:50:24 1.11
+++ pkgsrc/print/mupdf/PLIST 2016/04/27 12:34:58 1.12
@@ -1,89 +1,92 @@ @@ -1,89 +1,92 @@
1@comment $NetBSD: PLIST,v 1.11 2016/02/04 11:50:24 leot Exp $ 1@comment $NetBSD: PLIST,v 1.12 2016/04/27 12:34:58 leot Exp $
2bin/mujstest 2bin/mujstest
3bin/mupdf 3bin/mupdf
4${PLIST.glfw}bin/mupdf-gl 4${PLIST.glfw}bin/mupdf-gl
5bin/mutool 5bin/mutool
6include/mupdf/fitz.h 6include/mupdf/fitz.h
7include/mupdf/fitz/annotation.h 7include/mupdf/fitz/annotation.h
 8include/mupdf/fitz/bidi.h
8include/mupdf/fitz/bitmap.h 9include/mupdf/fitz/bitmap.h
9include/mupdf/fitz/buffer.h 10include/mupdf/fitz/buffer.h
10include/mupdf/fitz/colorspace.h 11include/mupdf/fitz/colorspace.h
11include/mupdf/fitz/compressed-buffer.h 12include/mupdf/fitz/compressed-buffer.h
12include/mupdf/fitz/context.h 13include/mupdf/fitz/context.h
13include/mupdf/fitz/crypt.h 14include/mupdf/fitz/crypt.h
14include/mupdf/fitz/device.h 15include/mupdf/fitz/device.h
15include/mupdf/fitz/display-list.h 16include/mupdf/fitz/display-list.h
16include/mupdf/fitz/document.h 17include/mupdf/fitz/document.h
17include/mupdf/fitz/filter.h 18include/mupdf/fitz/filter.h
18include/mupdf/fitz/font.h 19include/mupdf/fitz/font.h
19include/mupdf/fitz/function.h 20include/mupdf/fitz/function.h
20include/mupdf/fitz/getopt.h 21include/mupdf/fitz/getopt.h
21include/mupdf/fitz/glyph-cache.h 22include/mupdf/fitz/glyph-cache.h
22include/mupdf/fitz/glyph.h 23include/mupdf/fitz/glyph.h
23include/mupdf/fitz/hash.h 24include/mupdf/fitz/hash.h
24include/mupdf/fitz/image.h 25include/mupdf/fitz/image.h
25include/mupdf/fitz/link.h 26include/mupdf/fitz/link.h
26include/mupdf/fitz/math.h 27include/mupdf/fitz/math.h
27include/mupdf/fitz/outline.h 28include/mupdf/fitz/outline.h
28include/mupdf/fitz/output-pcl.h 29include/mupdf/fitz/output-pcl.h
29include/mupdf/fitz/output-png.h 30include/mupdf/fitz/output-png.h
30include/mupdf/fitz/output-pnm.h 31include/mupdf/fitz/output-pnm.h
 32include/mupdf/fitz/output-ps.h
31include/mupdf/fitz/output-pwg.h 33include/mupdf/fitz/output-pwg.h
32include/mupdf/fitz/output-svg.h 34include/mupdf/fitz/output-svg.h
33include/mupdf/fitz/output-tga.h 35include/mupdf/fitz/output-tga.h
34include/mupdf/fitz/output.h 36include/mupdf/fitz/output.h
35include/mupdf/fitz/path.h 37include/mupdf/fitz/path.h
36include/mupdf/fitz/pixmap.h 38include/mupdf/fitz/pixmap.h
 39include/mupdf/fitz/pool.h
37include/mupdf/fitz/separation.h 40include/mupdf/fitz/separation.h
38include/mupdf/fitz/shade.h 41include/mupdf/fitz/shade.h
39include/mupdf/fitz/store.h 42include/mupdf/fitz/store.h
40include/mupdf/fitz/stream.h 43include/mupdf/fitz/stream.h
41include/mupdf/fitz/string.h 44include/mupdf/fitz/string.h
42include/mupdf/fitz/structured-text.h 45include/mupdf/fitz/structured-text.h
43include/mupdf/fitz/system.h 46include/mupdf/fitz/system.h
44include/mupdf/fitz/text.h 47include/mupdf/fitz/text.h
45include/mupdf/fitz/transition.h 48include/mupdf/fitz/transition.h
46include/mupdf/fitz/tree.h 49include/mupdf/fitz/tree.h
47include/mupdf/fitz/ucdn.h 50include/mupdf/fitz/ucdn.h
48include/mupdf/fitz/unzip.h 51include/mupdf/fitz/unzip.h
49include/mupdf/fitz/util.h 52include/mupdf/fitz/util.h
50include/mupdf/fitz/version.h 53include/mupdf/fitz/version.h
51include/mupdf/fitz/write-document.h 
52include/mupdf/fitz/xml.h 54include/mupdf/fitz/xml.h
53include/mupdf/html.h 55include/mupdf/html.h
54include/mupdf/memento.h 56include/mupdf/memento.h
55include/mupdf/pdf-tools.h 57include/mupdf/pdf-tools.h
56include/mupdf/pdf.h 58include/mupdf/pdf.h
57include/mupdf/pdf/annot.h 59include/mupdf/pdf/annot.h
58include/mupdf/pdf/appearance.h 60include/mupdf/pdf/appearance.h
59include/mupdf/pdf/clean.h 61include/mupdf/pdf/clean.h
60include/mupdf/pdf/cmap.h 62include/mupdf/pdf/cmap.h
61include/mupdf/pdf/crypt.h 63include/mupdf/pdf/crypt.h
62include/mupdf/pdf/document.h 64include/mupdf/pdf/document.h
63include/mupdf/pdf/event.h 65include/mupdf/pdf/event.h
64include/mupdf/pdf/field.h 66include/mupdf/pdf/field.h
65include/mupdf/pdf/font.h 67include/mupdf/pdf/font.h
 68include/mupdf/pdf/graft.h
66include/mupdf/pdf/interpret.h 69include/mupdf/pdf/interpret.h
67include/mupdf/pdf/javascript.h 70include/mupdf/pdf/javascript.h
68include/mupdf/pdf/name-table.h 71include/mupdf/pdf/name-table.h
69include/mupdf/pdf/object.h 72include/mupdf/pdf/object.h
70include/mupdf/pdf/output-pdf.h 73include/mupdf/pdf/output-pdf.h
71include/mupdf/pdf/page.h 74include/mupdf/pdf/page.h
72include/mupdf/pdf/parse.h 75include/mupdf/pdf/parse.h
73include/mupdf/pdf/resource.h 76include/mupdf/pdf/resource.h
74include/mupdf/pdf/widget.h 77include/mupdf/pdf/widget.h
75include/mupdf/pdf/xref.h 78include/mupdf/pdf/xref.h
76include/mupdf/xps.h 79include/mupdf/xps.h
77lib/libmujs.la 
78lib/libmupdf.la 80lib/libmupdf.la
 81lib/libmupdfthird.la
79lib/pkgconfig/mupdf.pc 82lib/pkgconfig/mupdf.pc
80man/man1/mupdf.1 83man/man1/mupdf.1
81man/man1/mutool.1 84man/man1/mutool.1
82share/doc/mupdf/CHANGES 85share/doc/mupdf/CHANGES
83share/doc/mupdf/COPYING 86share/doc/mupdf/COPYING
84share/doc/mupdf/README 87share/doc/mupdf/README
85share/doc/mupdf/naming.txt 88share/doc/mupdf/naming.txt
86share/doc/mupdf/overview.txt 89share/doc/mupdf/overview.txt
87share/doc/mupdf/progressive.txt 90share/doc/mupdf/progressive.txt
88share/doc/mupdf/refcount.txt 91share/doc/mupdf/refcount.txt
89share/doc/mupdf/thirdparty.txt 92share/doc/mupdf/thirdparty.txt
cvs diff -r1.10 -r1.11 pkgsrc/print/mupdf/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/print/mupdf/buildlink3.mk 2016/03/05 11:27:54 1.10
+++ pkgsrc/print/mupdf/buildlink3.mk 2016/04/27 12:34:58 1.11
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.10 2016/03/05 11:27:54 jperkin Exp $ 1# $NetBSD: buildlink3.mk,v 1.11 2016/04/27 12:34:58 leot 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>=1.8 8BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.9a
9BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.8nb3 9BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.9a
10BUILDLINK_PKGSRCDIR.mupdf?= ../../print/mupdf 10BUILDLINK_PKGSRCDIR.mupdf?= ../../print/mupdf
11 11
12pkgbase := mupdf 12pkgbase := mupdf
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
15.if !empty(PKG_BUILD_OPTIONS.mupdf:Mcurl) 15.if !empty(PKG_BUILD_OPTIONS.mupdf:Mcurl)
16.include "../../www/curl/buildlink3.mk" 16.include "../../www/curl/buildlink3.mk"
17.include "../../mk/pthread.buildlink3.mk" 17.include "../../mk/pthread.buildlink3.mk"
18.endif 18.endif
19 19
20.if !empty(PKG_BUILD_OPTIONS.mupdf:Mglfw) 20.if !empty(PKG_BUILD_OPTIONS.mupdf:Mglfw)
21.include "../../graphics/glut/buildlink3.mk" 21.include "../../graphics/glut/buildlink3.mk"
22.include "../../graphics/glfw/buildlink3.mk" 22.include "../../graphics/glfw/buildlink3.mk"
cvs diff -r1.23 -r1.24 pkgsrc/print/mupdf/distinfo (expand / switch to unified diff)

--- pkgsrc/print/mupdf/distinfo 2016/02/04 11:50:24 1.23
+++ pkgsrc/print/mupdf/distinfo 2016/04/27 12:34:58 1.24
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.23 2016/02/04 11:50:24 leot Exp $ 1$NetBSD: distinfo,v 1.24 2016/04/27 12:34:58 leot Exp $
2 2
3SHA1 (mupdf-1.8-source.tar.gz) = 9fbc9e06f0b74fe904745c363324eaca3517bfce 3SHA1 (mupdf-1.9a-source.tar.gz) = f2b3c21e5060d6ec56ea0d0c32b0feac7eac0e5f
4RMD160 (mupdf-1.8-source.tar.gz) = 2708f5650f23101a66cef92b7903aafb716f9c02 4RMD160 (mupdf-1.9a-source.tar.gz) = 0cb0d098c603b16be217e42299052a928d95c3fc
5SHA512 (mupdf-1.8-source.tar.gz) = 938fbed4afc0dd0aa621911cd70b9289c6a4f13d026f9390b11fc86d5b37845a76943c9fa42f218f67fe298295f15d6664a18be7bf73b5d952724122510f9deb 5SHA512 (mupdf-1.9a-source.tar.gz) = 9f804fd65c2dc6b7a3bd73961b1f1a8bf93d52903cccf6302acd6982dfa433125a3b8e77b808984921aee097877280fa21aafb87468cd0a8e4cfa900284a262b
6Size (mupdf-1.8-source.tar.gz) = 14169777 bytes 6Size (mupdf-1.9a-source.tar.gz) = 20493793 bytes
7SHA1 (patch-Makethird) = a44207c6c33fabec7e35c5f94bf30ab4172a93bc 7SHA1 (patch-Makethird) = 0a5951d543755c42053013f03b1c573b5da9c82c
8SHA1 (patch-ab) = a8ea41737aee65ad36ff52089d772844fb96d464 8SHA1 (patch-ab) = c1ee4dd0b79aa0d905c0a0b634fbd016c063cd64
9SHA1 (patch-ac) = 75447e4a2ab2ba9f9691a860499897e15d2498fa 9SHA1 (patch-ac) = 51b62ef8ff3e6c44ad954b2405bd982f9d682d37
10SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede 10SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
11SHA1 (patch-source_fitz_load-jpx.c) = 661b6a7f1d4da4f0cf5de3762db2f77d91239a6b 11SHA1 (patch-source_fitz_load-jpx.c) = 661b6a7f1d4da4f0cf5de3762db2f77d91239a6b
 12SHA1 (patch-thirdparty_mujs_Makefile) = f1da7cdf2c9e2e4bbac3e80ef486204a39b27e34
cvs diff -r1.8 -r1.9 pkgsrc/print/mupdf/files/mupdf.pc (expand / switch to unified diff)

--- pkgsrc/print/mupdf/files/mupdf.pc 2015/11/11 17:08:25 1.8
+++ pkgsrc/print/mupdf/files/mupdf.pc 2016/04/27 12:34:58 1.9
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1prefix=@PREFIX@ 1prefix=@PREFIX@
2exec_prefix=${prefix} 2exec_prefix=${prefix}
3libdir=${exec_prefix}/lib 3libdir=${exec_prefix}/lib
4includedir=${prefix}/include 4includedir=${prefix}/include
5 5
6Name: mupdf 6Name: mupdf
7Description: library for PDF files 7Description: library for PDF files
8Version: 1.8 8Version: 1.9a
9Libs: -Wl,-R${libdir} -L${libdir} -lmupdf 9Libs: -Wl,-R${libdir} -L${libdir} -lmupdf
10Cflags: -I${includedir} 10Cflags: -I${includedir}
cvs diff -r1.5 -r1.6 pkgsrc/print/mupdf/patches/patch-Makethird (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-Makethird 2016/02/04 11:50:24 1.5
+++ pkgsrc/print/mupdf/patches/patch-Makethird 2016/04/27 12:34:58 1.6
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1$NetBSD: patch-Makethird,v 1.5 2016/02/04 11:50:24 leot Exp $ 1$NetBSD: patch-Makethird,v 1.6 2016/04/27 12:34:58 leot Exp $
2 2
3o mujs building support with libtool 3o mujs building support with libtool
4 4
5--- Makethird.orig 2015-11-10 16:19:51.000000000 +0000 5--- Makethird.orig 2016-04-06 12:06:53.000000000 +0000
6+++ Makethird 6+++ Makethird
7@@ -51,14 +51,14 @@ endif 7@@ -24,13 +24,13 @@ ifneq "$(wildcard $(MUJS_DIR)/README)" "
8  
9 ifneq "$(wildcard $(MUJS_DIR)/README)" "" 
10  
11-MUJS_LIB := $(OUT)/libmujs.a 
12+MUJS_LIB := $(OUT)/libmujs.la 
13 MUJS_OUT := $(OUT)/mujs 8 MUJS_OUT := $(OUT)/mujs
14 MUJS_SRC := one.c 9 MUJS_SRC := one.c
15  10
16-$(MUJS_LIB): $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.o)) 11-MUJS_OBJ := $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.o))
17+$(MUJS_LIB): $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.lo)) 12+MUJS_OBJ := $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.lo))
 13
 14-$(MUJS_OUT)/one.o: $(wildcard $(MUJS_DIR)/js*.c $(MUJS_DIR)/utf*.c $(MUJS_DIR)/regex.c $(MUJS_DIR)/*.h)
 15+$(MUJS_OUT)/one.lo: $(wildcard $(MUJS_DIR)/js*.c $(MUJS_DIR)/utf*.c $(MUJS_DIR)/regex.c $(MUJS_DIR)/*.h)
 16
18 $(MUJS_OUT): 17 $(MUJS_OUT):
19 $(MKDIR_CMD) 18 $(MKDIR_CMD)
20-$(MUJS_OUT)/%.o: $(MUJS_DIR)/%.c | $(MUJS_OUT) 19-$(MUJS_OUT)/%.o: $(MUJS_DIR)/%.c | $(MUJS_OUT)
21+$(MUJS_OUT)/%.lo: $(MUJS_DIR)/%.c | $(MUJS_OUT) 20+$(MUJS_OUT)/%.lo: $(MUJS_DIR)/%.c | $(MUJS_OUT)
22 $(CC_CMD) 21 $(CC_CMD)
23  22
24 MUJS_CFLAGS := -I$(MUJS_DIR) 23 MUJS_CFLAGS := -I$(MUJS_DIR)
cvs diff -r1.11 -r1.12 pkgsrc/print/mupdf/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-ab 2016/02/04 11:50:24 1.11
+++ pkgsrc/print/mupdf/patches/patch-ab 2016/04/27 12:34:58 1.12
@@ -1,82 +1,81 @@ @@ -1,82 +1,81 @@
1$NetBSD: patch-ab,v 1.11 2016/02/04 11:50:24 leot Exp $ 1$NetBSD: patch-ab,v 1.12 2016/04/27 12:34:58 leot Exp $
2 2
3o Handle the various operating systems in the same way avoiding hardcoding 3o Handle the various operating systems in the same way avoiding hardcoding
4o Build and link with openjpeg-2.1 4o Properly recognize glfw support
5 5
6--- Makerules.orig 2015-11-10 16:19:51.000000000 +0000 6--- Makerules.orig 2016-04-06 12:06:53.000000000 +0000
7+++ Makerules 7+++ Makerules
8@@ -29,46 +29,6 @@ ifeq "$(largefile)" "yes" 8@@ -43,46 +43,6 @@ ifeq "$(largefile)" "yes"
9 CFLAGS += -DFZ_LARGEFILE 9 CFLAGS += -DFZ_LARGEFILE
10 endif 10 endif
11  11
12-# Windows (MINGW) build doesn't use system libraries. 12-# Windows (MINGW) build doesn't use system libraries.
13-ifeq "$(OS)" "MINGW" 13-ifeq "$(OS)" "MINGW"
14- 14-
15-HAVE_X11 ?= no 15-HAVE_X11 ?= no
16-HAVE_GLUT ?= yes 
17- 
18-SYS_GLUT_CFLAGS = -DFREEGLUT_STATIC -Ithirdparty/freeglut/include 
19-SYS_GLUT_LIBS = -Lthirdparty/freeglut/lib -lfreeglut_static -lopengl32 -lgdi32 -lwinmm 
20- 16-
21-# Mac OS X doesn't have pkg-config so we hard code paths. 17-# Mac OS X doesn't have pkg-config so we hard code paths.
22-else ifeq "$(OS)" "MACOS" 18-else ifeq "$(OS)" "MACOS"
23- 19-
24-HAVE_X11 ?= yes 20-HAVE_X11 ?= yes
25-HAVE_GLUT ?= yes 21-HAVE_PTHREADS ?= yes
26- 22-
 23-# Mac OS X deprecated openssl, so the default is to not include it.
 24-HAVE_OPENSSL ?= no
 25-SYS_OPENSSL_CFLAGS =
 26-SYS_OPENSSL_LIBS =
 27-ifeq "$(HAVE_OPENSSL)" "yes"
27-SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL 28-SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL
28-SYS_OPENSSL_LIBS = -lcrypto 29-SYS_OPENSSL_LIBS = -lcrypto
 30-endif
29- 31-
30-SYS_CURL_DEPS = -lpthread 32-SYS_CURL_DEPS = -lpthread
31- 33-
32-SYS_X11_CFLAGS = -I/usr/X11R6/include 34-SYS_X11_CFLAGS = -I/usr/X11R6/include
33-SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext 35-SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext
34-SYS_GLUT_CFLAGS = -Wno-deprecated-declarations 
35-SYS_GLUT_LIBS = -framework GLUT -framework OpenGL 
36- 36-
37-SYS_FREETYPE_CFLAGS = -I/usr/X11R6/include/freetype2 37-SYS_FREETYPE_CFLAGS = $(shell freetype-config --cflags)
38-SYS_FREETYPE_LIBS = -lfreetype 38-SYS_FREETYPE_LIBS = $(shell freetype-config --libs)
39-SYS_OPENJPEG_LIBS = -lopenjpeg 39-SYS_OPENJPEG_LIBS = -lopenjpeg
40-SYS_JBIG2DEC_LIBS = -ljbig2dec 40-SYS_JBIG2DEC_LIBS = -ljbig2dec
41-SYS_JPEG_LIBS = -ljpeg 41-SYS_JPEG_LIBS = -ljpeg
42-SYS_ZLIB_LIBS = -lz 42-SYS_ZLIB_LIBS = -lz
43- 43-
44-CC = xcrun cc 44-CC = xcrun cc
45-AR = xcrun ar 45-AR = xcrun ar
46-LD = xcrun ld 46-LD = xcrun ld
47-RANLIB_CMD = xcrun ranlib $@ 47-RANLIB_CMD = xcrun ranlib $@
48- 48-
49-# Linux uses pkg-config for system libraries. 49-# Linux uses pkg-config for system libraries.
50-else ifeq "$(OS)" "Linux" 50-else ifeq "$(OS)" "Linux"
51- 51-
52 HAVE_X11 ?= yes 52 HAVE_X11 ?= yes
53 HAVE_GLUT ?= yes 53 HAVE_PTHREADS ?= yes
54  54
55@@ -87,8 +47,16 @@ SYS_CURL_DEPS = -lpthread -lrt 55@@ -101,6 +61,17 @@ SYS_CURL_DEPS = -lpthread -lrt
56 SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext) 56 SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
57 SYS_X11_LIBS = $(shell pkg-config --libs x11 xext) 57 SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
58  58
59-SYS_GLUT_CFLAGS = 
60-SYS_GLUT_LIBS = -lglut -lGL 
61+ifeq "$(shell pkg-config --exists glut && echo yes)" "yes" 59+ifeq "$(shell pkg-config --exists glut && echo yes)" "yes"
62+SYS_GLUT_CFLAGS = $(shell pkg-config --cflags glut) 60+SYS_GLUT_CFLAGS = $(shell pkg-config --cflags glut)
63+SYS_GLUT_LIBS = $(shell pkg-config --libs glut) 61+SYS_GLUT_LIBS = $(shell pkg-config --libs glut)
64+endif 62+endif
65+ 63+
66+ifeq "$(shell pkg-config --exists glfw3 && echo yes)" "yes" 64+ifeq "$(shell pkg-config --exists glfw3 && echo yes)" "yes"
67+HAVE_GLFW = yes 65+HAVE_GLFW = yes
68+SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3) 66+SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3)
69+SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3) 67+SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3)
70+endif 68+endif
71  69+
 70 SYS_HARFBUZZ_CFLAGS = $(shell pkg-config --cflags harfbuzz)
 71 SYS_HARFBUZZ_LIBS = $(shell pkg-config --libs harfbuzz)
72 SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2) 72 SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
73 SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2) 73@@ -111,8 +82,6 @@ SYS_JBIG2DEC_LIBS = -ljbig2dec
74@@ -98,8 +66,6 @@ SYS_JBIG2DEC_LIBS = -ljbig2dec 
75 SYS_JPEG_LIBS = -ljpeg 74 SYS_JPEG_LIBS = -ljpeg
76 SYS_ZLIB_LIBS = -lz 75 SYS_ZLIB_LIBS = -lz
77  76
78-endif 77-endif
79- 78-
80 # The following section is an example of how to simply do cross-compilation 79 # The following section is an example of how to simply do cross-compilation
81 # using these Makefiles. It builds for a beagleboard running ARM linux, 80 # using these Makefiles. It builds for a beagleboard running ARM linux,
82 # compiling on windows with the CodeSourcery G++ compilers. 81 # compiling on windows with the CodeSourcery G++ compilers.
cvs diff -r1.13 -r1.14 pkgsrc/print/mupdf/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-ac 2016/02/04 11:50:24 1.13
+++ pkgsrc/print/mupdf/patches/patch-ac 2016/04/27 12:34:58 1.14
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-ac,v 1.13 2016/02/04 11:50:24 leot Exp $ 1$NetBSD: patch-ac,v 1.14 2016/04/27 12:34:58 leot Exp $
2 2
3o libtool support  3o libtool support
4o Install target cleanup 4o Install target cleanup
 5o Do not force `-O0' flag when building
5o Install only one "mupdf" binary, prefer the featureful one and always 6o Install only one "mupdf" binary, prefer the featureful one and always
6 install it as "mupdf" 7 install it as "mupdf"
7o libmujs support: install like a non-thirdparty mupdf's library 
8 8
9--- Makefile.orig 2015-11-10 16:19:51.000000000 +0000 9--- Makefile.orig 2016-04-21 11:14:32.000000000 +0000
10+++ Makefile 10+++ Makefile
11@@ -41,22 +41,12 @@ CFLAGS += $(ZLIB_CFLAGS) 11@@ -38,22 +38,12 @@ CFLAGS += $(ZLIB_CFLAGS)
12  12
13 # --- Commands --- 13 # --- Commands ---
14  14
15-ifneq "$(verbose)" "yes" 15-ifneq "$(verbose)" "yes"
16-QUIET_AR = @ echo ' ' ' ' AR $@ ; 16-QUIET_AR = @ echo ' ' ' ' AR $@ ;
17-QUIET_CC = @ echo ' ' ' ' CC $@ ; 17-QUIET_CC = @ echo ' ' ' ' CC $@ ;
18-QUIET_CXX = @ echo ' ' ' ' CXX $@ ; 18-QUIET_CXX = @ echo ' ' ' ' CXX $@ ;
19-QUIET_GEN = @ echo ' ' ' ' GEN $@ ; 19-QUIET_GEN = @ echo ' ' ' ' GEN $@ ;
20-QUIET_LINK = @ echo ' ' ' ' LINK $@ ; 20-QUIET_LINK = @ echo ' ' ' ' LINK $@ ;
21-QUIET_MKDIR = @ echo ' ' ' ' MKDIR $@ ; 21-QUIET_MKDIR = @ echo ' ' ' ' MKDIR $@ ;
22-QUIET_RM = @ echo ' ' ' ' RM $@ ; 22-QUIET_RM = @ echo ' ' ' ' RM $@ ;
23-endif 23-endif
24- 24-
@@ -27,237 +27,223 @@ o libmujs support: install like a non-th @@ -27,237 +27,223 @@ o libmujs support: install like a non-th
27-AR_CMD = $(QUIET_AR) $(AR) cr $@ $^ 27-AR_CMD = $(QUIET_AR) $(AR) cr $@ $^
28-LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) 28-LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
29-MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@ 29-MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
30-RM_CMD = $(QUIET_RM) rm -f $@ 30-RM_CMD = $(QUIET_RM) rm -f $@
31+CC_CMD = ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $< 31+CC_CMD = ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $<
32+CXX_CMD = ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -o $@ -c $< 32+CXX_CMD = ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -o $@ -c $<
33+AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^ 33+AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^
34+LINK_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS) 34+LINK_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
35+MKDIR_CMD = mkdir -p $@ 35+MKDIR_CMD = mkdir -p $@
36+RM_CMD = rm -f $@ 36+RM_CMD = rm -f $@
37  37
38 # --- File lists --- 38 # --- File lists ---
39  39
40@@ -91,33 +81,33 @@ XPS_SRC_HDR := $(wildcard source/xps/*.h 40@@ -89,17 +79,17 @@ XPS_SRC_HDR := $(wildcard source/xps/*.h
41 HTML_SRC_HDR := $(wildcard source/html/*.h) 41 HTML_SRC_HDR := $(wildcard source/html/*.h)
42 GPRF_SRC_HDR := $(wildcard source/gprf/*.h) 42 GPRF_SRC_HDR := $(wildcard source/gprf/*.h)
43  43
44-FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC)))) 44-FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC))))
45-PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC)))) 45-PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC))))
46-XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC)))) 46-XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC))))
47-CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC)))) 47-CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC))))
48-HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(HTML_SRC)))) 48-HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(HTML_SRC))))
49-GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(GPRF_SRC)))) 49-GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(GPRF_SRC))))
50+FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(FITZ_SRC)))) 50+FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(FITZ_SRC))))
51+PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(PDF_SRC)))) 51+PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(PDF_SRC))))
52+XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(XPS_SRC)))) 52+XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(XPS_SRC))))
53+CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(CBZ_SRC)))) 53+CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(CBZ_SRC))))
54+HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(HTML_SRC)))) 54+HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(HTML_SRC))))
55+GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(GPRF_SRC)))) 55+GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(GPRF_SRC))))
56  56
57 # --- Choice of Javascript library --- 
58  
59 ifeq "$(HAVE_MUJS)" "yes" 57 ifeq "$(HAVE_MUJS)" "yes"
60-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o 58-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
61-PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.o 
62+PDF_OBJ += $(OUT)/pdf/js/pdf-js.lo 
63+PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.lo 
64 THIRD_LIBS += $(MUJS_LIB) 
65 LIBS += $(MUJS_LIBS) 
66 CFLAGS += $(MUJS_CFLAGS) 
67 else ifeq "$(HAVE_JSCORE)" "yes" 
68-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o 
69-PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-jscore.o 
70+PDF_OBJ += $(OUT)/pdf/js/pdf-js.lo 
71+PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-jscore.lo 
72 LIBS += $(JSCORE_LIBS) 
73 CFLAGS += $(JSCORE_CFLAGS) 
74 else ifeq "$(HAVE_V8)" "yes" 
75-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o 
76-PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-cpp.o $(OUT)/pdf/js/pdf-jsimp-v8.o 
77+PDF_OBJ += $(OUT)/pdf/js/pdf-js.lo 59+PDF_OBJ += $(OUT)/pdf/js/pdf-js.lo
78+PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-cpp.lo $(OUT)/pdf/js/pdf-jsimp-v8.lo 
79 LIBS += $(V8_LIBS) 
80 CFLAGS += $(V8_CFLAGS) 
81 else 60 else
82-PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.o 61-PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.o
83+PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.lo 62+PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.lo
84 endif 63 endif
85  64
86 $(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR) 65 $(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR)
87@@ -129,47 +119,50 @@ $(GPRF_OBJ) : $(FITZ_HDR) $(GPRF_HDR) $( 66@@ -123,7 +113,7 @@ FONT_GEN_SIL := $(subst resources/fonts/
88  
89 # --- Library --- 
90  
91-MUPDF_LIB := $(OUT)/libmupdf.a 
92+MUPDF_LIB := $(OUT)/libmupdf.la 
93  
94 $(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) 
95  67
96 INSTALL_LIBS := $(MUPDF_LIB) 68 FONT_BIN := $(FONT_BIN_DROID) $(FONT_BIN_NOTO) $(FONT_BIN_URW) $(FONT_BIN_SIL)
97+ifeq "$(HAVE_MUJS)" "yes" 69 FONT_GEN := $(FONT_GEN_DROID) $(FONT_GEN_NOTO) $(FONT_GEN_URW) $(FONT_GEN_SIL)
98+INSTALL_LIBS += $(MUJS_LIB) 70-FONT_OBJ := $(subst $(GEN)/, $(OUT)/fonts/, $(addsuffix .o, $(basename $(FONT_GEN))))
99+endif 71+FONT_OBJ := $(subst $(GEN)/, $(OUT)/fonts/, $(addsuffix .lo, $(basename $(FONT_GEN))))
 72
 73 $(GEN)/%.c : resources/fonts/droid/%.ttc $(FONTDUMP)
 74 $(QUIET_GEN) $(FONTDUMP) $@ $<
 75@@ -141,8 +131,8 @@ $(FONT_GEN_URW) : $(FONT_BIN_URW)
100  76
101 # --- Rules --- 77 # --- Library ---
102  78
 79-MUPDF_LIB = $(OUT)/libmupdf.a
 80-THIRD_LIB = $(OUT)/libmupdfthird.a
 81+MUPDF_LIB = $(OUT)/libmupdf.la
 82+THIRD_LIB = $(OUT)/libmupdfthird.la
 83
 84 MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
 85 THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
 86@@ -157,39 +147,39 @@ INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB
103 $(ALL_DIR) $(OUT) $(GEN) : 87 $(ALL_DIR) $(OUT) $(GEN) :
104 $(MKDIR_CMD) 88 $(MKDIR_CMD)
105  89
106-$(OUT)/%.a : 90-$(OUT)/%.a :
107+$(OUT)/%.la : 91+$(OUT)/%.la :
108 $(RM_CMD) 92 $(RM_CMD)
109 $(AR_CMD) 93 $(AR_CMD)
110 $(RANLIB_CMD) 94 $(RANLIB_CMD)
111  95
112-$(OUT)/%: $(OUT)/%.o 96-$(OUT)/%: $(OUT)/%.o
113+$(OUT)/%: $(OUT)/%.lo 97+$(OUT)/%: $(OUT)/%.lo
114 $(LINK_CMD) 98 $(LINK_CMD)
115  99
116-$(OUT)/%.o : source/%.c | $(ALL_DIR) 100-$(OUT)/%.o : source/%.c | $(ALL_DIR)
117+$(OUT)/%.lo : source/%.c | $(ALL_DIR) 101+$(OUT)/%.lo : source/%.c | $(ALL_DIR)
118 $(CC_CMD) 102 $(CC_CMD)
119  103
120-$(OUT)/%.o : source/%.cpp | $(ALL_DIR) 104-$(OUT)/%.o : source/%.cpp | $(ALL_DIR)
121+$(OUT)/%.lo : source/%.cpp | $(ALL_DIR) 105+$(OUT)/%.lo : source/%.cpp | $(ALL_DIR)
122 $(CXX_CMD) 106 $(CXX_CMD)
123  107
124-$(OUT)/%.o : scripts/%.c | $(OUT) 108-$(OUT)/%.o : scripts/%.c | $(OUT)
125+$(OUT)/%.lo : scripts/%.c | $(OUT) 109+$(OUT)/%.lo : scripts/%.c | $(OUT)
126 $(CC_CMD) 110 $(CC_CMD)
127  111
 112-$(OUT)/fonts/%.o : $(GEN)/%.c | $(ALL_DIR)
 113- $(CC_CMD) -O0
 114+$(OUT)/fonts/%.lo : $(GEN)/%.c | $(ALL_DIR)
 115+ $(CC_CMD)
 116
128-$(OUT)/platform/x11/%.o : platform/x11/%.c | $(ALL_DIR) 117-$(OUT)/platform/x11/%.o : platform/x11/%.c | $(ALL_DIR)
129+$(OUT)/platform/x11/%.lo : platform/x11/%.c | $(ALL_DIR) 118+$(OUT)/platform/x11/%.lo : platform/x11/%.c | $(ALL_DIR)
130 $(CC_CMD) $(X11_CFLAGS) 119 $(CC_CMD) $(X11_CFLAGS)
131  120
132-$(OUT)/platform/x11/%.o: platform/x11/%.rc | $(OUT) 121-$(OUT)/platform/x11/%.o: platform/x11/%.rc | $(OUT)
133+$(OUT)/platform/x11/%.lo: platform/x11/%.rc | $(OUT) 122+$(OUT)/platform/x11/%.lo: platform/x11/%.rc | $(OUT)
134 windres $< $@ 123 windres $< $@
135  124
136-$(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR) 125-$(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR)
137+$(OUT)/platform/x11/curl/%.lo : platform/x11/%.c | $(ALL_DIR) 126+$(OUT)/platform/x11/curl/%.lo : platform/x11/%.c | $(ALL_DIR)
138 $(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL 127 $(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL
139  128
140-$(OUT)/platform/gl/%.o : platform/gl/%.c | $(ALL_DIR) 129-$(OUT)/platform/gl/%.o : platform/gl/%.c | $(ALL_DIR)
141+$(OUT)/platform/gl/%.lo : platform/gl/%.c | $(ALL_DIR) 130+$(OUT)/platform/gl/%.lo : platform/gl/%.c | $(ALL_DIR)
142 $(CC_CMD) $(GLFW_CFLAGS) 131 $(CC_CMD) $(GLFW_CFLAGS)
143  132
144-.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules 133-.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
145+.PRECIOUS : $(OUT)/%.lo # Keep intermediates from chained rules 134+.PRECIOUS : $(OUT)/%.lo # Keep intermediates from chained rules
146  135
147 # --- Generated CMAP, FONT and JAVASCRIPT files --- 136 # --- Generated CMap and JavaScript files ---
148  137
149@@ -233,17 +226,17 @@ endif 138@@ -240,16 +230,16 @@ endif
150  139
151 generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) $(NAME_GEN) 140 generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) $(NAME_GEN)
152  141
153-$(OUT)/pdf/pdf-cmap-table.o : $(CMAP_GEN) 142-$(OUT)/pdf/pdf-cmap-table.o : $(CMAP_GEN)
154-$(OUT)/pdf/pdf-fontfile.o : $(FONT_GEN) 
155-$(OUT)/pdf/pdf-pkcs7.o : $(ADOBECA_GEN) 143-$(OUT)/pdf/pdf-pkcs7.o : $(ADOBECA_GEN)
156-$(OUT)/pdf/js/pdf-js.o : $(JAVASCRIPT_GEN) 144-$(OUT)/pdf/js/pdf-js.o : $(JAVASCRIPT_GEN)
157-$(OUT)/pdf/pdf-object.o : source/pdf/pdf-name-table.h 145-$(OUT)/pdf/pdf-object.o : source/pdf/pdf-name-table.h
158-$(OUT)/cmapdump.o : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c source/pdf/pdf-name-table.h 146-$(OUT)/cmapdump.o : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c source/pdf/pdf-name-table.h
159+$(OUT)/pdf/pdf-cmap-table.lo : $(CMAP_GEN) 147+$(OUT)/pdf/pdf-cmap-table.lo : $(CMAP_GEN)
160+$(OUT)/pdf/pdf-fontfile.lo : $(FONT_GEN) 
161+$(OUT)/pdf/pdf-pkcs7.lo : $(ADOBECA_GEN) 148+$(OUT)/pdf/pdf-pkcs7.lo : $(ADOBECA_GEN)
162+$(OUT)/pdf/js/pdf-js.lo : $(JAVASCRIPT_GEN) 149+$(OUT)/pdf/js/pdf-js.lo : $(JAVASCRIPT_GEN)
163+$(OUT)/pdf/pdf-object.lo : source/pdf/pdf-name-table.h 150+$(OUT)/pdf/pdf-object.lo : source/pdf/pdf-name-table.h
164+$(OUT)/cmapdump.lo : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c source/pdf/pdf-name-table.h 151+$(OUT)/cmapdump.lo : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c source/pdf/pdf-name-table.h
165  152
166 # --- Tools and Apps --- 153 # --- Tools and Apps ---
167  154
168 MUTOOL := $(addprefix $(OUT)/, mutool) 155 MUTOOL := $(addprefix $(OUT)/, mutool)
169-MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o mudraw.o pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o) 156-MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o mudraw.o murun.o pdfclean.o pdfcreate.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o pdfmerge.o)
170+MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.lo mudraw.lo pdfclean.lo pdfextract.lo pdfinfo.lo pdfposter.lo pdfshow.lo pdfpages.lo) 157+MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.lo mudraw.lo murun.lo pdfclean.lo pdfcreate.lo pdfextract.lo pdfinfo.lo pdfposter.lo pdfshow.lo pdfpages.lo pdfmerge.lo)
171 $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR) 158 $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
172 $(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIBS) 159 $(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIB)
173 $(MUTOOL) : $(MUTOOL_OBJ) 160 $(MUTOOL) : $(MUTOOL_OBJ)
174@@ -251,27 +244,27 @@ $(MUTOOL) : $(MUTOOL_OBJ) 161@@ -257,27 +247,27 @@ $(MUTOOL) : $(MUTOOL_OBJ)
175  162
176 MJSGEN := $(OUT)/mjsgen 163 MJSGEN := $(OUT)/mjsgen
177 $(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIBS) 164 $(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIB)
178-$(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.o) 165-$(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.o)
179+$(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.lo) 166+$(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.lo)
180 $(LINK_CMD) 167 $(LINK_CMD)
181  168
182 MUJSTEST := $(OUT)/mujstest 169 MUJSTEST := $(OUT)/mujstest
183-MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o) 170-MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
184+MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.lo pdfapp.lo) 171+MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.lo pdfapp.lo)
185 $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR) 172 $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR)
186 $(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIBS) 173 $(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIB)
187 $(MUJSTEST) : $(MUJSTEST_OBJ) 174 $(MUJSTEST) : $(MUJSTEST_OBJ)
188 $(LINK_CMD) 175 $(LINK_CMD)
189  176
190 ifeq "$(HAVE_X11)" "yes" 177 ifeq "$(HAVE_X11)" "yes"
191-MUVIEW_X11 := $(OUT)/mupdf-x11 178-MUVIEW_X11 := $(OUT)/mupdf-x11
192-MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o) 179-MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
193+MUVIEW_X11 := $(OUT)/platform/x11/mupdf 180+MUVIEW_X11 := $(OUT)/platform/x11/mupdf
194+MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.lo x11_image.lo pdfapp.lo) 181+MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.lo x11_image.lo pdfapp.lo)
195 $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR) 182 $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR)
196 $(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIBS) 183 $(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIB)
197 $(MUVIEW_X11) : $(MUVIEW_X11_OBJ) 184 $(MUVIEW_X11) : $(MUVIEW_X11_OBJ)
198 $(LINK_CMD) $(X11_LIBS) 185 $(LINK_CMD) $(X11_LIBS)
199  186
200 ifeq "$(HAVE_GLFW)" "yes" 187 ifeq "$(HAVE_GLFW)" "yes"
201-MUVIEW_GLFW := $(OUT)/mupdf-gl 188-MUVIEW_GLFW := $(OUT)/mupdf-gl
202-MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o) 189-MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o)
203+MUVIEW_GLFW := $(OUT)/platform/gl/mupdf-gl 190+MUVIEW_GLFW := $(OUT)/platform/gl/mupdf-gl
204+MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.lo gl-input.lo gl-main.lo) 191+MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.lo gl-input.lo gl-main.lo)
205 $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h 192 $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h
206 $(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIBS) $(GLFW_LIB) 193 $(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIB) $(GLFW_LIB)
207 $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ) 194 $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ)
208@@ -279,8 +272,8 @@ $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ) 195@@ -285,8 +275,8 @@ $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ)
209 endif 196 endif
210  197
211 ifeq "$(HAVE_CURL)" "yes" 198 ifeq "$(HAVE_CURL)" "yes"
212-MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl 199-MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl
213-MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o) 200-MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o)
214+MUVIEW_X11_CURL := $(OUT)/platform/x11/curl/mupdf 201+MUVIEW_X11_CURL := $(OUT)/platform/x11/curl/mupdf
215+MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.lo x11_image.lo pdfapp.lo curl_stream.lo) 202+MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.lo x11_image.lo pdfapp.lo curl_stream.lo)
216 $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR) 203 $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR)
217 $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIBS) $(CURL_LIB) 204 $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB)
218 $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ) 205 $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ)
219@@ -290,17 +283,27 @@ endif 206@@ -296,17 +286,26 @@ endif
220  207
221 ifeq "$(HAVE_WIN32)" "yes" 208 ifeq "$(HAVE_WIN32)" "yes"
222 MUVIEW_WIN32 := $(OUT)/mupdf 209 MUVIEW_WIN32 := $(OUT)/mupdf
223-MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o) 210-MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o)
224+MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.lo pdfapp.lo win_res.lo) 211+MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.lo pdfapp.lo win_res.lo)
225 $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR) 212 $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR)
226 $(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIBS) 213 $(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIB)
227 $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ) 214 $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ)
228 $(LINK_CMD) $(WIN32_LIBS) 215 $(LINK_CMD) $(WIN32_LIBS)
229 endif 216 endif
230  217
231-MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) $(MUVIEW_GLFW) 218-MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) $(MUVIEW_GLFW)
232+MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) 219+MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32)
233 MUVIEW_CURL := $(MUVIEW_X11_CURL) $(MUVIEW_WIN32_CURL) 220 MUVIEW_CURL := $(MUVIEW_X11_CURL) $(MUVIEW_WIN32_CURL)
234+MUVIEW_GLFW := $(MUVIEW_GLFW) 221
235+ 222-INSTALL_APPS := $(MUTOOL) $(MUVIEW) $(MUJSTEST) $(MUVIEW_CURL)
236+INSTALL_APPS := $(MUTOOL) $(MUJSTEST) 223+INSTALL_APPS := $(MUTOOL) $(MUJSTEST)
237+ifeq "$(HAVE_CURL)" "yes" 224+ifeq "$(HAVE_CURL)" "yes"
238+INSTALL_APPS += $(MUVIEW_CURL) 225+INSTALL_APPS += $(MUVIEW_CURL)
239+else ifeq "$(HAVE_X11)" "yes" 226+else ifeq "$(HAVE_X11)" "yes"
240+INSTALL_APPS += $(MUVIEW) 227+INSTALL_APPS += $(MUVIEW)
241+endif 228+endif
242  229+
243-INSTALL_APPS := $(MUTOOL) $(MUVIEW) $(MUJSTEST) $(MUVIEW_CURL) 
244+ifeq "$(HAVE_GLFW)" "yes" 230+ifeq "$(HAVE_GLFW)" "yes"
245+INSTALL_APPS += $(MUVIEW_GLFW) 231+INSTALL_APPS += $(MUVIEW_GLFW)
246+endif 232+endif
247  233
248 # --- Examples --- 234 # --- Examples ---
249  235
250@@ -343,24 +346,26 @@ libs: $(INSTALL_LIBS) 236@@ -349,24 +348,26 @@ libs: $(INSTALL_LIBS)
251 apps: $(INSTALL_APPS) 237 apps: $(INSTALL_APPS)
252  238
253 install: libs apps 239 install: libs apps
254- install -d $(DESTDIR)$(incdir)/mupdf 240- install -d $(DESTDIR)$(incdir)/mupdf
255- install -d $(DESTDIR)$(incdir)/mupdf/fitz 241- install -d $(DESTDIR)$(incdir)/mupdf/fitz
256- install -d $(DESTDIR)$(incdir)/mupdf/pdf 242- install -d $(DESTDIR)$(incdir)/mupdf/pdf
257- install include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf 243- install include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
258- install include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz 244- install include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
259- install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf 245- install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
260- 246-
261- install -d $(DESTDIR)$(libdir) 247- install -d $(DESTDIR)$(libdir)
262- install $(INSTALL_LIBS) $(DESTDIR)$(libdir) 248- install $(INSTALL_LIBS) $(DESTDIR)$(libdir)
263- 249-
File Added: pkgsrc/print/mupdf/patches/Attic/patch-thirdparty_mujs_Makefile
$NetBSD: patch-thirdparty_mujs_Makefile,v 1.1 2016/04/27 12:34:58 leot Exp $

o Add libtool support lo mujs.
o Avoid to set (unused) VERSION variable.

--- thirdparty/mujs/Makefile.orig	2016-03-01 20:52:00.000000000 +0000
+++ thirdparty/mujs/Makefile
@@ -41,16 +41,16 @@ jsdump.c: astnames.h opnames.h
 build:
 	mkdir -p build
 
-build/%.o: %.c $(HDRS)
+build/%.lo: %.c $(HDRS)
 	$(CC) $(CFLAGS) -o $@ -c $<
 
-build/libmujs.a: $(OBJS)
+build/libmujs.la: $(OBJS)
 	$(AR) cru $@ $^
 
-build/mujs: build/main.o build/libmujs.a
+build/mujs: build/main.lo build/libmujs.la
 	$(CC) $(LDFLAGS) -o $@ $^ -lm
 
-build/mujsone: build/main.o build/one.o
+build/mujsone: build/main.o build/one.lo
 	$(CC) $(LDFLAGS) -o $@ $^ -lm
 
 install: release
@@ -61,12 +61,12 @@ install: release
 	install build/libmujs.a $(DESTDIR)$(libdir)
 	install build/mujs $(DESTDIR)$(bindir)
 
-VERSION = $(shell git describe --tags --always)
-
-tarball:
-	git archive --format=zip --prefix=mujs-$(VERSION)/ HEAD > mujs-$(VERSION).zip
-	git archive --format=tar --prefix=mujs-$(VERSION)/ HEAD | gzip > mujs-$(VERSION).tar.gz
-	git archive --format=tar --prefix=mujs-$(VERSION)/ HEAD | xz > mujs-$(VERSION).tar.xz
+#VERSION = $(shell git describe --tags --always)
+#
+#tarball:
+#	git archive --format=zip --prefix=mujs-$(VERSION)/ HEAD > mujs-$(VERSION).zip
+#	git archive --format=tar --prefix=mujs-$(VERSION)/ HEAD | gzip > mujs-$(VERSION).tar.gz
+#	git archive --format=tar --prefix=mujs-$(VERSION)/ HEAD | xz > mujs-$(VERSION).tar.xz
 
 tags: $(SRCS) main.c $(HDRS)
 	ctags $^