mupdf: (re)add `curl' option and support

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Aug 3 16:33:14 2019 +0200
Changeset:	499a48d9ac0ac30dc48c7fd33df6a3abef424922

Modified Files:
	mupdf/PLIST
	mupdf/buildlink3.mk
	mupdf/distinfo
	mupdf/options.mk
	mupdf/patches/patch-ac

Log Message:
mupdf: (re)add `curl' option and support

Unlike mupdf-1.14.0 and earlier `mupdf-curl' is now installed as a separate
binary as it is done by upstream.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=499a48d9ac0ac30dc48c7fd33df6a3abef424922

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mupdf/PLIST            |  1 +
 mupdf/buildlink3.mk    |  4 ++++
 mupdf/distinfo         |  2 +-
 mupdf/options.mk       | 12 ++++++++++--
 mupdf/patches/patch-ac |  9 ++++++---
 5 files changed, 22 insertions(+), 6 deletions(-)

diffs:
diff --git a/mupdf/PLIST b/mupdf/PLIST
index 6f707ebfae..01ea783ab8 100644
--- a/mupdf/PLIST
+++ b/mupdf/PLIST
@@ -1,5 +1,6 @@
 @comment $NetBSD: PLIST,v 1.18 2019/05/12 12:27:02 ryoon Exp $
 bin/mupdf
+${PLIST.curl}bin/mupdf-curl
 ${PLIST.opengl}bin/mupdf-gl
 bin/muraster
 bin/mutool
diff --git a/mupdf/buildlink3.mk b/mupdf/buildlink3.mk
index 72f9b4fd06..bbfa3e1a7e 100644
--- a/mupdf/buildlink3.mk
+++ b/mupdf/buildlink3.mk
@@ -12,6 +12,10 @@ BUILDLINK_PKGSRCDIR.mupdf?=	../../wip/mupdf
 pkgbase := mupdf
 .include "../../mk/pkg-build-options.mk"
 
+.if !empty(PKG_BUILD_OPTIONS.mupdf:Mcurl)
+.include "../../www/curl/buildlink3.mk"
+.endif
+
 .if !empty(PKG_BUILD_OPTIONS.mupdf:Mopengl)
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
diff --git a/mupdf/distinfo b/mupdf/distinfo
index dfc09ce594..6e211c135c 100644
--- a/mupdf/distinfo
+++ b/mupdf/distinfo
@@ -6,7 +6,7 @@ SHA512 (mupdf-1.16.0-source.tar.gz) = d3eaa9cb4b13af6c35826a878eb8a80707e1ba4026
 Size (mupdf-1.16.0-source.tar.gz) = 60805124 bytes
 SHA1 (patch-Makethird) = 027f69be8ab3bb29535d3315d85c2d5d32a4dccf
 SHA1 (patch-ab) = 18bc9e283624ec810662d29309db9a8dd9268bb8
-SHA1 (patch-ac) = d7f94681620263f00f2741bc0de7b504c49fcf2f
+SHA1 (patch-ac) = 97442b78e52e57b783d93771c6002702dda38e8f
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = f8682b54821a560b2ba1082bcf215eeefb549644
 SHA1 (patch-platform_gl_gl-main.c) = edff1aa77c4d6af59b2eca442340606a0bae9970
diff --git a/mupdf/options.mk b/mupdf/options.mk
index 8c29b9c9a7..ddc989aae5 100644
--- a/mupdf/options.mk
+++ b/mupdf/options.mk
@@ -1,11 +1,19 @@
 # $NetBSD: options.mk,v 1.7 2019/05/12 12:27:02 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mupdf
-PKG_SUPPORTED_OPTIONS=	opengl
+PKG_SUPPORTED_OPTIONS=	curl opengl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		opengl
+PLIST_VARS+=		curl opengl
+
+#
+# curl support
+#
+.if !empty(PKG_OPTIONS:Mcurl)
+PLIST.curl=	yes
+.include "../../www/curl/buildlink3.mk"
+.endif
 
 #
 # glut support
diff --git a/mupdf/patches/patch-ac b/mupdf/patches/patch-ac
index a4e5430db7..2d3b422ddc 100644
--- a/mupdf/patches/patch-ac
+++ b/mupdf/patches/patch-ac
@@ -6,8 +6,9 @@ $NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
 - Do not force `-O0' flag when building
 - Get rid of unused VERSION variable and `version:' target (otherwise `git' can
   be invoked during the building phase)
+- Install mupdf with curl support as `mupdf-curl'
 
---- Makefile.orig	2019-07-23 12:23:08.000000000 +0000
+--- Makefile.orig	2019-07-26 14:10:07.000000000 +0000
 +++ Makefile
 @@ -51,68 +51,68 @@ ifneq ($(verbose),yes)
  endif
@@ -211,15 +212,17 @@ $NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
    $(MUVIEW_WIN32_EXE) : $(MUVIEW_WIN32_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(WIN32_LDFLAGS) $(WIN32_LIBS) $(LIBCRYPTO_LIBS)
    VIEW_APPS += $(MUVIEW_WIN32_EXE)
-@@ -255,11 +255,11 @@ ifeq ($(HAVE_X11),yes)
+@@ -254,12 +254,12 @@ endif
+ ifeq ($(HAVE_X11),yes)
  ifeq ($(HAVE_CURL),yes)
  ifeq ($(HAVE_PTHREAD),yes)
-   MUVIEW_X11_CURL_EXE := $(OUT)/mupdf-x11-curl
+-  MUVIEW_X11_CURL_EXE := $(OUT)/mupdf-x11-curl
 -  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/pdfapp.o
 -  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_main.o
 -  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_image.o
 -  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/curl_stream.o
 -  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/prog_stream.o
++  MUVIEW_X11_CURL_EXE := $(OUT)/mupdf-curl
 +  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/pdfapp.lo
 +  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_main.lo
 +  MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_image.lo