 @@ -1,67 +1,66 @@
-# $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//}
 CATEGORIES=	print
 MASTER_SITES=	https://mupdf.com/downloads/archive/
 MAINTAINER=	leot@NetBSD.org
 HOMEPAGE=	https://mupdf.com/
 COMMENT=	Lightweight PDF, XPS and E-book viewer and toolkit
 LICENSE=	gnu-agpl-v3
 USE_LANGUAGES=	c99
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake
 INSTALLATION_DIRS+=	bin include lib/pkgconfig
 INSTALL_MAKE_FLAGS+=	prefix=${PREFIX}
 INSTALL_MAKE_FLAGS+=	mandir=${PREFIX}/${PKGMANDIR}
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${X11BASE}/lib
 MAKE_FLAGS+=		LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=		XCFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=		build=release
 MAKE_ENV+=		HAVE_LIBCRYPTO=no	# Needs openssl-1.1.0
 MAKE_ENV+=		USE_SYSTEM_LIBS=yes
 CFLAGS+=	-DJBIG_NO_MEMENTO
 CFLAGS.SunOS+=	-D_XOPEN_SOURCE=600
 .include "options.mk"
 # Remove thirdparty directory in order to use the libraries provided by pkgsrc
 # mujs directory is an exception and should not be removed (MuJS is the
 # default Javascript interpreter for mupdf).
 post-extract:
 	${RM} -fr \
 	    ${WRKSRC}/thirdparty/curl \
 	    ${WRKSRC}/thirdparty/freeglut \
 	    ${WRKSRC}/thirdparty/freetype \
 	    ${WRKSRC}/thirdparty/harfbuzz \
 	    ${WRKSRC}/thirdparty/jbig2dec \
 	    ${WRKSRC}/thirdparty/lcms2 \
 	    ${WRKSRC}/thirdparty/libjpeg \
 	    ${WRKSRC}/thirdparty/openjpeg \
 	    ${WRKSRC}/thirdparty/zlib
 post-build:
 	sed -e "s,@PREFIX@,${PREFIX}," -e "s,@VERSION@,${PKGVERSION_NOREV}," \
 	     ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/mupdf.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.7
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/harfbuzz/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .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"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,132 +1,133 @@
-$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
   `USE_TOOLS+= objcopy' the objcopy-ing fails as follow:
     OBJCOPY build/release/resources/fonts/urw/Dingbats.cff.o
     build/release/resources/fonts/urw/Dingbats.cff.o:1: warning: NUL character seen; rest of line ignored
     build/release/resources/fonts/urw/Dingbats.cff.o:1: *** missing separator.  Stop.
   (also for other fonts)).  This needs to be investigated further.
 - 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
+  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
 +++ Makerules
 @@ -6,17 +6,6 @@ OS := $(OS:MSYS%=MINGW)
  OS := $(OS:Windows_NT=MINGW)
  OS := $(OS:Darwin=MACOS)
 -ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
 -  # clang does not support these in combination with -fembed-bitcode
 -  CFLAGS += -ffunction-sections -fdata-sections
 -endif
+-
 -ifeq ($(OS),MACOS)
 -  LDREMOVEUNREACH := -Wl,-dead_strip
 -else
 -  LDREMOVEUNREACH := -Wl,--gc-sections
 -endif
+-
  SANITIZE_FLAGS += -fsanitize=address
  SANITIZE_FLAGS += -fsanitize=leak
 @@ -72,52 +61,40 @@ SYS_MUJS_LIBS := -lmujs
  SYS_OPENJPEG_LIBS := -lopenjp2
  SYS_ZLIB_LIBS := -lz
 -ifeq ($(OS),MINGW)
 -  WINDRES := windres
 -  HAVE_WIN32 := yes
+-
 -else ifeq ($(OS),MACOS)
 -  HAVE_GLUT := yes
 -  SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
 -  SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
 -  CC = xcrun cc
 -  AR = xcrun ar
 -  LD = xcrun ld
 -  RANLIB = xcrun ranlib
+-
 -else ifeq ($(OS),Linux)
 -  HAVE_OBJCOPY := yes
 +HAVE_OBJCOPY := no
 -  ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
 +ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
  	SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
  	SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
 -  endif
 -  ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
 +endif
 +ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
  	SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
  	SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
 -  endif
 -  ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
 +endif
 +ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
  	SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
  	SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
 -  endif
 -  ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
 +else
 +	CFLAGS += -DFZ_ENABLE_ICC=0
 +endif
 +ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
  	SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
  	SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
 -  endif
 -  ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
 +endif
 +ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
  	SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
  	SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
 -  endif
 -  ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
 +endif
 +ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
  	SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
  	SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
 -  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 :=
++ifeq ($(shell pkg-config --exists glut && echo yes),yes)
-+  SYS_GLUT_LIBS := -lglut -lGL
++  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)
    ifeq ($(HAVE_X11),yes)
 @@ -125,18 +102,16 @@ else ifeq ($(OS),Linux)
  	X11_LIBS := $(shell pkg-config --libs x11 xext)
    endif
 -  HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
 -  ifeq ($(HAVE_LIBCRYPTO),yes)
 +HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
 +ifeq ($(HAVE_LIBCRYPTO),yes)
  	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
  	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
 -  endif
 +endif
 -  HAVE_PTHREAD := yes
 -  ifeq ($(HAVE_PTHREAD),yes)
 +HAVE_PTHREAD := yes
 +ifeq ($(HAVE_PTHREAD),yes)
  	PTHREAD_CFLAGS :=
  	PTHREAD_LIBS := -lpthread
 -  endif
+-
  endif
  # The following section has various cross compilation configurations.

 @@ -1,299 +1,296 @@
-$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
 - Also install muthreads and mupkcs7 libraries (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)
 - 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
 @@ -51,65 +51,65 @@ ifneq ($(verbose),yes)
  endif
  MKTGTDIR = mkdir -p $(dir $@)
 -CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
 -CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $<
 -AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(AR) cr $@ $^
 +CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
 +CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $<
 +AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(LIBTOOL) --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath $(PREFIX)/lib $^
  ifdef RANLIB
    RANLIB_CMD = $(QUIET_RANLIB) $(RANLIB) $@
  endif
 -LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 +LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  TAGS_CMD = $(QUIET_TAGS) ctags -R
  WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
  OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $<
  # --- Rules ---
 -$(OUT)/%.a :
 +$(OUT)/%.la :
  	$(AR_CMD)
  	$(RANLIB_CMD)
  $(OUT)/%.exe: %.c
  	$(LINK_CMD)
 -$(OUT)/source/helpers/mu-threads/%.o : source/helpers/mu-threads/%.c
 +$(OUT)/source/helpers/mu-threads/%.lo : source/helpers/mu-threads/%.c
  	$(CC_CMD) $(THREADING_CFLAGS)
 -$(OUT)/source/helpers/pkcs7/%.o : source/helpers/pkcs7/%.c
 +$(OUT)/source/helpers/pkcs7/%.lo : source/helpers/pkcs7/%.c
  	$(CC_CMD) $(LIBCRYPTO_CFLAGS)
 -$(OUT)/source/tools/%.o : source/tools/%.c
 +$(OUT)/source/tools/%.lo : source/tools/%.c
  	$(CC_CMD) -Wall $(THIRD_CFLAGS) $(THREADING_CFLAGS)
 -$(OUT)/generated/%.o : generated/%.c
 -	$(CC_CMD) -O0
 +$(OUT)/generated/%.lo : generated/%.c
 +	$(CC_CMD)
 -$(OUT)/platform/x11/%.o : platform/x11/%.c
 +$(OUT)/platform/x11/%.lo : platform/x11/%.c
  	$(CC_CMD) -Wall $(X11_CFLAGS)
 -$(OUT)/platform/gl/%.o : platform/gl/%.c
 +$(OUT)/platform/gl/%.lo : platform/gl/%.c
  	$(CC_CMD) -Wall $(THIRD_CFLAGS) $(GLUT_CFLAGS)
  ifeq ($(HAVE_OBJCOPY),yes)
 -  $(OUT)/source/fitz/noto.o : source/fitz/noto.c
 +  $(OUT)/source/fitz/noto.lo : source/fitz/noto.c
  	$(CC_CMD) -Wall -Wdeclaration-after-statement -DHAVE_OBJCOPY $(THIRD_CFLAGS)
  endif
 -$(OUT)/source/%.o : source/%.c
 +$(OUT)/source/%.lo : source/%.c
  	$(CC_CMD) -Wall -Wdeclaration-after-statement $(THIRD_CFLAGS)
 -$(OUT)/platform/%.o : platform/%.c
 +$(OUT)/platform/%.lo : platform/%.c
  	$(CC_CMD) -Wall
 -$(OUT)/%.o: %.rc
 +$(OUT)/%.lo: %.rc
  	$(WINDRES_CMD)
 -.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
 +.PRECIOUS : $(OUT)/%.lo # Keep intermediates from chained rules
  .PRECIOUS : $(OUT)/%.exe # Keep intermediates from chained rules
  # --- File lists ---
 -THIRD_OBJ := $(THIRD_SRC:%.c=$(OUT)/%.o)
 -THIRD_OBJ := $(THIRD_OBJ:%.cc=$(OUT)/%.o)
 +THIRD_OBJ := $(THIRD_SRC:%.c=$(OUT)/%.lo)
 +THIRD_OBJ := $(THIRD_OBJ:%.cc=$(OUT)/%.lo)
  MUPDF_SRC := $(sort $(wildcard source/fitz/*.c))
  MUPDF_SRC += $(sort $(wildcard source/pdf/*.c))
 @@ -119,14 +119,14 @@ MUPDF_SRC += $(sort $(wildcard source/ht
  MUPDF_SRC += $(sort $(wildcard source/cbz/*.c))
  MUPDF_SRC += $(sort $(wildcard source/gprf/*.c))
 -MUPDF_OBJ := $(MUPDF_SRC:%.c=$(OUT)/%.o)
 +MUPDF_OBJ := $(MUPDF_SRC:%.c=$(OUT)/%.lo)
  THREAD_SRC := source/helpers/mu-threads/mu-threads.c
 -THREAD_OBJ := $(THREAD_SRC:%.c=$(OUT)/%.o)
 +THREAD_OBJ := $(THREAD_SRC:%.c=$(OUT)/%.lo)
  PKCS7_SRC := source/helpers/pkcs7/pkcs7-check.c
  PKCS7_SRC += source/helpers/pkcs7/pkcs7-openssl.c
 -PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
 +PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.lo)
  # --- Generated embedded font files ---
 @@ -153,7 +153,7 @@ ifeq ($(HAVE_OBJCOPY),yes)
    $(OUT)/%.ttf.o : %.ttf ; $(OBJCOPY_CMD)
    $(OUT)/%.ttc.o : %.ttc ; $(OBJCOPY_CMD)
  else
 -  MUPDF_OBJ += $(FONT_GEN:%.c=$(OUT)/%.o)
 +  MUPDF_OBJ += $(FONT_GEN:%.c=$(OUT)/%.lo)
  endif
  generate: $(FONT_GEN)
 @@ -187,17 +187,17 @@ generate: source/pdf/js/util.js.h
  # --- Library ---
 -MUPDF_LIB = $(OUT)/libmupdf.a
 -THIRD_LIB = $(OUT)/libmupdf-third.a
 -THREAD_LIB = $(OUT)/libmupdf-threads.a
 -PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
 +MUPDF_LIB = $(OUT)/libmupdf.la
 +THIRD_LIB = $(OUT)/libmupdf-third.la
 +THREAD_LIB = $(OUT)/libmupdf-threads.la
 +PKCS7_LIB = $(OUT)/libmupdf-pkcs7.la
  $(MUPDF_LIB) : $(MUPDF_OBJ)
  $(THIRD_LIB) : $(THIRD_OBJ)
  $(THREAD_LIB) : $(THREAD_OBJ)
  $(PKCS7_LIB) : $(PKCS7_OBJ)
 -INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
 +INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
  # --- Main tools and viewers ---
 @@ -208,13 +208,13 @@ MUTOOL_SRC += source/tools/murun.c
  MUTOOL_SRC += source/tools/mutrace.c
  MUTOOL_SRC += source/tools/cmapdump.c
  MUTOOL_SRC += $(sort $(wildcard source/tools/pdf*.c))
 -MUTOOL_OBJ := $(MUTOOL_SRC:%.c=$(OUT)/%.o)
 +MUTOOL_OBJ := $(MUTOOL_SRC:%.c=$(OUT)/%.lo)
  MUTOOL_EXE := $(OUT)/mutool
  $(MUTOOL_EXE) : $(MUTOOL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(THREAD_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS) $(LIBCRYPTO_LIBS)
  TOOL_APPS += $(MUTOOL_EXE)
 -MURASTER_OBJ := $(OUT)/source/tools/muraster.o
 +MURASTER_OBJ := $(OUT)/source/tools/muraster.lo
  MURASTER_EXE := $(OUT)/muraster
  $(MURASTER_EXE) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS)
 @@ -222,7 +222,7 @@ TOOL_APPS += $(MURASTER_EXE)
  ifeq ($(HAVE_GLUT),yes)
    MUVIEW_GLUT_SRC += $(sort $(wildcard platform/gl/*.c))
 -  MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/%.o)
 +  MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/%.lo)
    MUVIEW_GLUT_EXE := $(OUT)/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)
 @@ -230,10 +230,10 @@ ifeq ($(HAVE_GLUT),yes)
  endif
  ifeq ($(HAVE_X11),yes)
 -  MUVIEW_X11_EXE := $(OUT)/mupdf-x11
 -  MUVIEW_X11_OBJ += $(OUT)/platform/x11/pdfapp.o
 -  MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_main.o
 -  MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_image.o
 +  MUVIEW_X11_EXE := $(OUT)/mupdf
 +  MUVIEW_X11_OBJ += $(OUT)/platform/x11/pdfapp.lo
 +  MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_main.lo
 +  MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_image.lo
    $(MUVIEW_X11_EXE) : $(MUVIEW_X11_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(LIBCRYPTO_LIBS)
    VIEW_APPS += $(MUVIEW_X11_EXE)
 @@ -241,9 +241,9 @@ endif
  ifeq ($(HAVE_WIN32),yes)
    MUVIEW_WIN32_EXE := $(OUT)/mupdf-w32
 -  MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/pdfapp.o
 -  MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/win_main.o
 -  MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/win_res.o
 +  MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/pdfapp.lo
 +  MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/win_main.lo
 +  MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/win_res.lo
    $(MUVIEW_WIN32_EXE) : $(MUVIEW_WIN32_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(WIN32_LDFLAGS) $(WIN32_LIBS) $(LIBCRYPTO_LIBS)
    VIEW_APPS += $(MUVIEW_WIN32_EXE)
 @@ -251,18 +251,18 @@ endif
  # --- Generated dependencies ---
 --include $(MUPDF_OBJ:%.o=%.d)
 --include $(PKCS7_OBJ:%.o=%.d)
 --include $(THREAD_OBJ:%.o=%.d)
 --include $(THIRD_OBJ:%.o=%.d)
 --include $(GLUT_OBJ:%.o=%.d)
+-
 --include $(MUTOOL_OBJ:%.o=%.d)
 --include $(MUVIEW_GLUT_OBJ:%.o=%.d)
 --include $(MUVIEW_X11_OBJ:%.o=%.d)
 --include $(MUVIEW_WIN32_OBJ:%.o=%.d)
 +-include $(MUPDF_OBJ:%.lo=%.d)
 +-include $(PKCS7_OBJ:%.lo=%.d)
 +-include $(THREAD_OBJ:%.lo=%.d)
 +-include $(THIRD_OBJ:%.lo=%.d)
 +-include $(GLUT_OBJ:%.lo=%.d)
++
 +-include $(MUTOOL_OBJ:%.lo=%.d)
 +-include $(MUVIEW_GLUT_OBJ:%.lo=%.d)
 +-include $(MUVIEW_X11_OBJ:%.lo=%.d)
 +-include $(MUVIEW_WIN32_OBJ:%.lo=%.d)
 --include $(MURASTER_OBJ:%.o=%.d)
 +-include $(MURASTER_OBJ:%.lo=%.d)
  # --- Examples ---
 @@ -273,10 +273,10 @@ $(OUT)/multi-threaded: docs/examples/mul
  # --- Update version string header ---
 -VERSION = $(shell git describe --tags)
+-
 -version:
 -	sed -i~ -e '/FZ_VERSION /s/".*"/"'$(VERSION)'"/' include/mupdf/fitz/version.h
 +#VERSION = $(shell git describe --tags)
 +#
 +#version:
 +#	sed -i~ -e '/FZ_VERSION /s/".*"/"'$(VERSION)'"/' include/mupdf/fitz/version.h
  # --- Format man pages ---
 @@ -304,27 +304,30 @@ tools: $(TOOL_APPS)
  apps: $(TOOL_APPS) $(VIEW_APPS)
  install: libs apps
 -	install -d $(DESTDIR)$(incdir)/mupdf
 -	install -d $(DESTDIR)$(incdir)/mupdf/fitz
 -	install -d $(DESTDIR)$(incdir)/mupdf/pdf
 -	install -m 644 include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
 -	install -m 644 include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
 -	install -m 644 include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
+-
 -	install -d $(DESTDIR)$(libdir)
 -	install -m 644 $(INSTALL_LIBS) $(DESTDIR)$(libdir)
+-
 -	install -d $(DESTDIR)$(bindir)
 -	install -m 755 $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir)
+-
 -	install -d $(DESTDIR)$(mandir)/man1
 -	install -m 644 docs/man/*.1 $(DESTDIR)$(mandir)/man1
+-
 -	install -d $(DESTDIR)$(docdir)
 -	install -d $(DESTDIR)$(docdir)/examples
 -	install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir)
 -	install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
 -	install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
 +	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir)/mupdf
 +	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir)/mupdf/fitz
 +	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir)/mupdf/pdf
 +	${BSD_INSTALL_DATA} include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
 +	${BSD_INSTALL_DATA} include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
 +	${BSD_INSTALL_DATA} include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
++
 +	${BSD_INSTALL_LIB_DIR} $(DESTDIR)$(libdir)
 +	for f in $(INSTALL_LIBS); do \
 +		${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(libdir); \
 +	done
++
 +	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir)
 +	for f in $(TOOL_APPS) $(VIEW_APPS); do \
 +		${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(bindir); \
 +	done
++
 +	${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(mandir)/man1
 +	${BSD_INSTALL_MAN} docs/man/*.1 $(DESTDIR)$(mandir)/man1
++
 +	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)/examples
 +	${BSD_INSTALL_DATA} README COPYING CHANGES $(DESTDIR)$(docdir)
 +	${BSD_INSTALL_DATA} docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
 +	${BSD_INSTALL_DATA} docs/examples/* $(DESTDIR)$(docdir)/examples
  tarball:
  	bash scripts/archive.sh

 @@ -1,14 +1,14 @@
-$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-Makethird) = 3d339e860c45bedc074106fa510f64eb3118cd1a
-SHA1 (patch-ab) = abddcb1d72a16bd421b6ae924a4b4d759e8371e3
+SHA1 (patch-ab) = 4824dcf66e7692212cb327515d48e281029564f7
-SHA1 (patch-ac) = 693f1c98f12450f8e23707cf560094ab6166c8eb
+SHA1 (patch-ac) = 78ed32eafd40d8ccddf2f68757f39c13f5aa8eac
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = f8682b54821a560b2ba1082bcf215eeefb549644
 SHA1 (patch-platform_gl_gl-main.c) = edff1aa77c4d6af59b2eca442340606a0bae9970
 SHA1 (patch-source_fitz_load-jpx.c) = 161d21bca13bb57db37807aec844c85dc5b34157
 SHA1 (patch-thirdparty_mujs_Makefile) = 833e44f4e23d2a6ff61e6276feede4892feeb9bb

 @@ -1,17 +1,15 @@
-$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
+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	2018-09-25 12:39:17.000000000 +0000
 +++ Makethird
 @@ -229,7 +229,7 @@ else
  THIRD_SRC += thirdparty/mujs/one.c
  THIRD_CFLAGS += -Ithirdparty/mujs
 -$(OUT)/thirdparty/mujs/%.o: thirdparty/mujs/%.c
 +$(OUT)/thirdparty/mujs/%.lo: thirdparty/mujs/%.c
  	$(CC_CMD)
  endif

 @@ -1,34 +1,30 @@
-# $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
 .if !defined(MUPDF_BUILDLINK3_MK)
 MUPDF_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.mupdf+=	mupdf>=1.14.0
 BUILDLINK_ABI_DEPENDS.mupdf?=	mupdf>=1.14.0nb2
 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"
 .endif
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/harfbuzz/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jbig2dec/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif	# MUPDF_BUILDLINK3_MK
 BUILDLINK_TREE+=	-mupdf