Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 6364C7A209 for ; Fri, 19 May 2017 18:00:40 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id CC6EB85625; Fri, 19 May 2017 18:00:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5B72685623 for ; Fri, 19 May 2017 18:00:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id q-a_k8pQ19e9 for ; Fri, 19 May 2017 18:00:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D94E284D90 for ; Fri, 19 May 2017 18:00:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D4E28FBE4; Fri, 19 May 2017 18:00:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_149521683858790" MIME-Version: 1.0 Date: Fri, 19 May 2017 18:00:38 +0000 From: "Filip Hajny" Subject: CVS commit: pkgsrc/print/mupdf To: pkgsrc-changes@NetBSD.org Reply-To: fhajny@netbsd.org X-Mailer: log_accum Message-Id: <20170519180038.D4E28FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_149521683858790 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fhajny Date: Fri May 19 18:00:38 UTC 2017 Modified Files: pkgsrc/print/mupdf: distinfo pkgsrc/print/mupdf/patches: patch-ab Log Message: Remove left-behind Linux libs, fixes at least Darwin. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 pkgsrc/print/mupdf/distinfo cvs rdiff -u -r1.14 -r1.15 pkgsrc/print/mupdf/patches/patch-ab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_149521683858790 Content-Disposition: inline Content-Length: 2624 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/mupdf/distinfo diff -u pkgsrc/print/mupdf/distinfo:1.32 pkgsrc/print/mupdf/distinfo:1.33 --- pkgsrc/print/mupdf/distinfo:1.32 Wed Apr 12 13:03:08 2017 +++ pkgsrc/print/mupdf/distinfo Fri May 19 18:00:38 2017 @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.32 2017/04/12 13:03:08 leot Exp $ +$NetBSD: distinfo,v 1.33 2017/05/19 18:00:38 fhajny Exp $ SHA1 (mupdf-1.11-source.tar.gz) = f782d36aaa896319207e81953e5a622201477b5b RMD160 (mupdf-1.11-source.tar.gz) = 573307473a1ac81aca4519b0e57a7111aae7803f SHA512 (mupdf-1.11-source.tar.gz) = 501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63 Size (mupdf-1.11-source.tar.gz) = 40156070 bytes SHA1 (patch-Makethird) = a4d1bb3c8d509a84803c9b60521fd9b6b17b9717 -SHA1 (patch-ab) = d348b41bf3c35c78c22e9816d860f1894910b2c9 +SHA1 (patch-ab) = a18b1e5b82454bdf06e23185e619b7f8c7a24290 SHA1 (patch-ac) = 9b0c368d05a436f94118efce517fea69c82898e7 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede SHA1 (patch-source_fitz_load-jpx.c) = 773ec1ef6b1632a10ff7c8ff76081e89bdcad593 Index: pkgsrc/print/mupdf/patches/patch-ab diff -u pkgsrc/print/mupdf/patches/patch-ab:1.14 pkgsrc/print/mupdf/patches/patch-ab:1.15 --- pkgsrc/print/mupdf/patches/patch-ab:1.14 Wed Apr 12 13:03:08 2017 +++ pkgsrc/print/mupdf/patches/patch-ab Fri May 19 18:00:38 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.14 2017/04/12 13:03:08 leot Exp $ +$NetBSD: patch-ab,v 1.15 2017/05/19 18:00:38 fhajny Exp $ o Handle the various operating systems in the same way avoiding hardcoding o Properly recognize glfw support @@ -60,7 +60,15 @@ o Properly recognize glfw support HAVE_PTHREAD := yes SYS_PTHREAD_CFLAGS := SYS_PTHREAD_LIBS := -lpthread -@@ -140,6 +92,14 @@ SYS_X11_CFLAGS := $(shell pkg-config --c +@@ -132,7 +84,6 @@ SYS_CURL_CFLAGS += $(shell pkg-config -- + SYS_CURL_DEPS += $(shell pkg-config --libs openssl) + endif + endif +-SYS_CURL_DEPS += -lpthread -lrt + + ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes" + HAVE_X11 := yes +@@ -140,6 +91,14 @@ SYS_X11_CFLAGS := $(shell pkg-config --c SYS_X11_LIBS := $(shell pkg-config --libs x11 xext) endif @@ -75,7 +83,7 @@ o Properly recognize glfw support ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes" SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) -@@ -159,8 +119,6 @@ SYS_JBIG2DEC_LIBS := -ljbig2dec +@@ -159,8 +118,6 @@ SYS_JBIG2DEC_LIBS := -ljbig2dec SYS_LIBJPEG_LIBS := -ljpeg SYS_ZLIB_LIBS := -lz --_----------=_149521683858790--