Fix various installation and build issues.

o Add a lost hunk of patches/patch-ac in order to build and install "mupdf-x11"
  simply as "mupdf" (like previous mupdf releases)
o Threat glfw like any other thirdparty library (and avoid to accidently build
  "mupdf-gl")

Thanks to Thomas Klausner and Yorick Hardy for noticing that.

3 files changed, 11 insertions, 8 deletions

diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile
index 7881822dc07..e8d4aadda85 100644
--- a/print/mupdf/Makefile
+++ b/print/mupdf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2015/11/11 17:08:25 leot Exp $
+# $NetBSD: Makefile,v 1.33 2015/11/12 21:11:31 leot Exp $
 
 DISTNAME=	mupdf-1.8-source
 PKGNAME=	${DISTNAME:S/-source//}
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://mupdf.com/downloads/
 
@@ -34,6 +35,7 @@ post-extract:
 	${RM} -fr \
 	    ${WRKSRC}/thirdparty/curl \
 	    ${WRKSRC}/thirdparty/freetype \
+	    ${WRKSRC}/thirdparty/glfw \
 	    ${WRKSRC}/thirdparty/jbig2dec \
 	    ${WRKSRC}/thirdparty/jpeg \
 	    ${WRKSRC}/thirdparty/openjpeg \
diff --git a/print/mupdf/distinfo b/print/mupdf/distinfo
index cbddb6e0c69..b2196878c95 100644
--- a/print/mupdf/distinfo
+++ b/print/mupdf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2015/11/11 17:08:25 leot Exp $
+$NetBSD: distinfo,v 1.22 2015/11/12 21:11:31 leot Exp $
 
 SHA1 (mupdf-1.8-source.tar.gz) = 9fbc9e06f0b74fe904745c363324eaca3517bfce
 RMD160 (mupdf-1.8-source.tar.gz) = 2708f5650f23101a66cef92b7903aafb716f9c02
@@ -6,6 +6,6 @@ SHA512 (mupdf-1.8-source.tar.gz) = 938fbed4afc0dd0aa621911cd70b9289c6a4f13d026f9
 Size (mupdf-1.8-source.tar.gz) = 14169777 bytes
 SHA1 (patch-Makethird) = 5ec66437c5695558f5e6497182d1f0c197ee5299
 SHA1 (patch-ab) = 8f8f167d9207734891c68e358c802107f5600da2
-SHA1 (patch-ac) = 81bad722bc5d30e6aeb367b30d9d1c4bad816429
+SHA1 (patch-ac) = 51cfd962d498c70308053507b159df2634b2fbd6
 SHA1 (patch-ae) = bad4b6b8c669c752c6318bb564d1176daac30d19
 SHA1 (patch-source_fitz_load-jpx.c) = e5271cf60aff104e05ff60333be54712475d5a33
diff --git a/print/mupdf/patches/patch-ac b/print/mupdf/patches/patch-ac
index f3040ce33be..496832a0730 100644
--- a/print/mupdf/patches/patch-ac
+++ b/print/mupdf/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.11 2015/11/11 17:08:25 leot Exp $
+$NetBSD: patch-ac,v 1.12 2015/11/12 21:11:31 leot Exp $
 
 o libtool support 
 o Install target cleanup
@@ -6,7 +6,7 @@ o Install only one "mupdf" binary, prefer the featureful one and always
  install it as "mupdf"
 o libmujs support: install like a non-thirdparty mupdf's library
 
---- Makefile.orig	2015-10-21 14:45:11.000000000 +0000
+--- Makefile.orig	2015-11-10 16:19:51.000000000 +0000
 +++ Makefile
 @@ -41,22 +41,12 @@ CFLAGS += $(ZLIB_CFLAGS)
  
@@ -171,7 +171,7 @@ o libmujs support: install like a non-thirdparty mupdf's library
  $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
  $(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIBS)
  $(MUTOOL) : $(MUTOOL_OBJ)
-@@ -251,11 +244,11 @@ $(MUTOOL) : $(MUTOOL_OBJ)
+@@ -251,19 +244,19 @@ $(MUTOOL) : $(MUTOOL_OBJ)
  
  MJSGEN := $(OUT)/mjsgen
  $(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIBS)
@@ -185,11 +185,12 @@ o libmujs support: install like a non-thirdparty mupdf's library
  $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR)
  $(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIBS)
  $(MUJSTEST) : $(MUJSTEST_OBJ)
-@@ -263,7 +256,7 @@ $(MUJSTEST) : $(MUJSTEST_OBJ)
+ 	$(LINK_CMD)
  
  ifeq "$(HAVE_X11)" "yes"
- MUVIEW_X11 := $(OUT)/mupdf-x11
+-MUVIEW_X11 := $(OUT)/mupdf-x11
 -MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
++MUVIEW_X11 := $(OUT)/platform/x11/mupdf
 +MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.lo x11_image.lo pdfapp.lo)
  $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR)
  $(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIBS)