From owner-svn-ports-all@freebsd.org  Sun Jul 15 06:29:37 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CBE74102C4F9;
 Sun, 15 Jul 2018 06:29:37 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 7D44D7A979;
 Sun, 15 Jul 2018 06:29:37 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 59E852090;
 Sun, 15 Jul 2018 06:29:37 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6F6TbdL049982;
 Sun, 15 Jul 2018 06:29:37 GMT (envelope-from yuri@FreeBSD.org)
Received: (from yuri@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6F6Tbnn049981;
 Sun, 15 Jul 2018 06:29:37 GMT (envelope-from yuri@FreeBSD.org)
Message-Id: <201807150629.w6F6Tbnn049981@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: yuri set sender to
 yuri@FreeBSD.org using -f
From: Yuri Victorovich <yuri@FreeBSD.org>
Date: Sun, 15 Jul 2018 06:29:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r474665 - head/graphics/mupdf
X-SVN-Group: ports-head
X-SVN-Commit-Author: yuri
X-SVN-Commit-Paths: head/graphics/mupdf
X-SVN-Commit-Revision: 474665
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Jul 2018 06:29:38 -0000

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@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