Mon May 13 11:03:58 2019 UTC ()
mupdf: Minor fix/cleanups/patch hunks readd accidentally lost in 1.15.0 update

Fixes:
- Use `HAVE_GLUT ?= yes' instead of `HAVE_GLUT := yes' in patch-ab:
  in that way possible `MAKE_ENV+= HAVE_GLUT=no' in options.mk is honored
  (in 1.15.0 update this could lead to building and installing mupdf-gl
  and failing due PLIST mismatch despite `opengl' option was not
  set.)

Cleanups/patch hunks readds/improvements:
 - Avoid to remove non existent thirdparty/curl directory no longer exists,
   do not remove it in post-extract
 - Clarify why pkgsrc lcms2 could not be used
 - Remove curl leftover in buildlink3.mk
 - Update patch-Makethird, patch-ab, patch-ac comments to reflect reality
 - Populate SYS_GLUT_{CFLAGS,LIBS} via `pkg-config'


(leot)
diff -r1.67 -r1.68 pkgsrc/print/mupdf/Makefile
diff -r1.28 -r1.29 pkgsrc/print/mupdf/buildlink3.mk
diff -r1.43 -r1.44 pkgsrc/print/mupdf/distinfo
diff -r1.9 -r1.10 pkgsrc/print/mupdf/patches/patch-Makethird
diff -r1.19 -r1.20 pkgsrc/print/mupdf/patches/patch-ab
diff -r1.21 -r1.22 pkgsrc/print/mupdf/patches/patch-ac
cvs diff -r1.67 -r1.68 pkgsrc/print/mupdf/Makefile (expand / switch to unified diff)

--- pkgsrc/print/mupdf/Makefile 2019/05/12 12:27:02 1.67
+++ pkgsrc/print/mupdf/Makefile 2019/05/13 11:03:58 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.67 2019/05/12 12:27:02 ryoon Exp $ 1# $NetBSD: Makefile,v 1.68 2019/05/13 11:03:58 leot Exp $
2 2
3DISTNAME= mupdf-1.15.0-source 3DISTNAME= mupdf-1.15.0-source
4PKGNAME= ${DISTNAME:S/-source//} 4PKGNAME= ${DISTNAME:S/-source//}
5CATEGORIES= print 5CATEGORIES= print
6MASTER_SITES= https://mupdf.com/downloads/archive/ 6MASTER_SITES= https://mupdf.com/downloads/archive/
7 7
8MAINTAINER= leot@NetBSD.org 8MAINTAINER= leot@NetBSD.org
9HOMEPAGE= https://mupdf.com/ 9HOMEPAGE= https://mupdf.com/
10COMMENT= Lightweight PDF, XPS and E-book viewer and toolkit 10COMMENT= Lightweight PDF, XPS and E-book viewer and toolkit
11LICENSE= gnu-agpl-v3 11LICENSE= gnu-agpl-v3
12 12
13USE_LANGUAGES= c99 13USE_LANGUAGES= c99
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
@@ -24,44 +24,43 @@ MAKE_FLAGS+= build=release @@ -24,44 +24,43 @@ MAKE_FLAGS+= build=release
24MAKE_ENV+= HAVE_LIBCRYPTO=no # Needs openssl-1.1.0 24MAKE_ENV+= HAVE_LIBCRYPTO=no # Needs openssl-1.1.0
25MAKE_ENV+= USE_SYSTEM_LIBS=yes 25MAKE_ENV+= USE_SYSTEM_LIBS=yes
26 26
27CFLAGS+= -DJBIG_NO_MEMENTO 27CFLAGS+= -DJBIG_NO_MEMENTO
28CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 28CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
29 29
30.include "options.mk" 30.include "options.mk"
31 31
32# Remove thirdparty directory in order to use the libraries provided by pkgsrc 32# Remove thirdparty directory in order to use the libraries provided by pkgsrc
33# mujs directory is an exception and should not be removed (MuJS is the 33# mujs directory is an exception and should not be removed (MuJS is the
34# default Javascript interpreter for mupdf). 34# default Javascript interpreter for mupdf).
35post-extract: 35post-extract:
36 ${RM} -fr \ 36 ${RM} -fr \
37 ${WRKSRC}/thirdparty/curl \ 
38 ${WRKSRC}/thirdparty/freeglut \ 37 ${WRKSRC}/thirdparty/freeglut \
39 ${WRKSRC}/thirdparty/freetype \ 38 ${WRKSRC}/thirdparty/freetype \
40 ${WRKSRC}/thirdparty/harfbuzz \ 39 ${WRKSRC}/thirdparty/harfbuzz \
41 ${WRKSRC}/thirdparty/jbig2dec \ 40 ${WRKSRC}/thirdparty/jbig2dec \
42 ${WRKSRC}/thirdparty/lcms2 \ 41 ${WRKSRC}/thirdparty/lcms2 \
43 ${WRKSRC}/thirdparty/libjpeg \ 42 ${WRKSRC}/thirdparty/libjpeg \
44 ${WRKSRC}/thirdparty/openjpeg \ 43 ${WRKSRC}/thirdparty/openjpeg \
45 ${WRKSRC}/thirdparty/zlib 44 ${WRKSRC}/thirdparty/zlib
46 45
47post-build: 46post-build:
48 sed -e "s,@PREFIX@,${PREFIX}," -e "s,@VERSION@,${PKGVERSION_NOREV}," \ 47 sed -e "s,@PREFIX@,${PREFIX}," -e "s,@VERSION@,${PKGVERSION_NOREV}," \
49 ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc 48 ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc
50 49
51post-install: 50post-install:
52 ${INSTALL_DATA} ${WRKSRC}/mupdf.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 51 ${INSTALL_DATA} ${WRKSRC}/mupdf.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
53 52
54BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.7 53BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.7
55.include "../../devel/zlib/buildlink3.mk" 54.include "../../devel/zlib/buildlink3.mk"
56.include "../../fonts/harfbuzz/buildlink3.mk" 55.include "../../fonts/harfbuzz/buildlink3.mk"
57.include "../../graphics/freetype2/buildlink3.mk" 56.include "../../graphics/freetype2/buildlink3.mk"
58.include "../../graphics/jbig2dec/buildlink3.mk" 57.include "../../graphics/jbig2dec/buildlink3.mk"
59.include "../../mk/jpeg.buildlink3.mk" 58.include "../../mk/jpeg.buildlink3.mk"
60.include "../../mk/pthread.buildlink3.mk" 59.include "../../mk/pthread.buildlink3.mk"
61# XXX: lcms2-2.9 does not usable for mupdf 60# XXX: mupdf needs lcms2-art fork
62#BUILDLINK_API_DEPENDS.lcms2+= lcms2>=2.9 61#BUILDLINK_API_DEPENDS.lcms2+= lcms2>=2.9
63#.include "../../graphics/lcms2/buildlink3.mk" 62#.include "../../graphics/lcms2/buildlink3.mk"
64.include "../../graphics/openjpeg/buildlink3.mk" 63.include "../../graphics/openjpeg/buildlink3.mk"
65.include "../../graphics/png/buildlink3.mk" 64.include "../../graphics/png/buildlink3.mk"
66.include "../../x11/libXext/buildlink3.mk" 65.include "../../x11/libXext/buildlink3.mk"
67.include "../../mk/bsd.pkg.mk" 66.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/print/mupdf/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/print/mupdf/buildlink3.mk 2018/12/13 19:51:36 1.28
+++ pkgsrc/print/mupdf/buildlink3.mk 2019/05/13 11:03:58 1.29
@@ -1,31 +1,27 @@ @@ -1,31 +1,27 @@
1# $NetBSD: buildlink3.mk,v 1.28 2018/12/13 19:51:36 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.29 2019/05/13 11:03: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.14.0 8BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.14.0
9BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.14.0nb2 9BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.14.0nb2
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) 
16.include "../../www/curl/buildlink3.mk" 
17.endif 
18 
19.if !empty(PKG_BUILD_OPTIONS.mupdf:Mopengl) 15.if !empty(PKG_BUILD_OPTIONS.mupdf:Mopengl)
20.include "../../graphics/MesaLib/buildlink3.mk" 16.include "../../graphics/MesaLib/buildlink3.mk"
21.include "../../graphics/glut/buildlink3.mk" 17.include "../../graphics/glut/buildlink3.mk"
22.endif 18.endif
23 19
24.include "../../devel/zlib/buildlink3.mk" 20.include "../../devel/zlib/buildlink3.mk"
25.include "../../fonts/harfbuzz/buildlink3.mk" 21.include "../../fonts/harfbuzz/buildlink3.mk"
26.include "../../graphics/freetype2/buildlink3.mk" 22.include "../../graphics/freetype2/buildlink3.mk"
27.include "../../graphics/jbig2dec/buildlink3.mk" 23.include "../../graphics/jbig2dec/buildlink3.mk"
28.include "../../graphics/openjpeg/buildlink3.mk" 24.include "../../graphics/openjpeg/buildlink3.mk"
29.include "../../graphics/png/buildlink3.mk" 25.include "../../graphics/png/buildlink3.mk"
30.include "../../mk/jpeg.buildlink3.mk" 26.include "../../mk/jpeg.buildlink3.mk"
31.include "../../mk/pthread.buildlink3.mk" 27.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.43 -r1.44 pkgsrc/print/mupdf/distinfo (expand / switch to unified diff)

--- pkgsrc/print/mupdf/distinfo 2019/05/12 12:27:02 1.43
+++ pkgsrc/print/mupdf/distinfo 2019/05/13 11:03:58 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.43 2019/05/12 12:27:02 ryoon Exp $ 1$NetBSD: distinfo,v 1.44 2019/05/13 11:03:58 leot Exp $
2 2
3SHA1 (mupdf-1.15.0-source.tar.gz) = 4354a1c7245d4351ba604a4deed4a4ecf3e27492 3SHA1 (mupdf-1.15.0-source.tar.gz) = 4354a1c7245d4351ba604a4deed4a4ecf3e27492
4RMD160 (mupdf-1.15.0-source.tar.gz) = 892247f12a9e85d384c6cbc6c5a394d36e783158 4RMD160 (mupdf-1.15.0-source.tar.gz) = 892247f12a9e85d384c6cbc6c5a394d36e783158
5SHA512 (mupdf-1.15.0-source.tar.gz) = d44091e67c4772cad7bb90d66f6da6e05fed376ff5965636ff56eac4ca2faf262f75e80b34514ce52e6141af585cbb0095d5113d20f5b379e548c31fb664c287 5SHA512 (mupdf-1.15.0-source.tar.gz) = d44091e67c4772cad7bb90d66f6da6e05fed376ff5965636ff56eac4ca2faf262f75e80b34514ce52e6141af585cbb0095d5113d20f5b379e548c31fb664c287
6Size (mupdf-1.15.0-source.tar.gz) = 53023898 bytes 6Size (mupdf-1.15.0-source.tar.gz) = 53023898 bytes
7SHA1 (patch-Makethird) = 33b7ccf235e971c44e159a687cecc033155957ba 7SHA1 (patch-Makethird) = 3d339e860c45bedc074106fa510f64eb3118cd1a
8SHA1 (patch-ab) = abddcb1d72a16bd421b6ae924a4b4d759e8371e3 8SHA1 (patch-ab) = 4824dcf66e7692212cb327515d48e281029564f7
9SHA1 (patch-ac) = 693f1c98f12450f8e23707cf560094ab6166c8eb 9SHA1 (patch-ac) = 78ed32eafd40d8ccddf2f68757f39c13f5aa8eac
10SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede 10SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
11SHA1 (patch-platform_gl_gl-app.h) = f8682b54821a560b2ba1082bcf215eeefb549644 11SHA1 (patch-platform_gl_gl-app.h) = f8682b54821a560b2ba1082bcf215eeefb549644
12SHA1 (patch-platform_gl_gl-main.c) = edff1aa77c4d6af59b2eca442340606a0bae9970 12SHA1 (patch-platform_gl_gl-main.c) = edff1aa77c4d6af59b2eca442340606a0bae9970
13SHA1 (patch-source_fitz_load-jpx.c) = 161d21bca13bb57db37807aec844c85dc5b34157 13SHA1 (patch-source_fitz_load-jpx.c) = 161d21bca13bb57db37807aec844c85dc5b34157
14SHA1 (patch-thirdparty_mujs_Makefile) = 833e44f4e23d2a6ff61e6276feede4892feeb9bb 14SHA1 (patch-thirdparty_mujs_Makefile) = 833e44f4e23d2a6ff61e6276feede4892feeb9bb
cvs diff -r1.9 -r1.10 pkgsrc/print/mupdf/patches/patch-Makethird (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-Makethird 2018/10/04 19:02:33 1.9
+++ pkgsrc/print/mupdf/patches/patch-Makethird 2019/05/13 11:03:58 1.10
@@ -1,17 +1,15 @@ @@ -1,17 +1,15 @@
1$NetBSD: patch-Makethird,v 1.9 2018/10/04 19:02:33 leot Exp $ 1$NetBSD: patch-Makethird,v 1.10 2019/05/13 11:03:58 leot Exp $
2 2
3- mujs building support with libtool 3mujs building support with libtool
4- Avoid the internal lcms2 version provided and honors SYS_LCMS2_{CFLAGS,LIBS}. 
5 These are handled in patches/patch-ab. 
6 4
7--- Makethird.orig 2018-09-25 12:39:17.000000000 +0000 5--- Makethird.orig 2018-09-25 12:39:17.000000000 +0000
8+++ Makethird 6+++ Makethird
9@@ -229,7 +229,7 @@ else 7@@ -229,7 +229,7 @@ else
10 THIRD_SRC += thirdparty/mujs/one.c 8 THIRD_SRC += thirdparty/mujs/one.c
11 THIRD_CFLAGS += -Ithirdparty/mujs 9 THIRD_CFLAGS += -Ithirdparty/mujs
12  10
13-$(OUT)/thirdparty/mujs/%.o: thirdparty/mujs/%.c 11-$(OUT)/thirdparty/mujs/%.o: thirdparty/mujs/%.c
14+$(OUT)/thirdparty/mujs/%.lo: thirdparty/mujs/%.c 12+$(OUT)/thirdparty/mujs/%.lo: thirdparty/mujs/%.c
15 $(CC_CMD) 13 $(CC_CMD)
16  14
17 endif 15 endif
cvs diff -r1.19 -r1.20 pkgsrc/print/mupdf/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-ab 2019/05/12 12:27:02 1.19
+++ pkgsrc/print/mupdf/patches/patch-ab 2019/05/13 11:03:58 1.20
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-ab,v 1.19 2019/05/12 12:27:02 ryoon Exp $ 1$NetBSD: patch-ab,v 1.20 2019/05/13 11:03:58 leot Exp $
2 2
3- Handle the various operating systems in the same way avoiding hardcoding 3- Handle the various operating systems in the same way avoiding hardcoding
4- Avoid to use objcopy by setting HAVE_OBJCOPY to no (if `yes', and with 4- Avoid to use objcopy by setting HAVE_OBJCOPY to no (if `yes', and with
5 `USE_TOOLS+= objcopy' the objcopy-ing fails as follow: 5 `USE_TOOLS+= objcopy' the objcopy-ing fails as follow:
6 OBJCOPY build/release/resources/fonts/urw/Dingbats.cff.o 6 OBJCOPY build/release/resources/fonts/urw/Dingbats.cff.o
7 build/release/resources/fonts/urw/Dingbats.cff.o:1: warning: NUL character seen; rest of line ignored 7 build/release/resources/fonts/urw/Dingbats.cff.o:1: warning: NUL character seen; rest of line ignored
8 build/release/resources/fonts/urw/Dingbats.cff.o:1: *** missing separator. Stop. 8 build/release/resources/fonts/urw/Dingbats.cff.o:1: *** missing separator. Stop.
9 (also for other fonts)). This needs to be investigated further. 9 (also for other fonts)). This needs to be investigated further.
10- Avoid internal version of freeglut and try to pick it up via pkg-config and 10- Avoid internal version of freeglut and try to pick it up via pkg-config and
11 set SYS_GLUT_{CFLAGS,LIBS} accordingly. 11 set SYS_GLUT_{CFLAGS,LIBS} accordingly.
12- Avoid internal version of lcms2 and try to pick it up via pkg-config and 12- Avoid internal version of lcms2 and try to pick it up via pkg-config and
13 set SYS_LCMS2_{CFLAGS,LIBS} accordingly. 13 set SYS_LCMS2_{CFLAGS,LIBS} accordingly.
14 If no lcms2 is available just pass `-DNO_ICC' to disable it via 14 If no lcms2 is available just pass `-DFZ_ENABLE_ICC=0' to disable it via
15 CFLAGS. 15 CFLAGS.
16 16
17--- Makerules.orig 2019-05-06 11:53:09.000000000 +0000 17--- Makerules.orig 2019-05-06 11:53:09.000000000 +0000
18+++ Makerules 18+++ Makerules
19@@ -6,17 +6,6 @@ OS := $(OS:MSYS%=MINGW) 19@@ -6,17 +6,6 @@ OS := $(OS:MSYS%=MINGW)
20 OS := $(OS:Windows_NT=MINGW) 20 OS := $(OS:Windows_NT=MINGW)
21 OS := $(OS:Darwin=MACOS) 21 OS := $(OS:Darwin=MACOS)
22  22
23-ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),) 23-ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
24- # clang does not support these in combination with -fembed-bitcode 24- # clang does not support these in combination with -fembed-bitcode
25- CFLAGS += -ffunction-sections -fdata-sections 25- CFLAGS += -ffunction-sections -fdata-sections
26-endif 26-endif
27- 27-
@@ -84,34 +84,35 @@ $NetBSD: patch-ab,v 1.19 2019/05/12 12:2 @@ -84,34 +84,35 @@ $NetBSD: patch-ab,v 1.19 2019/05/12 12:2
84+endif 84+endif
85+ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes) 85+ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
86 SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) 86 SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
87 SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) 87 SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
88- endif 88- endif
89- ifeq ($(shell pkg-config --exists zlib && echo yes),yes) 89- ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
90+endif 90+endif
91+ifeq ($(shell pkg-config --exists zlib && echo yes),yes) 91+ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
92 SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib) 92 SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
93 SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib) 93 SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
94- endif 94- endif
95+endif 95+endif
96  96
97+ifeq ($(shell pkg-config --exists glut && echo yes),yes) 97- HAVE_GLUT := yes
98 HAVE_GLUT := yes 
99- ifeq ($(HAVE_GLUT),yes) 98- ifeq ($(HAVE_GLUT),yes)
100- SYS_GLUT_CFLAGS := 99- SYS_GLUT_CFLAGS :=
101- SYS_GLUT_LIBS := -lglut -lGL 100- SYS_GLUT_LIBS := -lglut -lGL
102- endif 101- endif
103+ SYS_GLUT_CFLAGS := 102+ifeq ($(shell pkg-config --exists glut && echo yes),yes)
104+ SYS_GLUT_LIBS := -lglut -lGL 103+ HAVE_GLUT ?= yes
 104+ SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut)
 105+ SYS_GLUT_LIBS := $(shell pkg-config --libs glut)
