mupdf: Minor fix/cleanups/patch hunks readd accidentally lost in 1.15.0 update

Fixes:
- Use `HAVE_GLUT ?= yes' instead of `HAVE_GLUT := yes' in patch-ab:
  in that way possible `MAKE_ENV+= HAVE_GLUT=no' in options.mk is honored
  (in 1.15.0 update this could lead to building and installing mupdf-gl
  and failing due PLIST mismatch despite `opengl' option was not
  set.)

Cleanups/patch hunks readds/improvements:
 - Avoid to remove non existent thirdparty/curl directory no longer exists,
   do not remove it in post-extract
 - Clarify why pkgsrc lcms2 could not be used
 - Remove curl leftover in buildlink3.mk
 - Update patch-Makethird, patch-ab, patch-ac comments to reflect reality
 - Populate SYS_GLUT_{CFLAGS,LIBS} via `pkg-config'

6 files changed, 17 insertions, 26 deletions

diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile
index 84c1b53799c..0e2c63141ee 100644
--- a/print/mupdf/Makefile
+++ b/print/mupdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2019/05/12 12:27:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.68 2019/05/13 11:03:58 leot Exp $
 
 DISTNAME=	mupdf-1.15.0-source
 PKGNAME=	${DISTNAME:S/-source//}
@@ -34,7 +34,6 @@ CFLAGS.SunOS+=	-D_XOPEN_SOURCE=600
 # default Javascript interpreter for mupdf).
 post-extract:
 	${RM} -fr \
-	    ${WRKSRC}/thirdparty/curl \
 	    ${WRKSRC}/thirdparty/freeglut \
 	    ${WRKSRC}/thirdparty/freetype \
 	    ${WRKSRC}/thirdparty/harfbuzz \
@@ -58,7 +57,7 @@ BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.7
 .include "../../graphics/jbig2dec/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-# XXX: lcms2-2.9 does not usable for mupdf
+# XXX: mupdf needs lcms2-art fork
 #BUILDLINK_API_DEPENDS.lcms2+= lcms2>=2.9
 #.include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
diff --git a/print/mupdf/buildlink3.mk b/print/mupdf/buildlink3.mk
index f71b6ec1ad6..2f8abb99eca 100644
--- a/print/mupdf/buildlink3.mk
+++ b/print/mupdf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2018/12/13 19:51:36 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2019/05/13 11:03:58 leot Exp $
 
 BUILDLINK_TREE+=	mupdf
 
@@ -12,10 +12,6 @@ BUILDLINK_PKGSRCDIR.mupdf?=	../../print/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/print/mupdf/distinfo b/print/mupdf/distinfo
index 23cbd1736c5..72d7f5a9d32 100644
--- a/print/mupdf/distinfo
+++ b/print/mupdf/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.43 2019/05/12 12:27:02 ryoon Exp $
+$NetBSD: distinfo,v 1.44 2019/05/13 11:03:58 leot Exp $
 
 SHA1 (mupdf-1.15.0-source.tar.gz) = 4354a1c7245d4351ba604a4deed4a4ecf3e27492
 RMD160 (mupdf-1.15.0-source.tar.gz) = 892247f12a9e85d384c6cbc6c5a394d36e783158
 SHA512 (mupdf-1.15.0-source.tar.gz) = d44091e67c4772cad7bb90d66f6da6e05fed376ff5965636ff56eac4ca2faf262f75e80b34514ce52e6141af585cbb0095d5113d20f5b379e548c31fb664c287
 Size (mupdf-1.15.0-source.tar.gz) = 53023898 bytes
-SHA1 (patch-Makethird) = 33b7ccf235e971c44e159a687cecc033155957ba
-SHA1 (patch-ab) = abddcb1d72a16bd421b6ae924a4b4d759e8371e3
-SHA1 (patch-ac) = 693f1c98f12450f8e23707cf560094ab6166c8eb
+SHA1 (patch-Makethird) = 3d339e860c45bedc074106fa510f64eb3118cd1a
+SHA1 (patch-ab) = 4824dcf66e7692212cb327515d48e281029564f7
+SHA1 (patch-ac) = 78ed32eafd40d8ccddf2f68757f39c13f5aa8eac
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = f8682b54821a560b2ba1082bcf215eeefb549644
 SHA1 (patch-platform_gl_gl-main.c) = edff1aa77c4d6af59b2eca442340606a0bae9970
diff --git a/print/mupdf/patches/patch-Makethird b/print/mupdf/patches/patch-Makethird
index e9160761398..066e95a8c51 100644
--- a/print/mupdf/patches/patch-Makethird
+++ b/print/mupdf/patches/patch-Makethird
@@ -1,8 +1,6 @@
-$NetBSD: patch-Makethird,v 1.9 2018/10/04 19:02:33 leot Exp $
+$NetBSD: patch-Makethird,v 1.10 2019/05/13 11:03:58 leot Exp $
 
-- mujs building support with libtool
-- Avoid the internal lcms2 version provided and honors SYS_LCMS2_{CFLAGS,LIBS}.
-  These are handled in patches/patch-ab.
+mujs building support with libtool
 
 --- Makethird.orig	2018-09-25 12:39:17.000000000 +0000
 +++ Makethird
diff --git a/print/mupdf/patches/patch-ab b/print/mupdf/patches/patch-ab
index 3b5da57d8dc..7be05ae0c5b 100644
--- a/print/mupdf/patches/patch-ab
+++ b/print/mupdf/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.19 2019/05/12 12:27:02 ryoon Exp $
+$NetBSD: patch-ab,v 1.20 2019/05/13 11:03:58 leot Exp $
 
 - Handle the various operating systems in the same way avoiding hardcoding
 - Avoid to use objcopy by setting HAVE_OBJCOPY to no (if `yes', and with
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.19 2019/05/12 12:27:02 ryoon Exp $
   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
