mupdf: Adjust patches/patch-ac in order to correctly build mupdf-gl

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

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Wed Sep 26 15:45:17 2018 +0200
Changeset:	977a2e6de7f116df46a8fa4c91f25df1ed46298b

Modified Files:
	mupdf/TODO
	mupdf/distinfo
	mupdf/patches/patch-ac

Log Message:
mupdf: Adjust patches/patch-ac in order to correctly build mupdf-gl

MUVIEW_GLUT_OBJ redefinition was not correct, whoops! Adjust that so mupdf build
and install fine with the `opengl' option.
Remove corresponding entry in TODO, `mupdf-gl' works after that.

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

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

diffstat:
 mupdf/TODO             | 1 -
 mupdf/distinfo         | 2 +-
 mupdf/patches/patch-ac | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diffs:
diff --git a/mupdf/TODO b/mupdf/TODO
index 45f9948d46..2ce79765c7 100644
--- a/mupdf/TODO
+++ b/mupdf/TODO
@@ -1,5 +1,4 @@
 - Test `curl' option
-- Test `opengl' option
 - Some tools in bin/* are no longer present... what happened to them? Please
   investigate!
 - Prepare a COMMIT_MSG
diff --git a/mupdf/distinfo b/mupdf/distinfo
index 0ff4b0ebc4..0f1cd8259e 100644
--- a/mupdf/distinfo
+++ b/mupdf/distinfo
@@ -6,7 +6,7 @@ SHA512 (mupdf-1.14.0-rc1-source.tar.gz) = e31b145b7fb6490751ae3b4f0b7c4877288756
 Size (mupdf-1.14.0-rc1-source.tar.gz) = 55658756 bytes
 SHA1 (patch-Makethird) = 33b7ccf235e971c44e159a687cecc033155957ba
 SHA1 (patch-ab) = 5ef190923d648165cdf29174f1521bd069c7e6f9
-SHA1 (patch-ac) = 73d37257a746d187075ebfb1c19b89bbea01dbf7
+SHA1 (patch-ac) = c1f9fc9223f91dc2edcffcc1111de5103cd9a1bb
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = f8682b54821a560b2ba1082bcf215eeefb549644
 SHA1 (patch-platform_gl_gl-main.c) = 8211423b2abdd1b1ce8af30da060f7d8e4c8fca0
diff --git a/mupdf/patches/patch-ac b/mupdf/patches/patch-ac
index c4cb1b15cb..081fdc2133 100644
--- a/mupdf/patches/patch-ac
+++ b/mupdf/patches/patch-ac
@@ -166,7 +166,7 @@ $NetBSD: patch-ac,v 1.19 2018/05/06 13:19:10 leot Exp $
    MUVIEW_GLUT_SRC += $(sort $(wildcard platform/gl/*.c))
 -  MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/%.o)
 -  MUVIEW_GLUT_EXE := $(OUT)/mupdf-gl
-+  MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/platform/gl/%.lo)
++  MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/%.lo)
 +  MUVIEW_GLUT_EXE := $(OUT)/platform/gl/mupdf-gl
    $(MUVIEW_GLUT_EXE) : $(MUVIEW_GLUT_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(GLUT_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(LIBCRYPTO_LIBS) $(WIN32_LDFLAGS) $(GLUT_LIBS)