Sun Jun 15 19:15:51 2014 UTC ()
Cleanup, from Leonardo Taccari.


(wiz)
diff -r1.15 -r1.16 pkgsrc/print/mupdf/distinfo
diff -r1.2 -r1.3 pkgsrc/print/mupdf/options.mk
diff -r1.3 -r1.4 pkgsrc/print/mupdf/patches/patch-Makethird
diff -r1.8 -r1.9 pkgsrc/print/mupdf/patches/patch-ab
cvs diff -r1.15 -r1.16 pkgsrc/print/mupdf/distinfo (expand / switch to unified diff)

--- pkgsrc/print/mupdf/distinfo 2014/06/15 14:14:18 1.15
+++ pkgsrc/print/mupdf/distinfo 2014/06/15 19:15:51 1.16
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.15 2014/06/15 14:14:18 wiz Exp $ 1$NetBSD: distinfo,v 1.16 2014/06/15 19:15:51 wiz Exp $
2 2
3SHA1 (mupdf-1.5-source.tar.gz) = 628470ed20f9a03c81e90cd5585a31c0fab386ef 3SHA1 (mupdf-1.5-source.tar.gz) = 628470ed20f9a03c81e90cd5585a31c0fab386ef
4RMD160 (mupdf-1.5-source.tar.gz) = 0ef207d3b11744fc004999917699dfd2e6873191 4RMD160 (mupdf-1.5-source.tar.gz) = 0ef207d3b11744fc004999917699dfd2e6873191
5Size (mupdf-1.5-source.tar.gz) = 13269193 bytes 5Size (mupdf-1.5-source.tar.gz) = 13269193 bytes
6SHA1 (patch-Makethird) = cf6cccdd55a2edafb610d1e6d55ce9570922e750 6SHA1 (patch-Makethird) = 5ec66437c5695558f5e6497182d1f0c197ee5299
7SHA1 (patch-ab) = 2aab2ce65ce994b4213ad738bf85e250c8e7cbb8 7SHA1 (patch-ab) = b965020ec098fc1bf8577cb16102ab4c37bb37d3
8SHA1 (patch-ac) = 2b0fe5f97df7b6709ba7a3abfbefdf72ee81e0a3 8SHA1 (patch-ac) = 2b0fe5f97df7b6709ba7a3abfbefdf72ee81e0a3
9SHA1 (patch-ae) = bad4b6b8c669c752c6318bb564d1176daac30d19 9SHA1 (patch-ae) = bad4b6b8c669c752c6318bb564d1176daac30d19
10SHA1 (patch-source_fitz_load-jpx.c) = e5271cf60aff104e05ff60333be54712475d5a33 10SHA1 (patch-source_fitz_load-jpx.c) = e5271cf60aff104e05ff60333be54712475d5a33
cvs diff -r1.2 -r1.3 pkgsrc/print/mupdf/options.mk (expand / switch to unified diff)