105+endif 106+endif
106  107
107 HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) 108 HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
108 ifeq ($(HAVE_X11),yes) 109 ifeq ($(HAVE_X11),yes)
109@@ -125,18 +102,16 @@ else ifeq ($(OS),Linux) 110@@ -125,18 +102,16 @@ else ifeq ($(OS),Linux)
110 X11_LIBS := $(shell pkg-config --libs x11 xext) 111 X11_LIBS := $(shell pkg-config --libs x11 xext)
111 endif 112 endif
112  113
113- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) 114- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
114- ifeq ($(HAVE_LIBCRYPTO),yes) 115- ifeq ($(HAVE_LIBCRYPTO),yes)
115+HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) 116+HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
116+ifeq ($(HAVE_LIBCRYPTO),yes) 117+ifeq ($(HAVE_LIBCRYPTO),yes)
117 LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO 118 LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
cvs diff -r1.21 -r1.22 pkgsrc/print/mupdf/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-ac 2019/05/12 12:27:02 1.21
+++ pkgsrc/print/mupdf/patches/patch-ac 2019/05/13 11:03:58 1.22
@@ -1,24 +1,21 @@ @@ -1,24 +1,21 @@
1$NetBSD: patch-ac,v 1.21 2019/05/12 12:27:02 ryoon Exp $ 1$NetBSD: patch-ac,v 1.22 2019/05/13 11:03:58 leot Exp $
2 2
3- libtool support  3- libtool support
4- Install target cleanup 4- Install target cleanup
5- Also install muthreads and mupkcs7 libraries (needed by various tools) 5- Also install muthreads and mupkcs7 libraries (needed by various tools)
6- Do not force `-O0' flag when building 6- Do not force `-O0' flag when building
7- Get rid of unused VERSION variable and `version:' target (otherwise `git' can 7- Get rid of unused VERSION variable and `version:' target (otherwise `git' can
8 be invoked during the building phase) 8 be invoked during the building phase)
9- Install only one `mupdf' binary, prefer the featureful one and always 
10 install it as `mupdf'. 
11- Install all EXTRA_APPS (muraster, mujstest, mjsgen) 
12 9
13--- Makefile.orig 2019-05-06 11:53:09.000000000 +0000 10--- Makefile.orig 2019-05-06 11:53:09.000000000 +0000
14+++ Makefile 11+++ Makefile
15@@ -51,65 +51,65 @@ ifneq ($(verbose),yes) 12@@ -51,65 +51,65 @@ ifneq ($(verbose),yes)
16 endif 13 endif
17  14
18 MKTGTDIR = mkdir -p $(dir $@) 15 MKTGTDIR = mkdir -p $(dir $@)
19-CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(CC) $(CFLAGS) -MMD -MP -o $@ -c $< 16-CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
20-CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $< 17-CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $<
21-AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(AR) cr $@ $^ 18-AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(AR) cr $@ $^
22+CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -MMD -MP -o $@ -c $< 19+CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
23+CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $< 20+CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $<
24+AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(LIBTOOL) --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath $(PREFIX)/lib $^ 21+AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(LIBTOOL) --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath $(PREFIX)/lib $^