mupdf: Adjust patches and TODO to reflect current reality

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

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Fri Dec 1 15:07:23 2017 +0100
Changeset:	3ff286020550b04b7c7327bdb3a53bf2ad74a907

Modified Files:
	mupdf/Makefile
	mupdf/TODO
	mupdf/distinfo
	mupdf/patches/patch-Makethird
	mupdf/patches/patch-ab
	mupdf/patches/patch-ac
	mupdf/patches/patch-thirdparty_mujs_Makefile

Log Message:
mupdf: Adjust patches and TODO to reflect current reality

- Add comments regarding all new parts added to the patches.
- Adjust TODO to reflect these changes (`curl' option also works).
- Add an - ATM commented - BUILDLINK_API_DEPENDS.lcms2 line, mupdf needs
  lcms2>=2.9 (with "lcms2art.h" et al.)

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

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

diffstat:
 mupdf/Makefile                               |  1 +
 mupdf/TODO                                   |  4 ----
 mupdf/distinfo                               |  8 ++++----
 mupdf/patches/patch-Makethird                |  4 +++-
 mupdf/patches/patch-ab                       |  9 +++++++--
 mupdf/patches/patch-ac                       | 14 +++++++-------
 mupdf/patches/patch-thirdparty_mujs_Makefile |  4 ++--
 7 files changed, 24 insertions(+), 20 deletions(-)

diffs:
diff --git a/mupdf/Makefile b/mupdf/Makefile
index 57dde217d9..7df998afc6 100644
--- a/mupdf/Makefile
+++ b/mupdf/Makefile
@@ -55,6 +55,7 @@ post-install:
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 # XXX: Needs lcms2-2.9 that ATM is not in pkgsrc.
+#BUILDLINK_API_DEPENDS.lcms2+= lcms2>=2.9
 #.include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/mupdf/TODO b/mupdf/TODO
index 6ddab91899..7d90ebfb97 100644
--- a/mupdf/TODO
+++ b/mupdf/TODO
@@ -1,5 +1 @@
-- Adjust comment in the patches to reflect current adjustments
-- Document more in depth why we don't use/depends on lcms2 ATM (if needed,
-  probably in some patches)
-- Test `curl' option
 - Adjust for `glfw -> freeglut' transition and test it
diff --git a/mupdf/distinfo b/mupdf/distinfo
index 40ded71cc5..85be72b361 100644
--- a/mupdf/distinfo
+++ b/mupdf/distinfo
@@ -4,9 +4,9 @@ SHA1 (mupdf-1.12-rc1-source.tar.gz) = fe6b4dedc343ee88f881508604c2728c657bdfad
 RMD160 (mupdf-1.12-rc1-source.tar.gz) = 10c00e49e282f4475920cfdfdac38f765e254930
 SHA512 (mupdf-1.12-rc1-source.tar.gz) = 12b232224b2a73794e3a70270b3dd3d6cdb51400c8ec421f2d96436ec5f221f567634851a9892e60a3fe39d74def6f2c666e301fa6f40c4f28e6a26b5dd5deb6
 Size (mupdf-1.12-rc1-source.tar.gz) = 51372273 bytes
-SHA1 (patch-Makethird) = babb95186a8f1f4d702abd03a6defde8ac36edf1
-SHA1 (patch-ab) = b2e82b0ad96cbfc639b80ca3ed94f13c71f02109
-SHA1 (patch-ac) = 26514937ab9e699550c55b1383f93f6d57b06d38
+SHA1 (patch-Makethird) = 77820f7344e00140a9792b5a6a3ddb1afa01b7bb
+SHA1 (patch-ab) = 15e93808a811f45e4c56568a416c541ffc7bb509
+SHA1 (patch-ac) = 799efd894505fd960953905e61022411e8adf1ef
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-source_fitz_load-jpx.c) = 4170091042ca3c7d43f5adeeb4cf5b71d8d27e15
-SHA1 (patch-thirdparty_mujs_Makefile) = e1d6122372f0664a33003250928f9fd5fc5d8837
+SHA1 (patch-thirdparty_mujs_Makefile) = 713946f25ae1ea44878b19b9430324e3d9f98990
diff --git a/mupdf/patches/patch-Makethird b/mupdf/patches/patch-Makethird
index 6d62cec371..dba7507c0f 100644
--- a/mupdf/patches/patch-Makethird
+++ b/mupdf/patches/patch-Makethird
@@ -1,6 +1,8 @@
 $NetBSD: patch-Makethird,v 1.7 2017/04/12 13:03:08 leot Exp $
 
-o mujs building support with libtool
+- mujs building support with libtool
+- Avoid the internal lcms2 version provided and honors SYS_LCMS2_{CFLAGS,LIBS}.
+  These are handled in patches/patch-ab.
 
 --- Makethird.orig	2017-11-23 11:42:45.000000000 +0000
 +++ Makethird
diff --git a/mupdf/patches/patch-ab b/mupdf/patches/patch-ab
index 0733517eed..4c898b47b7 100644
--- a/mupdf/patches/patch-ab
+++ b/mupdf/patches/patch-ab
@@ -1,7 +1,12 @@
 $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
+- Handle the various operating systems in the same way avoiding hardcoding
+- Avoid internal version of freeglut and try to pick it up via pkg-config and
+  set SYS_GLUT_{CFLAGS,LIBS} accordingly.
+- Avoid internal version of lcms2 and try to pick it up via pkg-config and
+  set SYS_LCMS2_{CFLAGS,LIBS} accordingly.
+  If no lcms2 is available just pass `-DNO_ICC' to disable it via
+  SYS_LCMS2_CFLAGS.
 
 --- Makerules.orig	2017-11-23 11:42:45.000000000 +0000
 +++ Makerules
diff --git a/mupdf/patches/patch-ac b/mupdf/patches/patch-ac
index 1683966050..4055555e56 100644
--- a/mupdf/patches/patch-ac
+++ b/mupdf/patches/patch-ac
@@ -1,13 +1,13 @@
 $NetBSD: patch-ac,v 1.17 2017/07/16 08:29:53 leot Exp $
 
-o libtool support 
-o Install target cleanup
-o Also install muthreads library (needed by various tools)
-o Do not force `-O0' flag when building
-o Get rid of unused VERSION variable and `version:' target (otherwise `git' can
+- libtool support 
+- Install target cleanup
+- Also install muthreads library (needed by various tools)
+- 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)
-o Install only one "mupdf" binary, prefer the featureful one and always
-  install it as "mupdf"
+- Install only one `mupdf' binary, prefer the featureful one and always
+  install it as `mupdf'.
 
 --- Makefile.orig	2017-11-23 11:42:45.000000000 +0000
 +++ Makefile
diff --git a/mupdf/patches/patch-thirdparty_mujs_Makefile b/mupdf/patches/patch-thirdparty_mujs_Makefile
index 5570f36e3a..e1a642895e 100644
--- a/mupdf/patches/patch-thirdparty_mujs_Makefile
+++ b/mupdf/patches/patch-thirdparty_mujs_Makefile
@@ -1,7 +1,7 @@
 $NetBSD: patch-thirdparty_mujs_Makefile,v 1.2 2017/04/12 13:03:08 leot Exp $
 
-o Add libtool support to mujs.
-o Avoid to set (unused) VERSION variable.
+- Add libtool support to mujs.
+- Avoid to set (unused) VERSION variable.
 
 --- thirdparty/mujs/Makefile.orig	2017-03-29 13:56:39.000000000 +0000
 +++ thirdparty/mujs/Makefile