--- pkgsrc/print/mupdf/options.mk 2014/04/21 16:14:40 1.2
+++ pkgsrc/print/mupdf/options.mk 2014/06/15 19:15:51 1.3
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1# $NetBSD: options.mk,v 1.2 2014/04/21 16:14:40 wiz Exp $ 1# $NetBSD: options.mk,v 1.3 2014/06/15 19:15:51 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mupdf 3PKG_OPTIONS_VAR= PKG_OPTIONS.mupdf
4PKG_SUPPORTED_OPTIONS= curl 4PKG_SUPPORTED_OPTIONS= curl
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8# 8#
9# curl support 9# curl support
10# 10#
11.if !empty(PKG_OPTIONS:Mcurl) 11.if !empty(PKG_OPTIONS:Mcurl)
12MAKE_FLAGS+= HAVE_CURL=yes 
13.include "../../www/curl/buildlink3.mk" 12.include "../../www/curl/buildlink3.mk"
14.include "../../mk/pthread.buildlink3.mk" 13.include "../../mk/pthread.buildlink3.mk"
15.endif 14.endif
cvs diff -r1.3 -r1.4 pkgsrc/print/mupdf/patches/patch-Makethird (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-Makethird 2014/06/15 14:14:18 1.3
+++ pkgsrc/print/mupdf/patches/patch-Makethird 2014/06/15 19:15:51 1.4
@@ -1,36 +1,24 @@ @@ -1,36 +1,24 @@
1$NetBSD: patch-Makethird,v 1.3 2014/06/15 14:14:18 wiz Exp $ 1$NetBSD: patch-Makethird,v 1.4 2014/06/15 19:15:51 wiz Exp $
2 2
3o mujs building support with libtool 3o mujs building support with libtool
4o libcurl (www/curl) support. By default mupdf can be installed with curl 
5 support *only* building it in ${WRKSRC}/thirdparty. 
6 4
7--- Makethird.orig 2014-06-10 15:09:28.000000000 +0000 5--- Makethird.orig 2014-06-10 15:09:28.000000000 +0000
8+++ Makethird 6+++ Makethird
9@@ -50,14 +50,14 @@ endif 7@@ -50,14 +50,14 @@ endif
10  8
11 ifneq "$(wildcard $(MUJS_DIR)/README)" "" 9 ifneq "$(wildcard $(MUJS_DIR)/README)" ""
12  10
13-MUJS_LIB := $(OUT)/libmujs.a 11-MUJS_LIB := $(OUT)/libmujs.a
14+MUJS_LIB := $(OUT)/libmujs.la 12+MUJS_LIB := $(OUT)/libmujs.la
15 MUJS_OUT := $(OUT)/mujs 13 MUJS_OUT := $(OUT)/mujs
16 MUJS_SRC := one.c 14 MUJS_SRC := one.c
17  15
18-$(MUJS_LIB): $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.o)) 16-$(MUJS_LIB): $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.o))
19+$(MUJS_LIB): $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.lo)) 17+$(MUJS_LIB): $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.lo))
20 $(MUJS_OUT): 18 $(MUJS_OUT):
21 $(MKDIR_CMD) 19 $(MKDIR_CMD)
22-$(MUJS_OUT)/%.o: $(MUJS_DIR)/%.c | $(MUJS_OUT) 20-$(MUJS_OUT)/%.o: $(MUJS_DIR)/%.c | $(MUJS_OUT)
23+$(MUJS_OUT)/%.lo: $(MUJS_DIR)/%.c | $(MUJS_OUT) 21+$(MUJS_OUT)/%.lo: $(MUJS_DIR)/%.c | $(MUJS_OUT)
24 $(CC_CMD) 22 $(CC_CMD)
25  23
26 MUJS_CFLAGS := -I$(MUJS_DIR) 24 MUJS_CFLAGS := -I$(MUJS_DIR)
27@@ -460,6 +460,9 @@ CURL_CFLAGS := $(SYS_CURL_CFLAGS) 
28 CURL_LIBS := $(SYS_CURL_LIBS) 
29 endif 
30  
31+CURL_CFLAGS := $(SYS_CURL_CFLAGS) 
32+CURL_LIBS := $(SYS_CURL_LIBS) $(SYS_CURL_DEPS) 
33+ 
34 # --- X11 --- 
35  
36 ifeq "$(HAVE_X11)" "yes" 
cvs diff -r1.8 -r1.9 pkgsrc/print/mupdf/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-ab 2014/06/15 14:14:18 1.8
+++ pkgsrc/print/mupdf/patches/patch-ab 2014/06/15 19:15:51 1.9
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1$NetBSD: patch-ab,v 1.8 2014/06/15 14:14:18 wiz Exp $ 1$NetBSD: patch-ab,v 1.9 2014/06/15 19:15:51 wiz 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 Build and link with openjpeg-2.1
5o libcurl (www/curl) support 
6 5
7--- Makerules.orig 2014-06-10 15:09:28.000000000 +0000 6--- Makerules.orig 2014-06-10 15:09:28.000000000 +0000
8+++ Makerules 7+++ Makerules
9@@ -25,37 +25,6 @@ else 8@@ -25,37 +25,6 @@ else
10 $(error unknown build setting: '$(build)') 9 $(error unknown build setting: '$(build)')
11 endif 10 endif
12  11
13-# Windows (MINGW) build doesn't use system libraries. 12-# Windows (MINGW) build doesn't use system libraries.
14-ifeq "$(OS)" "MINGW" 13-ifeq "$(OS)" "MINGW"
15- 14-
16-# Mac OS X doesn't have pkg-config so we hard code paths. 15-# Mac OS X doesn't have pkg-config so we hard code paths.
17-else ifeq "$(OS)" "MACOS" 16-else ifeq "$(OS)" "MACOS"
18- 17-