svn commit: r474665 - head/graphics/mupdf

[Yuri Victorovich]

Author: yuri
Date: Sun Jul 15 06:29:36 2018
New Revision: 474665
URL: https://svnweb.freebsd.org/changeset/ports/474665

Log:
  graphics/mupdf: Fix headers conflict with openjpeg15
  
  Reported by:	Ajtim <starikarp at yandex.com> (on ports ML)

Modified:
  head/graphics/mupdf/Makefile

Modified: head/graphics/mupdf/Makefile
==============================================================================
--- head/graphics/mupdf/Makefile	Sun Jul 15 06:25:24 2018	(r474664)
+++ head/graphics/mupdf/Makefile	Sun Jul 15 06:29:36 2018	(r474665)
@@ -23,15 +23,16 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libjbig2dec.so:graphics/jbig2dec \
 		libopenjp2.so:graphics/openjpeg
 
-CFLAGS+=	-I${WRKSRC}/include/mupdf -fPIC
-LIBS+=		-L${LOCALBASE}/lib
+USES=		cpe compiler:c++11-lang gmake jpeg pkgconfig
 MAKE_ARGS=	build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \
 		SOVERSION=${PORTVERSION}
 ALL_TARGET=	all extra
-USES=		cpe compiler:c++11-lang gmake jpeg pkgconfig
 USE_XORG=	x11 xcursor xext xinerama xrandr
 USE_GL=		gl glut
 USE_LDCONFIG=	yes
+
+CFLAGS+=	`pkg-config --cflags libopenjp2` -I${WRKSRC}/include/mupdf -fPIC # pkg-config to avoid the conflict with openjpeg15
+LIBS+=		-L${LOCALBASE}/lib
 
 CPE_VENDOR=	artifex