+  If no lcms2 is available just pass `-DFZ_ENABLE_ICC=0' to disable it via
   CFLAGS.
 
 --- Makerules.orig	2019-05-06 11:53:09.000000000 +0000
@@ -94,14 +94,15 @@ $NetBSD: patch-ab,v 1.19 2019/05/12 12:27:02 ryoon Exp $
 -  endif
 +endif
  
-+ifeq ($(shell pkg-config --exists glut && echo yes),yes)
-   HAVE_GLUT := yes
+-  HAVE_GLUT := yes
 -  ifeq ($(HAVE_GLUT),yes)
 -	SYS_GLUT_CFLAGS :=
 -	SYS_GLUT_LIBS := -lglut -lGL
 -  endif
-+  SYS_GLUT_CFLAGS :=
-+  SYS_GLUT_LIBS := -lglut -lGL
++ifeq ($(shell pkg-config --exists glut && echo yes),yes)
++  HAVE_GLUT ?= yes
++  SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut)
++  SYS_GLUT_LIBS := $(shell pkg-config --libs glut)
 +endif
  
    HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
diff --git a/print/mupdf/patches/patch-ac b/print/mupdf/patches/patch-ac
index ad2fa0e4a0f..f0372562f6a 100644
--- a/print/mupdf/patches/patch-ac
+++ b/print/mupdf/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.21 2019/05/12 12:27:02 ryoon Exp $
+$NetBSD: patch-ac,v 1.22 2019/05/13 11:03:58 leot Exp $
 
 - libtool support 
 - Install target cleanup
@@ -6,9 +6,6 @@ $NetBSD: patch-ac,v 1.21 2019/05/12 12:27:02 ryoon 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 only one `mupdf' binary, prefer the featureful one and always
-  install it as `mupdf'.
-- Install all EXTRA_APPS (muraster, mujstest, mjsgen)
 
 --- Makefile.orig	2019-05-06 11:53:09.000000000 +0000
 +++ Makefile