Fri May 19 18:00:38 2017 UTC ()
Remove left-behind Linux libs, fixes at least Darwin.


(fhajny)
diff -r1.32 -r1.33 pkgsrc/print/mupdf/distinfo
diff -r1.14 -r1.15 pkgsrc/print/mupdf/patches/patch-ab
cvs diff -r1.32 -r1.33 pkgsrc/print/mupdf/distinfo (expand / switch to unified diff)

--- pkgsrc/print/mupdf/distinfo 2017/04/12 13:03:08 1.32
+++ pkgsrc/print/mupdf/distinfo 2017/05/19 18:00:38 1.33
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.32 2017/04/12 13:03:08 leot Exp $ 1$NetBSD: distinfo,v 1.33 2017/05/19 18:00:38 fhajny Exp $
2 2
3SHA1 (mupdf-1.11-source.tar.gz) = f782d36aaa896319207e81953e5a622201477b5b 3SHA1 (mupdf-1.11-source.tar.gz) = f782d36aaa896319207e81953e5a622201477b5b
4RMD160 (mupdf-1.11-source.tar.gz) = 573307473a1ac81aca4519b0e57a7111aae7803f 4RMD160 (mupdf-1.11-source.tar.gz) = 573307473a1ac81aca4519b0e57a7111aae7803f
5SHA512 (mupdf-1.11-source.tar.gz) = 501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63 5SHA512 (mupdf-1.11-source.tar.gz) = 501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
6Size (mupdf-1.11-source.tar.gz) = 40156070 bytes 6Size (mupdf-1.11-source.tar.gz) = 40156070 bytes
7SHA1 (patch-Makethird) = a4d1bb3c8d509a84803c9b60521fd9b6b17b9717 7SHA1 (patch-Makethird) = a4d1bb3c8d509a84803c9b60521fd9b6b17b9717
8SHA1 (patch-ab) = d348b41bf3c35c78c22e9816d860f1894910b2c9 8SHA1 (patch-ab) = a18b1e5b82454bdf06e23185e619b7f8c7a24290
9SHA1 (patch-ac) = 9b0c368d05a436f94118efce517fea69c82898e7 9SHA1 (patch-ac) = 9b0c368d05a436f94118efce517fea69c82898e7
10SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede 10SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
11SHA1 (patch-source_fitz_load-jpx.c) = 773ec1ef6b1632a10ff7c8ff76081e89bdcad593 11SHA1 (patch-source_fitz_load-jpx.c) = 773ec1ef6b1632a10ff7c8ff76081e89bdcad593
12SHA1 (patch-thirdparty_mujs_Makefile) = cd6a20d56020ae5028f95e24e75f5e4a62127f9f 12SHA1 (patch-thirdparty_mujs_Makefile) = cd6a20d56020ae5028f95e24e75f5e4a62127f9f
cvs diff -r1.14 -r1.15 pkgsrc/print/mupdf/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-ab 2017/04/12 13:03:08 1.14
+++ pkgsrc/print/mupdf/patches/patch-ab 2017/05/19 18:00:38 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ab,v 1.14 2017/04/12 13:03:08 leot Exp $ 1$NetBSD: patch-ab,v 1.15 2017/05/19 18:00:38 fhajny 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 Properly recognize glfw support 4o Properly recognize glfw support
5 5
6--- Makerules.orig 2017-04-05 11:02:21.000000000 +0000 6--- Makerules.orig 2017-04-05 11:02:21.000000000 +0000
7+++ Makerules 7+++ Makerules
8@@ -64,54 +64,6 @@ ifeq "$(largefile)" "yes" 8@@ -64,54 +64,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-
@@ -50,37 +50,45 @@ o Properly recognize glfw support @@ -50,37 +50,45 @@ o Properly recognize glfw support
50-SYS_ZLIB_LIBS := -lz 50-SYS_ZLIB_LIBS := -lz
51- 51-
52-CC := xcrun cc 52-CC := xcrun cc
53-AR := xcrun ar 53-AR := xcrun ar
54-LD := xcrun ld 54-LD := xcrun ld
55-RANLIB_CMD := xcrun ranlib $@ 55-RANLIB_CMD := xcrun ranlib $@
56- 56-
57-# Linux uses pkg-config for system libraries. 57-# Linux uses pkg-config for system libraries.
58-else ifeq "$(OS)" "Linux" 58-else ifeq "$(OS)" "Linux"
59- 59-
60 HAVE_PTHREAD := yes 60 HAVE_PTHREAD := yes
61 SYS_PTHREAD_CFLAGS := 61 SYS_PTHREAD_CFLAGS :=
62 SYS_PTHREAD_LIBS := -lpthread 62 SYS_PTHREAD_LIBS := -lpthread
63@@ -140,6 +92,14 @@ SYS_X11_CFLAGS := $(shell pkg-config --c 63@@ -132,7 +84,6 @@ SYS_CURL_CFLAGS += $(shell pkg-config --
 64 SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
 65 endif
 66 endif
 67-SYS_CURL_DEPS += -lpthread -lrt
 68
 69 ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
 70 HAVE_X11 := yes
 71@@ -140,6 +91,14 @@ SYS_X11_CFLAGS := $(shell pkg-config --c
64 SYS_X11_LIBS := $(shell pkg-config --libs x11 xext) 72 SYS_X11_LIBS := $(shell pkg-config --libs x11 xext)
65 endif 73 endif
66  74
67+ifeq "$(shell pkg-config --exists glfw3 && pkg-config --exists gl && echo yes)" "yes" 75+ifeq "$(shell pkg-config --exists glfw3 && pkg-config --exists gl && echo yes)" "yes"
68+HAVE_GLFW := yes 76+HAVE_GLFW := yes
69+SYS_GLFW_CFLAGS := $(shell pkg-config --cflags glfw3) 77+SYS_GLFW_CFLAGS := $(shell pkg-config --cflags glfw3)
70+SYS_GLFW_CFLAGS += $(shell pkg-config --cflags gl) 78+SYS_GLFW_CFLAGS += $(shell pkg-config --cflags gl)
71+SYS_GLFW_LIBS := $(shell pkg-config --libs glfw3) 79+SYS_GLFW_LIBS := $(shell pkg-config --libs glfw3)
72+SYS_GLFW_LIBS += $(shell pkg-config --libs gl) 80+SYS_GLFW_LIBS += $(shell pkg-config --libs gl)
73+endif 81+endif
74+ 82+
75 ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes" 83 ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes"
76 SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) 84 SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
77 SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) 85 SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
78@@ -159,8 +119,6 @@ SYS_JBIG2DEC_LIBS := -ljbig2dec 86@@ -159,8 +118,6 @@ SYS_JBIG2DEC_LIBS := -ljbig2dec
79 SYS_LIBJPEG_LIBS := -ljpeg 87 SYS_LIBJPEG_LIBS := -ljpeg
80 SYS_ZLIB_LIBS := -lz 88 SYS_ZLIB_LIBS := -lz
81  89
82-endif 90-endif
83- 91-
84 # The following section is an example of how to simply do cross-compilation 92 # The following section is an example of how to simply do cross-compilation
85 # using these Makefiles. It builds for a beagleboard running ARM linux, 93 # using these Makefiles. It builds for a beagleboard running ARM linux,
86 # compiling on windows with the CodeSourcery G++ compilers. 94 # compiling on windows with the CodeSourcery G++ compilers.