mupdf: Inject HAVE_{CURL,GLUT} via MAKE_ENV

[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 16:23:50 2017 +0100
Changeset:	4354a8be31dd59dd7cd42fd5cf04db7a6cbea633

Modified Files:
	mupdf/distinfo
	mupdf/options.mk
	mupdf/patches/patch-ab

Log Message:
mupdf: Inject HAVE_{CURL,GLUT} via MAKE_ENV

Inject HAVE_CURL=no and HAVE_GLUT=no via MAKE_ENV in options.mk to avoid
depending on www/curl and graphics/glut (yes, that's a bit kludgy but
unfortunately mupdf doesn't have a configure and so there isn't a more sensible
way to do it).

This is needed to avoid building mupdf-gl for native X.org where the glut.pc
pkg-config file is available at build time.

Also adjust patches/patch-ab accordingly.

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

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

diffstat:
 mupdf/distinfo         | 2 +-
 mupdf/options.mk       | 4 ++++
 mupdf/patches/patch-ab | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diffs:
diff --git a/mupdf/distinfo b/mupdf/distinfo
index 2cc5d4ce30..1f03f77595 100644
--- a/mupdf/distinfo
+++ b/mupdf/distinfo
@@ -5,7 +5,7 @@ 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) = 77820f7344e00140a9792b5a6a3ddb1afa01b7bb
-SHA1 (patch-ab) = 755cb079c820240e7a3fba0cf16427fdba693dfd
+SHA1 (patch-ab) = 0aafa5815fc0907e3ddcc8f0e7c83510a82669d8
 SHA1 (patch-ac) = 799efd894505fd960953905e61022411e8adf1ef
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = 6e5e547df27ecb2b82cadd71489d2eb9138c1ce2
diff --git a/mupdf/options.mk b/mupdf/options.mk
index 031a4bf803..5b0f72dfa3 100644
--- a/mupdf/options.mk
+++ b/mupdf/options.mk
@@ -12,6 +12,8 @@ PLIST_VARS+=		opengl
 #
 .if !empty(PKG_OPTIONS:Mcurl)
 .include "../../www/curl/buildlink3.mk"
+.else
+MAKE_ENV+=	HAVE_CURL=no
 .endif
 
 #
@@ -21,4 +23,6 @@ PLIST_VARS+=		opengl
 PLIST.opengl=	yes
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
+.else
+MAKE_ENV+=	HAVE_GLUT=no
 .endif
diff --git a/mupdf/patches/patch-ab b/mupdf/patches/patch-ab
index ca4d792226..d617cbeebf 100644
--- a/mupdf/patches/patch-ab
+++ b/mupdf/patches/patch-ab
@@ -65,7 +65,7 @@ $NetBSD: patch-ab,v 1.15 2017/05/19 18:00:38 fhajny Exp $
  endif
  
 +ifeq "$(shell pkg-config --exists glut && pkg-config --exists gl && echo yes)" "yes"
-+HAVE_GLUT := yes
++HAVE_GLUT ?= yes
 +SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut)
 +SYS_GLUT_LIBS := $(shell pkg-config --libs glut)
 +endif