From owner-svn-ports-head@FreeBSD.ORG  Tue Dec 23 07:57:53 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 92D36992;
 Tue, 23 Dec 2014 07:57:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7EA7264622;
 Tue, 23 Dec 2014 07:57:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBN7vr2o071673;
 Tue, 23 Dec 2014 07:57:53 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBN7vrrn071672;
 Tue, 23 Dec 2014 07:57:53 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201412230757.sBN7vrrn071672@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast <kwm@FreeBSD.org>
Date: Tue, 23 Dec 2014 07:57:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r375313 - head/graphics/ImageMagick
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Dec 2014 07:57:53 -0000

Author: kwm
Date: Tue Dec 23 07:57:52 2014
New Revision: 375313
URL: https://svnweb.freebsd.org/changeset/ports/375313
QAT: https://qat.redports.org/buildarchive/r375313/

Log:
  Make sure our CPPFLAGS and LDFLAGS get placed at the end of the compiler
  arguments so the compiler finds the openjpeg 2.1 headers before the old
  1.5 header. Which are installed in ${LOCALBASE}/include/openjpeg-2.1 and
  ${LOCALBASE}/include respectively.
  
  This fixes the build when the MODULES option is turned off, and both openjpeg
  ports are installed.
  
  PR:		195442
  Submitted by:	mail@ozzmosis.com

Modified:
  head/graphics/ImageMagick/Makefile

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Tue Dec 23 06:46:40 2014	(r375312)
+++ head/graphics/ImageMagick/Makefile	Tue Dec 23 07:57:52 2014	(r375313)
@@ -46,8 +46,8 @@ CONFIGURE_ARGS=	--without-dps \
 		--without-lcms
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-isystem${LOCALBASE}/include
+LDFLAGS+=	-Wl,-Y${LOCALBASE}/lib
 
 SAMPLE_FILES=	coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \
 		policy.xml quantization-table.xml thresholds.xml type-dejavu.xml \