svn commit: r375313 - head/graphics/ImageMagick

[Koop Mast]

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 at 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 \